From d1dd70ab0b8f13f2439299fff0d79c8dcf08aa2f Mon Sep 17 00:00:00 2001 From: Markus Schorn Date: Fri, 23 May 2008 09:03:43 +0000 Subject: [PATCH] Removes unused and duplicated externalized strings, bug 233194. --- .../ui/preferences/PreferencesMessages.properties | 1 - .../internal/ui/refactoring/dialogs/messages.properties | 2 -- .../internal/ui/refactoring/extractfunction/Messages.java | 2 +- .../ui/refactoring/extractfunction/messages.properties | 2 +- .../ui/refactoring/gettersandsetters/Messages.java | 1 - .../ui/refactoring/gettersandsetters/messages.properties | 1 - .../cdt/internal/ui/refactoring/hidemethod/Messages.java | 7 ------- .../ui/refactoring/hidemethod/messages.properties | 8 -------- .../internal/ui/refactoring/implementmethod/Messages.java | 1 - .../ui/refactoring/implementmethod/messages.properties | 1 - 10 files changed, 2 insertions(+), 24 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties index 97d45f011ee..a5a1d8051c6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties @@ -441,5 +441,4 @@ ScalabilityPreferencePage_contentAssist_label= Disable parsing-based content ass ScalabilityPreferencePage_contentAssist_autoActivation= Disable content assist auto-activation ScalabilityPreferencePage_note=Note: ScalabilityPreferencePage_preferenceOnlyForNewEditors=Some options do not affect open editors -ScalabilityPreferencePage_error=Value must be an integer between {0} and {1}. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/messages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/messages.properties index e51e6e68916..7ad17a0acd3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/messages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/messages.properties @@ -19,5 +19,3 @@ ValidatingLabeledTextField_CantBeEmpty=Cannot be empty ValidatingLabeledTextField_InvalidCharacters=Invalid characters ValidatingLabeledTextField_DuplicatedNames=Duplicated name ValidatingLabeledTextField_IsKeyword=Keyword -ValidatingLabeledTextField_IsKeyword=Keyword -ValidatingLabeledTextField_IsKeyword=Keyword diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/Messages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/Messages.java index f91c0d5509c..74df980c918 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/Messages.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/Messages.java @@ -34,7 +34,7 @@ public final class Messages extends NLS { public static String ExtractFunctionComposite_ReturnValue; public static String ExtractFunctionRefactoring_CreateMethodDef; public static String ExtractFunctionRefactoring_CreateFunctionDef; - public static String ExtractFunctionComposite_ReplaceDuplicates; +// public static String ExtractFunctionComposite_ReplaceDuplicates; public static String ExtractFunctionRefactoring_CreateMethodCall; public static String ExtractFunctionRefactoring_CreateFunctionCall; public static String ChooserComposite_Return; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/messages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/messages.properties index 1fbb64204ae..f6285ad3fd0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/messages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/messages.properties @@ -22,7 +22,7 @@ ExtractFunctionInputPage_1=is used after the extracted block - it needs to be pa ExtractFunctionComposite_ReturnValue=Return value: ExtractFunctionRefactoring_CreateMethodDef=Create Method Definition ExtractFunctionRefactoring_CreateFunctionDef=Create Function Definition -ExtractFunctionComposite_ReplaceDuplicates=Replace all occurrences of statements with method. +#ExtractFunctionComposite_ReplaceDuplicates=Replace all occurrences of statements with method. ExtractFunctionRefactoring_CreateMethodCall=Create Method Call ExtractFunctionRefactoring_CreateFunctionCall=Create Function Call ChooserComposite_Return=Return diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/Messages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/Messages.java index 46f05a986f7..a0f17674abb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/Messages.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/Messages.java @@ -21,7 +21,6 @@ public final class Messages extends NLS { // Do not instantiate } - public static String GenerateGettersAndSettersRefactoring_Insert; public static String GettersAndSetters_Name; static { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/messages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/messages.properties index abb369946b0..a3f392a75a3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/messages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/messages.properties @@ -1,2 +1 @@ GettersAndSetters_Name=Generate Getters and Setters -GenerateGettersAndSettersRefactoring_Insert=Insert diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/Messages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/Messages.java index 4b898db73db..1ca4a07b77c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/Messages.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/Messages.java @@ -27,15 +27,8 @@ public final class Messages extends NLS { public static String HideMethodRefactoring_NoMethodNameSelected; public static String HideMethodRefactoring_CanOnlyHideMethods; public static String HideMethodRefactoring_FILE_CHANGE_TEXT; - public static String HideMethodRefactoring_BAD_TYPE; - public static String HideMethodRefactoring_NO_SELECTION; - public static String HideMethodRefactoring_BAD_DIALECT; - public static String HideMethodRefactoring_NO_FILE; - public static String HideMethodRefactoring_NO_PROPER_SELECTION; - public static String HideMethodRefactoring_EDITOR_NOT_SAVE; public static String HideMethodRefactoring_EnclosingClassNotFound; public static String HideMethodRefactoring_IsAlreadyPrivate; - public static String HideMethodRefactoring_NO_NODES; static { NLS.initializeMessages(BUNDLE_NAME, Messages.class); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/messages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/messages.properties index 98be99bd063..def8343eafb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/messages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/messages.properties @@ -15,14 +15,6 @@ HideMethodRefactoring_NoNameSelected=No names selected. HideMethodRefactoring_NoMethodNameSelected=No method name selected. HideMethodRefactoring_CanOnlyHideMethods=Hide Method can only hide Member Functions. HideMethodRefactoring_FILE_CHANGE_TEXT=Hide -HideMethodRefactoring_BAD_TYPE=Bad selection-type -HideMethodRefactoring_NO_SELECTION=No Selection available. - -HideMethodRefactoring_BAD_DIALECT=Not Supported Dialect -HideMethodRefactoring_NO_FILE=There is no file marked. -HideMethodRefactoring_NO_PROPER_SELECTION=No proper Selection\! -HideMethodRefactoring_EDITOR_NOT_SAVE=Editor is not saved HideMethodRefactoring_EnclosingClassNotFound=Enclosing class not found. HideMethodRefactoring_IsAlreadyPrivate=Method is already private. -HideMethodRefactoring_NO_NODES=No nodes found. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/Messages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/Messages.java index 21a72080a39..344446d8f88 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/Messages.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/Messages.java @@ -22,7 +22,6 @@ public final class Messages extends NLS { // Do not instantiate } - public static String ImplementMethodRefactoring_MethodDefinition; public static String ParameterNamesInputPage_Title; public static String ParameterNamesInputPage_CompleteMissingMails; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/messages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/messages.properties index ce6f08648e5..63cb2a2cd48 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/messages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/messages.properties @@ -12,4 +12,3 @@ ############################################################################### ParameterNamesInputPage_Title=Implement Method ParameterNamesInputPage_CompleteMissingMails=Please complete the missing variable names: -ImplementMethodRefactoring_MethodDefinition=Method Definition