mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-20 23:45:23 +02:00
Code Issues Wiki Activity

Improved names of keys for externalized strings by Emanuel Graf, bug 228473.

Browse source
This commit is contained in:
Markus Schorn 2008-04-24 10:56:07 +00:00
parent ea74d07999
commit 19c97c7afd
8 changed files with 39 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/CRefactoring.java
View file

@ -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; 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$ 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 IFile file;
protected Region region; protected Region region;
protected RefactoringStatus initStatus; protected RefactoringStatus initStatus;
@ -102,7 +102,7 @@ public abstract class CRefactoring extends Refactoring {
this.initStatus=new RefactoringStatus(); this.initStatus=new RefactoringStatus();
if (this.file == null || region == null) { 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() { private void addWarningToState() {
if(!problemFound){ if(!problemFound){
status.addWarning(Messages.HSRRefactoring_CompileErrorInTU); status.addWarning(Messages.Refactoring_CompileErrorInTU);
problemFound = true; problemFound = true;
} }
} }
@ -225,23 +225,23 @@ public abstract class CRefactoring extends Refactoring {
public RefactoringStatus checkInitialConditions(IProgressMonitor pm) public RefactoringStatus checkInitialConditions(IProgressMonitor pm)
throws CoreException, OperationCanceledException { throws CoreException, OperationCanceledException {
SubMonitor sm = SubMonitor.convert(pm, 10); SubMonitor sm = SubMonitor.convert(pm, 10);
sm.subTask(Messages.HSRRefactoring_PM_LoadTU); sm.subTask(Messages.Refactoring_PM_LoadTU);
if(isProgressMonitorCanceld(sm, initStatus)) { if(isProgressMonitorCanceld(sm, initStatus)) {
return initStatus; return initStatus;
} }
if(!loadTranslationUnit(initStatus, sm.newChild(8))){ if(!loadTranslationUnit(initStatus, sm.newChild(8))){
initStatus.addError(Messages.HSRRefactoring_CantLoadTU); initStatus.addError(Messages.Refactoring_CantLoadTU);
} }
if(isProgressMonitorCanceld(sm, initStatus)) { if(isProgressMonitorCanceld(sm, initStatus)) {
return initStatus; return initStatus;
} }
sm.subTask(Messages.HSRRefactoring_PM_CheckTU); sm.subTask(Messages.Refactoring_PM_CheckTU);
translationUnitHasProblem(); translationUnitHasProblem();
if(translationUnitIsAmbiguous()) { if(translationUnitIsAmbiguous()) {
initStatus.addError(Messages.HSRRefactoring_Ambiguity); initStatus.addError(Messages.Refactoring_Ambiguity);
} }
sm.worked(2); sm.worked(2);
sm.subTask(Messages.HSRRefactoring_PM_InitRef); sm.subTask(Messages.Refactoring_PM_InitRef);
sm.done(); sm.done();
return initStatus; return initStatus;
} }
@ -249,7 +249,7 @@ public abstract class CRefactoring extends Refactoring {
protected boolean isProgressMonitorCanceld(IProgressMonitor sm, protected boolean isProgressMonitorCanceld(IProgressMonitor sm,
RefactoringStatus initStatus2) { RefactoringStatus initStatus2) {
if(sm.isCanceled()) { if(sm.isCanceled()) {
initStatus2.addFatalError(Messages.HSRRefactoring_CanceledByUser); initStatus2.addFatalError(Messages.Refactoring_CanceledByUser);
return true; return true;
} }
return false; return false;
@ -283,13 +283,13 @@ public abstract class CRefactoring extends Refactoring {
SubMonitor subMonitor = SubMonitor.convert(mon, 10); SubMonitor subMonitor = SubMonitor.convert(mon, 10);
if (file != null) { if (file != null) {
try { try {
subMonitor.subTask(Messages.HSRRefactoring_PM_ParseTU); subMonitor.subTask(Messages.Refactoring_PM_ParseTU);
unit = loadTranslationUnit(file); unit = loadTranslationUnit(file);
subMonitor.worked(2); subMonitor.worked(2);
if(isProgressMonitorCanceld(subMonitor, initStatus)) { if(isProgressMonitorCanceld(subMonitor, initStatus)) {
return true; return true;
} }
subMonitor.subTask(Messages.HSRRefactoring_PM_MergeComments); subMonitor.subTask(Messages.Refactoring_PM_MergeComments);
subMonitor.worked(8); subMonitor.worked(8);
} catch (CoreException e) { } catch (CoreException e) {

23
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/Messages.java
View file

@ -23,23 +23,22 @@ public final class Messages extends NLS {
public static String DeleteFileChange_0; public static String DeleteFileChange_0;
public static String DeleteFileChange_1; public static String DeleteFileChange_1;
public static String HSRRefactoring_name; public static String Refactoring_name;
public static String HSRRefactoring_PM_LoadTU; public static String Refactoring_PM_LoadTU;
public static String HSRRefactoring_PM_CheckTU; public static String Refactoring_PM_CheckTU;
public static String HSRRefactoring_PM_InitRef; public static String Refactoring_PM_InitRef;
public static String HSRRefactoring_PM_ParseTU; public static String Refactoring_PM_ParseTU;
public static String HSRRefactoring_PM_MergeComments; public static String Refactoring_PM_MergeComments;
public static String HSRRefactoring_CanceledByUser; public static String Refactoring_CanceledByUser;
public static String HSRRefactoring_CompileErrorInTU; public static String Refactoring_CompileErrorInTU;
public static String AddDeclarationNodeToClassChange_AddDeclaration; public static String AddDeclarationNodeToClassChange_AddDeclaration;
public static String CreateFileChange_CreateFile; public static String CreateFileChange_CreateFile;
public static String CreateFileChange_UnknownLoc; public static String CreateFileChange_UnknownLoc;
public static String CreateFileChange_FileExists; public static String CreateFileChange_FileExists;
public static String HSRRefactoring_SelectionNotValid; public static String Refactoring_SelectionNotValid;
public static String HSRRefactoring_CantLoadTU; public static String Refactoring_CantLoadTU;
public static String HSRRefactoring_Ambiguity; public static String Refactoring_Ambiguity;
public static String NodeContainer_Name; public static String NodeContainer_Name;
public static String NodeContainer_Space;
public static String NO_FILE; public static String NO_FILE;
static { static {

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/NodeContainer.java
View file

@ -196,7 +196,7 @@ public class NodeContainer {
@Override @Override
public String toString() { public String toString() {
return Messages.NodeContainer_Name + name + Messages.NodeContainer_Space + isDeclarationInScope(); return Messages.NodeContainer_Name + name + ' ' + isDeclarationInScope();
} }
public boolean isReference() { public boolean isReference() {

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/Messages.java
View file

@ -15,7 +15,7 @@ import org.eclipse.osgi.util.NLS;
public final class Messages extends 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() { private Messages() {
// Do not instantiate // Do not instantiate

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/HideMethodRefactoring.java
View file

@ -81,7 +81,7 @@ public class HideMethodRefactoring extends CRefactoring {
this.methodToMove = getDeclaration(name); this.methodToMove = getDeclaration(name);
if(this.methodToMove == null) { if(this.methodToMove == null) {
initStatus.addFatalError(Messages.HideMethodRefactoring_NoMethodNameSeleceted); initStatus.addFatalError(Messages.HideMethodRefactoring_NoMethodNameSelected);
return initStatus; return initStatus;
} }
sm.worked(1); sm.worked(1);

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/Messages.java
View file

@ -15,7 +15,7 @@ import org.eclipse.osgi.util.NLS;
public final class Messages extends 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() { private Messages() {
// Do not instantiate // Do not instantiate
@ -23,7 +23,7 @@ public final class Messages extends NLS {
public static String HideMethodRefactoring_HIDE_METHOD; public static String HideMethodRefactoring_HIDE_METHOD;
public static String HideMethodRefactoring_NoNameSelected; public static String HideMethodRefactoring_NoNameSelected;
public static String HideMethodRefactoring_NoMethodNameSeleceted; public static String HideMethodRefactoring_NoMethodNameSelected;
public static String HideMethodRefactoring_CanOnlyHideMethods; public static String HideMethodRefactoring_CanOnlyHideMethods;
public static String HideMethodRefactoring_FILE_CHANGE_TEXT; public static String HideMethodRefactoring_FILE_CHANGE_TEXT;
public static String HideMethodRefactoring_BAD_TYPE; public static String HideMethodRefactoring_BAD_TYPE;

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/messages.properties
View file

@ -11,7 +11,7 @@
############################################################################### ###############################################################################
HideMethodRefactoring_HIDE_METHOD=Hide Method HideMethodRefactoring_HIDE_METHOD=Hide Method
HideMethodRefactoring_NoNameSelected=No names selected. 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_CanOnlyHideMethods=Hide Method can only hide Methods.
HideMethodRefactoring_FILE_CHANGE_TEXT=Hide HideMethodRefactoring_FILE_CHANGE_TEXT=Hide
HideMethodRefactoring_BAD_TYPE=Bad selection-type HideMethodRefactoring_BAD_TYPE=Bad selection-type

23
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/messages.properties
View file

@ -11,21 +11,20 @@
############################################################################### ###############################################################################
DeleteFileChange_0=Delete File DeleteFileChange_0=Delete File
DeleteFileChange_1=File doesn't exist. DeleteFileChange_1=File doesn't exist.
HSRRefactoring_name=HSR Refactoring Refactoring_name=Refactoring
HSRRefactoring_PM_LoadTU=Load Translation Unit Refactoring_PM_LoadTU=Load Translation Unit
HSRRefactoring_PM_CheckTU=Check Translation Unit Refactoring_PM_CheckTU=Check Translation Unit
HSRRefactoring_PM_InitRef=Initialize Refactoring Refactoring_PM_InitRef=Initialize Refactoring
HSRRefactoring_PM_ParseTU=Parse Translation Unit Refactoring_PM_ParseTU=Parse Translation Unit
HSRRefactoring_PM_MergeComments=Merge Comments Refactoring_PM_MergeComments=Merge Comments
HSRRefactoring_CanceledByUser=Refactoring canceled by user. Refactoring_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_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}. AddDeclarationNodeToClassChange_AddDeclaration=Add Declaration to Class {0}.
CreateFileChange_CreateFile=Create file: {0} CreateFileChange_CreateFile=Create file: {0}
CreateFileChange_UnknownLoc=Unknown Location: {0} CreateFileChange_UnknownLoc=Unknown Location: {0}
CreateFileChange_FileExists=File already exists: {0} CreateFileChange_FileExists=File already exists: {0}
HSRRefactoring_SelectionNotValid=Selection is not valid. Refactoring_SelectionNotValid=Selection is not valid.
HSRRefactoring_CantLoadTU=Can not load translation unit. Refactoring_CantLoadTU=Can not load translation unit.
HSRRefactoring_Ambiguity=Translation unit is ambiguous. Refactoring_Ambiguity=Translation unit is ambiguous.
NO_FILE=File not found. NO_FILE=File not found.
NodeContainer_Name=name: NodeContainer_Name=name:
NodeContainer_Space=\