From 19c97c7afd1f80dc8c3ff952bf433af87bf9c2c5 Mon Sep 17 00:00:00 2001 From: Markus Schorn Date: Thu, 24 Apr 2008 10:56:07 +0000 Subject: [PATCH] Improved names of keys for externalized strings by Emanuel Graf, bug 228473. --- .../internal/ui/refactoring/CRefactoring.java | 22 +++++++++--------- .../cdt/internal/ui/refactoring/Messages.java | 23 +++++++++---------- .../ui/refactoring/NodeContainer.java | 2 +- .../gettersandsetters/Messages.java | 2 +- .../hidemethod/HideMethodRefactoring.java | 2 +- .../ui/refactoring/hidemethod/Messages.java | 4 ++-- .../hidemethod/messages.properties | 2 +- .../ui/refactoring/messages.properties | 23 +++++++++---------- 8 files changed, 39 insertions(+), 41 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/CRefactoring.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/CRefactoring.java index f4b003b2ac9..ef8b395b61f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/CRefactoring.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/CRefactoring.java @@ -73,7 +73,7 @@ public abstract class CRefactoring extends Refactoring { private static final int AST_STYLE = ITranslationUnit.AST_CONFIGURE_USING_SOURCE_CONTEXT | ITranslationUnit.AST_SKIP_INDEXED_HEADERS; public static final String NEWLINE = "\n"; //$NON-NLS-1$ - protected String name = Messages.HSRRefactoring_name; + protected String name = Messages.Refactoring_name; protected IFile file; protected Region region; protected RefactoringStatus initStatus; @@ -102,7 +102,7 @@ public abstract class CRefactoring extends Refactoring { this.initStatus=new RefactoringStatus(); if (this.file == null || region == null) { - initStatus.addFatalError(Messages.HSRRefactoring_SelectionNotValid); + initStatus.addFatalError(Messages.Refactoring_SelectionNotValid); } } @@ -167,7 +167,7 @@ public abstract class CRefactoring extends Refactoring { private void addWarningToState() { if(!problemFound){ - status.addWarning(Messages.HSRRefactoring_CompileErrorInTU); + status.addWarning(Messages.Refactoring_CompileErrorInTU); problemFound = true; } } @@ -225,23 +225,23 @@ public abstract class CRefactoring extends Refactoring { public RefactoringStatus checkInitialConditions(IProgressMonitor pm) throws CoreException, OperationCanceledException { SubMonitor sm = SubMonitor.convert(pm, 10); - sm.subTask(Messages.HSRRefactoring_PM_LoadTU); + sm.subTask(Messages.Refactoring_PM_LoadTU); if(isProgressMonitorCanceld(sm, initStatus)) { return initStatus; } if(!loadTranslationUnit(initStatus, sm.newChild(8))){ - initStatus.addError(Messages.HSRRefactoring_CantLoadTU); + initStatus.addError(Messages.Refactoring_CantLoadTU); } if(isProgressMonitorCanceld(sm, initStatus)) { return initStatus; } - sm.subTask(Messages.HSRRefactoring_PM_CheckTU); + sm.subTask(Messages.Refactoring_PM_CheckTU); translationUnitHasProblem(); if(translationUnitIsAmbiguous()) { - initStatus.addError(Messages.HSRRefactoring_Ambiguity); + initStatus.addError(Messages.Refactoring_Ambiguity); } sm.worked(2); - sm.subTask(Messages.HSRRefactoring_PM_InitRef); + sm.subTask(Messages.Refactoring_PM_InitRef); sm.done(); return initStatus; } @@ -249,7 +249,7 @@ public abstract class CRefactoring extends Refactoring { protected boolean isProgressMonitorCanceld(IProgressMonitor sm, RefactoringStatus initStatus2) { if(sm.isCanceled()) { - initStatus2.addFatalError(Messages.HSRRefactoring_CanceledByUser); + initStatus2.addFatalError(Messages.Refactoring_CanceledByUser); return true; } return false; @@ -283,13 +283,13 @@ public abstract class CRefactoring extends Refactoring { SubMonitor subMonitor = SubMonitor.convert(mon, 10); if (file != null) { try { - subMonitor.subTask(Messages.HSRRefactoring_PM_ParseTU); + subMonitor.subTask(Messages.Refactoring_PM_ParseTU); unit = loadTranslationUnit(file); subMonitor.worked(2); if(isProgressMonitorCanceld(subMonitor, initStatus)) { return true; } - subMonitor.subTask(Messages.HSRRefactoring_PM_MergeComments); + subMonitor.subTask(Messages.Refactoring_PM_MergeComments); subMonitor.worked(8); } catch (CoreException e) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/Messages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/Messages.java index c796a39e9ec..c589442222f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/Messages.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/Messages.java @@ -23,23 +23,22 @@ public final class Messages extends NLS { public static String DeleteFileChange_0; public static String DeleteFileChange_1; - public static String HSRRefactoring_name; - public static String HSRRefactoring_PM_LoadTU; - public static String HSRRefactoring_PM_CheckTU; - public static String HSRRefactoring_PM_InitRef; - public static String HSRRefactoring_PM_ParseTU; - public static String HSRRefactoring_PM_MergeComments; - public static String HSRRefactoring_CanceledByUser; - public static String HSRRefactoring_CompileErrorInTU; + public static String Refactoring_name; + public static String Refactoring_PM_LoadTU; + public static String Refactoring_PM_CheckTU; + public static String Refactoring_PM_InitRef; + public static String Refactoring_PM_ParseTU; + public static String Refactoring_PM_MergeComments; + public static String Refactoring_CanceledByUser; + public static String Refactoring_CompileErrorInTU; public static String AddDeclarationNodeToClassChange_AddDeclaration; public static String CreateFileChange_CreateFile; public static String CreateFileChange_UnknownLoc; public static String CreateFileChange_FileExists; - public static String HSRRefactoring_SelectionNotValid; - public static String HSRRefactoring_CantLoadTU; - public static String HSRRefactoring_Ambiguity; + public static String Refactoring_SelectionNotValid; + public static String Refactoring_CantLoadTU; + public static String Refactoring_Ambiguity; public static String NodeContainer_Name; - public static String NodeContainer_Space; public static String NO_FILE; static { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/NodeContainer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/NodeContainer.java index 913ecb7f761..f765d9ac581 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/NodeContainer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/NodeContainer.java @@ -196,7 +196,7 @@ public class NodeContainer { @Override public String toString() { - return Messages.NodeContainer_Name + name + Messages.NodeContainer_Space + isDeclarationInScope(); + return Messages.NodeContainer_Name + name + ' ' + isDeclarationInScope(); } public boolean isReference() { 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 b1bf3da98fc..46f05a986f7 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 @@ -15,7 +15,7 @@ import org.eclipse.osgi.util.NLS; public final class Messages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.cdt.hsrrefactoring.generategettersandsetters.messages";//$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.eclipse.cdt.internal.ui.refactoring.generategettersandsetters.messages";//$NON-NLS-1$ private Messages() { // Do not instantiate diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/HideMethodRefactoring.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/HideMethodRefactoring.java index 006500a8845..473b2b60d7f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/HideMethodRefactoring.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/HideMethodRefactoring.java @@ -81,7 +81,7 @@ public class HideMethodRefactoring extends CRefactoring { this.methodToMove = getDeclaration(name); if(this.methodToMove == null) { - initStatus.addFatalError(Messages.HideMethodRefactoring_NoMethodNameSeleceted); + initStatus.addFatalError(Messages.HideMethodRefactoring_NoMethodNameSelected); return initStatus; } sm.worked(1); 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 5d248d43ee1..070f3a66e99 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 @@ -15,7 +15,7 @@ import org.eclipse.osgi.util.NLS; public final class Messages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.cdt.hsrrefactoring.hidemethod.messages";//$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.eclipse.cdt.internal.ui.refactoring.hidemethod.messages";//$NON-NLS-1$ private Messages() { // Do not instantiate @@ -23,7 +23,7 @@ public final class Messages extends NLS { public static String HideMethodRefactoring_HIDE_METHOD; public static String HideMethodRefactoring_NoNameSelected; - public static String HideMethodRefactoring_NoMethodNameSeleceted; + public static String HideMethodRefactoring_NoMethodNameSelected; public static String HideMethodRefactoring_CanOnlyHideMethods; public static String HideMethodRefactoring_FILE_CHANGE_TEXT; public static String HideMethodRefactoring_BAD_TYPE; 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 440c3f39926..fe4272506b8 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 @@ -11,7 +11,7 @@ ############################################################################### HideMethodRefactoring_HIDE_METHOD=Hide Method HideMethodRefactoring_NoNameSelected=No names selected. -HideMethodRefactoring_NoMethodNameSeleceted=No method name selected. +HideMethodRefactoring_NoMethodNameSelected=No method name selected. HideMethodRefactoring_CanOnlyHideMethods=Hide Method can only hide Methods. HideMethodRefactoring_FILE_CHANGE_TEXT=Hide HideMethodRefactoring_BAD_TYPE=Bad selection-type diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/messages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/messages.properties index dc2f353c41b..5a1bb230afd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/messages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/messages.properties @@ -11,21 +11,20 @@ ############################################################################### DeleteFileChange_0=Delete File DeleteFileChange_1=File doesn't exist. -HSRRefactoring_name=HSR Refactoring -HSRRefactoring_PM_LoadTU=Load Translation Unit -HSRRefactoring_PM_CheckTU=Check Translation Unit -HSRRefactoring_PM_InitRef=Initialize Refactoring -HSRRefactoring_PM_ParseTU=Parse Translation Unit -HSRRefactoring_PM_MergeComments=Merge Comments -HSRRefactoring_CanceledByUser=Refactoring canceled by user. -HSRRefactoring_CompileErrorInTU=The Translation Unit contains one or several problems. This can be caused by a syntax error in the code or a parser flaw. The refactoring will possibly fail. +Refactoring_name=Refactoring +Refactoring_PM_LoadTU=Load Translation Unit +Refactoring_PM_CheckTU=Check Translation Unit +Refactoring_PM_InitRef=Initialize Refactoring +Refactoring_PM_ParseTU=Parse Translation Unit +Refactoring_PM_MergeComments=Merge Comments +Refactoring_CanceledByUser=Refactoring canceled by user. +Refactoring_CompileErrorInTU=The Translation Unit contains one or several problems. This can be caused by a syntax error in the code or a parser flaw. The refactoring will possibly fail. AddDeclarationNodeToClassChange_AddDeclaration=Add Declaration to Class {0}. CreateFileChange_CreateFile=Create file: {0} CreateFileChange_UnknownLoc=Unknown Location: {0} CreateFileChange_FileExists=File already exists: {0} -HSRRefactoring_SelectionNotValid=Selection is not valid. -HSRRefactoring_CantLoadTU=Can not load translation unit. -HSRRefactoring_Ambiguity=Translation unit is ambiguous. +Refactoring_SelectionNotValid=Selection is not valid. +Refactoring_CantLoadTU=Can not load translation unit. +Refactoring_Ambiguity=Translation unit is ambiguous. NO_FILE=File not found. NodeContainer_Name=name: -NodeContainer_Space=\ \ No newline at end of file