From 95eeab8640281c32b88e744ec9fef7fc12310121 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Tue, 19 Apr 2011 17:06:50 +0000 Subject: [PATCH] Renamed messages.properties to CeheckersMessages.properties. --- .../internal/checkers/CheckersMessages.java | 8 +- ...properties => CheckersMessages.properties} | 0 .../cdt/codan/core/messages.properties | 19 ---- .../cdt/codan/internal/ui/messages.properties | 96 ------------------- 4 files changed, 4 insertions(+), 119 deletions(-) rename codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/{messages.properties => CheckersMessages.properties} (100%) delete mode 100644 codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/messages.properties delete mode 100644 codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/messages.properties diff --git a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/CheckersMessages.java b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/CheckersMessages.java index ed6890d657b..255aaf2d0db 100644 --- a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/CheckersMessages.java +++ b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/CheckersMessages.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Alena Laskavaia - initial API and implementation + * Alena Laskavaia - initial API and implementation *******************************************************************************/ package org.eclipse.cdt.codan.internal.checkers; @@ -16,7 +16,6 @@ import org.eclipse.osgi.util.NLS; * Messages */ public class CheckersMessages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.cdt.codan.internal.checkers.messages"; //$NON-NLS-1$ public static String CaseBreakChecker_DefaultNoBreakCommentDescription; public static String CaseBreakChecker_EmptyCaseDescription; public static String CaseBreakChecker_LastCaseDescription; @@ -30,11 +29,12 @@ public class CheckersMessages extends NLS { public static String SuggestedParenthesisChecker_SuggestParanthesesAroundNot; public static String SuspiciousSemicolonChecker_ParamElse; public static String ProblemBindingChecker_Candidates; + static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, CheckersMessages.class); + NLS.initializeMessages(CheckersMessages.class.getName(), CheckersMessages.class); } + // Do not instantiate private CheckersMessages() { } } diff --git a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/messages.properties b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/CheckersMessages.properties similarity index 100% rename from codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/messages.properties rename to codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/CheckersMessages.properties diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/messages.properties b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/messages.properties deleted file mode 100644 index d27aa294057..00000000000 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/messages.properties +++ /dev/null @@ -1,19 +0,0 @@ -############################################################################### -# Copyright (c) 2010 Alena Laskavaia and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Alena Laskavaia - initial API and implementation -############################################################################### -CodanApplication_Error_ProjectDoesNotExists=Error: project {0} does not exist -CodanApplication_LogRunProject=Running code analysis on project -CodanApplication_LogRunWorkspace=Running code analysis on workspace -CodanApplication_Usage=Usage: [options] ... -CodanApplication_Options=Options: -CodanApplication_all_option= -all - run on all projects in workspace -CodanApplication_verbose_option= -verbose - print verbose build information -CodanBuilder_Code_Analysis_On=Code analysis on -FileScopeProblemPreference_Label=Exclusion and Inclusion diff --git a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/messages.properties b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/messages.properties deleted file mode 100644 index 50306301edc..00000000000 --- a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/messages.properties +++ /dev/null @@ -1,96 +0,0 @@ -############################################################################### -# Copyright (c) 2010, 2011 Alena Laskavaia and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Alena Laskavaia - initial API and implementation -# IBM Corporation -############################################################################### -BuildPropertyPage_RunAsYouType=Run as you &type (selected checkers) -BuildPropertyPage_RunWithBuild=&Run with build -CheckedTreeEditor_SelectionCannotBeEmpty=Selection cannot be empty -CodanPreferencePage_Customize=Customize Selected... -CodanPreferencePage_Description=Description: -CodanPreferencePage_HasPreferences=This problem has extra preferences -CodanPreferencePage_Info=Info -CodanPreferencePage_MessageLabel=Message: -CodanPreferencePage_NoInfo=No description -CodanPreferencePage_Parameters=Parameters: -CustomizeProblemComposite_LaunchingTab=Launching -CustomizeProblemComposite_TabParameters=Preferences -CustomizeProblemComposite_TabScope=Scope -CustomizeProblemDialog_Message=Edit problem preferences, scope and launch options -CustomizeProblemDialog_Title=Customize Problem... -Job_TitleRunningAnalysis=Running Code Analysis -ParametersComposite_DoNotChange= -ParametersComposite_IsEnabled=This problem is enabled -ParametersComposite_MessagePattern=Message Pattern -ParametersComposite_NewValue=New Value -ParametersComposite_None=No extra preferences -ParametersComposite_Severity=Severity -ProblemsTreeEditor_NameColumn=Name -ProblemsTreeEditor_Problems=Problems -ProblemsTreeEditor_SeverityColumn=Severity -ProblemsTreeEditor_ToolTip=Sample Message: -OverlayPage_Use_Workspace_Settings=Use &workspace settings -OverlayPage_Use_Project_Settings=Use pr&oject settings -OverlayPage_Configure_Workspace_Settings=&Configure Workspace Settings... -PropertyStore_Cannot_write_resource_property=Cannot write resource property - -# ------- ExclusionInclusionDialog ------- - -ExclusionInclusionDialog_title=Inclusion and Exclusion Patterns -ExclusionInclusionDialog_description=Included and excluded resources for ''{0}''. -ExclusionInclusionDialog_description2=Add or remove inclusion and exclusion patterns to resources for which problem is reported - -ExclusionInclusionDialog_exclusion_pattern_label=E&xclusion patterns: -ExclusionInclusionDialog_inclusion_pattern_label=I&nclusion patterns: - -ExclusionInclusionDialog_inclusion_pattern_add=A&dd... -ExclusionInclusionDialog_inclusion_pattern_add_multiple=Add &Multiple... -ExclusionInclusionDialog_inclusion_pattern_remove=&Remove -ExclusionInclusionDialog_inclusion_pattern_edit=&Edit... - -ExclusionInclusionDialog_exclusion_pattern_add=&Add... -ExclusionInclusionDialog_exclusion_pattern_add_multiple=Add M&ultiple... -ExclusionInclusionDialog_exclusion_pattern_remove=Rem&ove -ExclusionInclusionDialog_exclusion_pattern_edit=Edi&t... - -ExclusionInclusionDialog_ChooseExclusionPattern_title=Exclusion Pattern Selection -ExclusionInclusionDialog_ChooseExclusionPattern_description=&Choose folders or files to exclude: - -ExclusionInclusionDialog_ChooseInclusionPattern_title=Inclusion Pattern Selection -ExclusionInclusionDialog_ChooseInclusionPattern_description=&Choose folders or files to include: - -# ------- ExclusionInclusionEntryDialog ------- - -ExclusionInclusionEntryDialog_exclude_add_title=Add Exclusion Pattern -ExclusionInclusionEntryDialog_exclude_edit_title=Edit Exclusion Pattern -ExclusionInclusionEntryDialog_exclude_description=Enter a pattern for excluding files from the source folder. Allowed wildcards are '*', '?' and '**'. Examples: 'src/util/a*.c', 'src/util/', '**/Test*'. - -ExclusionInclusionEntryDialog_exclude_pattern_label=E&xclusion pattern (Path relative to ''{0}''): - -ExclusionInclusionEntryDialog_include_add_title=Add Inclusion Pattern -ExclusionInclusionEntryDialog_include_edit_title=Edit Inclusion Pattern -ExclusionInclusionEntryDialog_include_description=Enter a pattern for including files to the source folder. Allowed wildcards are '*', '?' and '**'. Examples: 'src/util/a*.c', 'src/util/', '**/Test*'. - -ExclusionInclusionEntryDialog_include_pattern_label=I&nclusion pattern (Path relative to ''{0}''): - -ExclusionInclusionEntryDialog_pattern_button=Bro&wse... - -ExclusionInclusionEntryDialog_error_empty=Enter a pattern. -ExclusionInclusionEntryDialog_error_notrelative=Pattern must be a relative path. -ExclusionInclusionEntryDialog_error_exists=Pattern already exists. - -ExclusionInclusionEntryDialog_ChooseExclusionPattern_title=Exclusion Pattern Selection -ExclusionInclusionEntryDialog_ChooseExclusionPattern_description=&Choose a folder or file to exclude: - -ExclusionInclusionEntryDialog_ChooseInclusionPattern_title=Inclusion Pattern Selection -ExclusionInclusionEntryDialog_ChooseInclusionPattern_description=&Choose a folder or file to include: -LaunchModesPropertyPage_RunAsYouType=Run as you type -LaunchModesPropertyPage_RunOnDemand=Run on demand -LaunchModesPropertyPage_RunOnFullBuild=Run on full build -LaunchModesPropertyPage_RunOnIncrementalBuild=Run on incremental build