diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/ASTManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/ASTManager.java index e1a6f413e58..5b7b1af0aa9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/ASTManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/ASTManager.java @@ -821,7 +821,7 @@ public class ASTManager { if (fArgument.getSourceFile() == null) return; - pm.beginTask(Messages.ASTManager_task_analyze, 2); + pm.beginTask(RenameMessages.ASTManager_task_analyze, 2); IASTTranslationUnit tu= getTranslationUnit(index, fArgument.getSourceFile(), true, status); pm.worked(1); if (tu != null) { @@ -930,7 +930,7 @@ public class ASTManager { } int count= store.getFileCount(); - String taskName= Messages.ASTManager_task_generateAst; + String taskName= RenameMessages.ASTManager_task_generateAst; monitor.beginTask(taskName, 2*count); monitor.setTaskName(taskName); @@ -943,7 +943,7 @@ public class ASTManager { if (store.contains(file)) { if ((now = System.currentTimeMillis()) > update) { String nofm= nth_of_m(cc, count); - String taskname= NLS.bind(Messages.ASTManager_subtask_analyzing, nofm); + String taskname= NLS.bind(RenameMessages.ASTManager_subtask_analyzing, nofm); monitor.subTask(taskname); update= now + 1000; } @@ -1033,7 +1033,7 @@ public class ASTManager { IASTName macroName= mdef.getName(); String macroNameStr= macroName.toString(); if (fRenameTo.equals(macroNameStr)) { - status.addFatalError(NLS.bind(Messages.ASTManager_error_macro_name_conflict, fRenameTo)); + status.addFatalError(NLS.bind(RenameMessages.ASTManager_error_macro_name_conflict, fRenameTo)); return; } else if (lookfor.equals(macroNameStr)) { IPath path= analyzeAstMatch(macroName, store, false, status); @@ -1238,16 +1238,16 @@ public class ASTManager { if (fProblemUnits.add(fpath)) { String msg= pb.getMessage(); if (msg != null && msg.length() > 0) { - msg= NLS.bind(Messages.ASTManager_warning_parsingError_detailed, msg); + msg= NLS.bind(RenameMessages.ASTManager_warning_parsingError_detailed, msg); } else { - msg= Messages.ASTManager_warning_parsingError; + msg= RenameMessages.ASTManager_warning_parsingError; } int line= pb.getLineNumber(); if (line >= 1) { - msg= NLS.bind(Messages.ASTManager_warning_parsingError_withFileAndLine, + msg= NLS.bind(RenameMessages.ASTManager_warning_parsingError_withFileAndLine, new Object[] { msg, fpath, line }); } else { - msg= NLS.bind(Messages.ASTManager_warning_parsingError_withFile, msg, fpath); + msg= NLS.bind(RenameMessages.ASTManager_warning_parsingError_withFile, msg, fpath); } status.addWarning(msg); } @@ -1302,14 +1302,14 @@ public class ASTManager { String[] errs= null; if (isMacro) { errs= new String[] { - Messages.CRenameLocalProcessor_error_conflict }; + RenameMessages.CRenameLocalProcessor_error_conflict }; cflc[0]= fConflictingBinding; } else { errs= new String[] { - Messages.CRenameLocalProcessor_error_shadow, - Messages.CRenameLocalProcessor_error_redeclare, - Messages.CRenameLocalProcessor_error_isShadowed, - Messages.CRenameLocalProcessor_error_overloads }; + RenameMessages.CRenameLocalProcessor_error_shadow, + RenameMessages.CRenameLocalProcessor_error_redeclare, + RenameMessages.CRenameLocalProcessor_error_isShadowed, + RenameMessages.CRenameLocalProcessor_error_overloads }; classifyConflictingBindings(tu, (Set) cflc[0], (List) cflc[1], (List) cflc[2], status); } @@ -1323,32 +1323,32 @@ public class ASTManager { String what= null; if (conflict instanceof IEnumerator) { if (isVarParEnumerator || isFunction || isMacro) { - what= Messages.CRenameLocalProcessor_enumerator; + what= RenameMessages.CRenameLocalProcessor_enumerator; } } else if (conflict instanceof ICPPField) { if (isVarParEnumerator || isFunction || isMacro) { - what= Messages.CRenameLocalProcessor_field; + what= RenameMessages.CRenameLocalProcessor_field; } } else if (conflict instanceof IParameter) { if (isVarParEnumerator || isFunction || isMacro) { if (i == 1 && argKind == CRefactory.ARGUMENT_LOCAL_VAR) { msg= errs[0]; } - what= Messages.CRenameLocalProcessor_parameter; + what= RenameMessages.CRenameLocalProcessor_parameter; } } else if (conflict instanceof IVariable) { if (isVarParEnumerator || isFunction || isMacro) { IVariable conflictingVar= (IVariable) conflict; - what= Messages.CRenameLocalProcessor_globalVariable; + what= RenameMessages.CRenameLocalProcessor_globalVariable; if (ASTManager.isLocalVariable(conflictingVar)) { if (i == 1 && argKind == CRefactory.ARGUMENT_PARAMETER) { msg= errs[2]; } - what= Messages.CRenameLocalProcessor_localVariable; + what= RenameMessages.CRenameLocalProcessor_localVariable; } else { try { if (conflictingVar.isStatic()) { - what= Messages.CRenameProcessorDelegate_fileStaticVariable; + what= RenameMessages.CRenameProcessorDelegate_fileStaticVariable; } } catch (DOMException e) { } @@ -1356,7 +1356,7 @@ public class ASTManager { } } else if (conflict instanceof ICPPConstructor) { if (isVarParEnumerator || isFunction || isMacro) { - what= Messages.CRenameLocalProcessor_constructor; + what= RenameMessages.CRenameLocalProcessor_constructor; } } else if (conflict instanceof ICPPMethod) { if (isVarParEnumerator || isFunction || isMacro) { @@ -1373,7 +1373,7 @@ public class ASTManager { } } } - what= Messages.CRenameLocalProcessor_method; + what= RenameMessages.CRenameLocalProcessor_method; } } else if (conflict instanceof IFunction) { if (isVarParEnumerator || isFunction || isMacro) { @@ -1407,9 +1407,9 @@ public class ASTManager { } catch (DOMException e) { } if (isStatic) { - what= Messages.CRenameProcessorDelegate_fileStaticFunction; + what= RenameMessages.CRenameProcessorDelegate_fileStaticFunction; } else { - what= Messages.CRenameProcessorDelegate_globalFunction; + what= RenameMessages.CRenameProcessorDelegate_globalFunction; } } } @@ -1417,21 +1417,21 @@ public class ASTManager { conflict instanceof IEnumeration || conflict instanceof ITypedef) { if (isContainer || isMacro) { - what= Messages.CRenameProcessorDelegate_type; + what= RenameMessages.CRenameProcessorDelegate_type; } } else if (conflict instanceof ICPPNamespace) { if (isContainer || isMacro) { - what= Messages.CRenameProcessorDelegate_namespace; + what= RenameMessages.CRenameProcessorDelegate_namespace; if (argKind == CRefactory.ARGUMENT_NAMESPACE) { warn= true; } } } if (what != null) { - String message = Messages.CRenameLocalProcessor_error_message; - String message1 = NLS.bind(Messages.CRenameLocalProcessor_error_message1, msg); - String message2 = NLS.bind(Messages.CRenameLocalProcessor_error_message2, conflict.getName()); - String message3 = NLS.bind(Messages.CRenameLocalProcessor_error_message3, what); + String message = RenameMessages.CRenameLocalProcessor_error_message; + String message1 = NLS.bind(RenameMessages.CRenameLocalProcessor_error_message1, msg); + String message2 = NLS.bind(RenameMessages.CRenameLocalProcessor_error_message2, conflict.getName()); + String message3 = NLS.bind(RenameMessages.CRenameLocalProcessor_error_message3, what); String space = " \n"; //$NON-NLS-1$ String formatted = message + space + message1 + space + message2 + space + message3; RefactoringStatusEntry[] entries= status.getEntries(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRefactoringMatch.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRefactoringMatch.java index de1e450c479..63cc8decf52 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRefactoringMatch.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRefactoringMatch.java @@ -25,11 +25,11 @@ public class CRefactoringMatch { public static final int IN_COMMENT = 4; private static String[] LABELS= { - Messages.CRefactoringMatch_label_potentialOccurrence, - Messages.CRefactoringMatch_label_occurrence, + RenameMessages.CRefactoringMatch_label_potentialOccurrence, + RenameMessages.CRefactoringMatch_label_occurrence, "", //$NON-NLS-1$ - Messages.CRefactoringMatch_label_potentialOccurrence, - Messages.CRefactoringMatch_label_comment }; + RenameMessages.CRefactoringMatch_label_potentialOccurrence, + RenameMessages.CRefactoringMatch_label_comment }; private IFile fFile; private int fOffset; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRefactory.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRefactory.java index 9474a1c268a..f5688fbed7c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRefactory.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRefactory.java @@ -86,7 +86,7 @@ public class CRefactory { CRenameRefactoring r= new CRenameRefactoring(processor); RefactoringWizardOpenOperation op= new RefactoringWizardOpenOperation(new CRenameRefactoringWizard(r)); - op.run(shell, Messages.CRefactory_title_rename); + op.run(shell, RenameMessages.CRefactory_title_rename); } finally { processor.unlockIndex(); } @@ -113,7 +113,7 @@ public class CRefactory { CRenameRefactoring r= new CRenameRefactoring(processor); RefactoringWizardOpenOperation op= new RefactoringWizardOpenOperation(new CRenameRefactoringWizard(r)); - op.run(shell, Messages.CRefactory_title_rename); + op.run(shell, RenameMessages.CRefactory_title_rename); } finally { processor.unlockIndex(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameMethodProcessor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameMethodProcessor.java index c7ce33b7c9b..435ac06b9f3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameMethodProcessor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameMethodProcessor.java @@ -48,16 +48,16 @@ public class CRenameMethodProcessor extends CRenameGlobalProcessor { CRefactoringArgument argument= getArgument(); IBinding binding= argument.getBinding(); if (binding instanceof ICPPConstructor) { - return RefactoringStatus.createFatalErrorStatus(Messages.CRenameMethodProcessor_fatalError_renameConstructor); + return RefactoringStatus.createFatalErrorStatus(RenameMessages.CRenameMethodProcessor_fatalError_renameConstructor); } String identifier= argument.getName(); if (identifier.startsWith("~")) { //$NON-NLS-1$ - return RefactoringStatus.createFatalErrorStatus(Messages.CRenameMethodProcessor_fatalError_renameDestructor); + return RefactoringStatus.createFatalErrorStatus(RenameMessages.CRenameMethodProcessor_fatalError_renameDestructor); } if (identifier.startsWith("operator") && //$NON-NLS-1$ identifier.length() > 8 && !CRefactoringUtils.isIdentifierChar(identifier.charAt(8))) { - return RefactoringStatus.createFatalErrorStatus(Messages.CRenameMethodProcessor_fatalError_renameOperator); + return RefactoringStatus.createFatalErrorStatus(RenameMessages.CRenameMethodProcessor_fatalError_renameOperator); } return super.checkInitialConditions(pm); } @@ -79,18 +79,18 @@ public class CRenameMethodProcessor extends CRenameGlobalProcessor { IASTCompositeTypeSpecifier se= (IASTCompositeTypeSpecifier) node; IASTName name= ASTManager.getSimpleName(se.getName()); if (getReplacementText().equals(name.toString())) { - return RefactoringStatus.createFatalErrorStatus(Messages.CRenameMethodProcessor_fatalError_renameToConstructor); + return RefactoringStatus.createFatalErrorStatus(RenameMessages.CRenameMethodProcessor_fatalError_renameToConstructor); } if (getReplacementText().startsWith("~")) { //$NON-NLS-1$ - return RefactoringStatus.createFatalErrorStatus(Messages.CRenameMethodProcessor_fatalError_renameToDestructor); + return RefactoringStatus.createFatalErrorStatus(RenameMessages.CRenameMethodProcessor_fatalError_renameToDestructor); } if (!CRefactoringUtils.checkIdentifier(getReplacementText())) { - result.merge(RefactoringStatus.createErrorStatus(Messages.CRenameMethodProcessor_warning_illegalCharacters)); + result.merge(RefactoringStatus.createErrorStatus(RenameMessages.CRenameMethodProcessor_warning_illegalCharacters)); } } } if (argument.getArgumentKind() == CRefactory.ARGUMENT_VIRTUAL_METHOD && (getSelectedOptions() & CRefactory.OPTION_DO_VIRTUAL) == 0) { - result.merge(RefactoringStatus.createWarningStatus(Messages.CRenameMethodProcessor_warning_renameVirtual)); + result.merge(RefactoringStatus.createWarningStatus(RenameMessages.CRenameMethodProcessor_warning_renameVirtual)); } result.merge(super.checkFinalConditions(monitor, context)); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameProcessor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameProcessor.java index 7c24fabb348..611733384ee 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameProcessor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameProcessor.java @@ -83,11 +83,11 @@ public class CRenameProcessor extends RenameProcessor { if (result == null) { String identifier= getArgument().getName(); if (identifier != null && identifier.length() > 0) { - result= NLS.bind(Messages.CRenameTopProcessor_wizard_title, identifier); + result= NLS.bind(RenameMessages.CRenameTopProcessor_wizard_title, identifier); } } if (result == null) { - result= Messages.CRenameTopProcessor_wizard_backup_title; + result= RenameMessages.CRenameTopProcessor_wizard_backup_title; } return result; @@ -108,7 +108,7 @@ public class CRenameProcessor extends RenameProcessor { identifier= fArgument.getName(); } if (identifier == null || identifier.length() < 1) { - status.addFatalError(Messages.CRenameTopProcessor_error_invalidTextSelection); + status.addFatalError(RenameMessages.CRenameTopProcessor_error_invalidTextSelection); return status; } IFile file= fArgument.getSourceFile(); @@ -117,12 +117,12 @@ public class CRenameProcessor extends RenameProcessor { path= file.getLocation(); } if (path == null) { - return RefactoringStatus.createFatalErrorStatus(Messages.CRenameTopProcessor_error_renameWithoutSourceFile); + return RefactoringStatus.createFatalErrorStatus(RenameMessages.CRenameTopProcessor_error_renameWithoutSourceFile); } fDelegate= createDelegate(); if (fDelegate == null) { - status.addFatalError(Messages.CRenameTopProcessor_error_invalidName); + status.addFatalError(RenameMessages.CRenameTopProcessor_error_invalidName); return status; } RefactoringStatus s1= fDelegate.checkInitialConditions(new NullProgressMonitor()); @@ -134,42 +134,42 @@ public class CRenameProcessor extends RenameProcessor { switch (fArgument.getArgumentKind()) { case CRefactory.ARGUMENT_LOCAL_VAR: return new CRenameLocalProcessor(this, - Messages.CRenameTopProcessor_localVar, + RenameMessages.CRenameTopProcessor_localVar, fArgument.getScope()); case CRefactory.ARGUMENT_PARAMETER: return new CRenameLocalProcessor(this, - Messages.CRenameTopProcessor_parameter, + RenameMessages.CRenameTopProcessor_parameter, fArgument.getScope()); case CRefactory.ARGUMENT_FILE_LOCAL_VAR: return new CRenameLocalProcessor(this, - Messages.CRenameTopProcessor_filelocalVar, + RenameMessages.CRenameTopProcessor_filelocalVar, null); case CRefactory.ARGUMENT_GLOBAL_VAR: - return new CRenameGlobalProcessor(this, Messages.CRenameTopProcessor_globalVar); + return new CRenameGlobalProcessor(this, RenameMessages.CRenameTopProcessor_globalVar); case CRefactory.ARGUMENT_ENUMERATOR: - return new CRenameGlobalProcessor(this, Messages.CRenameTopProcessor_enumerator); + return new CRenameGlobalProcessor(this, RenameMessages.CRenameTopProcessor_enumerator); case CRefactory.ARGUMENT_FIELD: - return new CRenameGlobalProcessor(this, Messages.CRenameTopProcessor_field); + return new CRenameGlobalProcessor(this, RenameMessages.CRenameTopProcessor_field); case CRefactory.ARGUMENT_FILE_LOCAL_FUNCTION: return new CRenameLocalProcessor(this, - Messages.CRenameTopProcessor_filelocalFunction, + RenameMessages.CRenameTopProcessor_filelocalFunction, null); case CRefactory.ARGUMENT_GLOBAL_FUNCTION: - return new CRenameGlobalProcessor(this, Messages.CRenameTopProcessor_globalFunction); + return new CRenameGlobalProcessor(this, RenameMessages.CRenameTopProcessor_globalFunction); case CRefactory.ARGUMENT_VIRTUAL_METHOD: - return new CRenameMethodProcessor(this, Messages.CRenameTopProcessor_virtualMethod, true); + return new CRenameMethodProcessor(this, RenameMessages.CRenameTopProcessor_virtualMethod, true); case CRefactory.ARGUMENT_NON_VIRTUAL_METHOD: - return new CRenameMethodProcessor(this, Messages.CRenameTopProcessor_method, false); + return new CRenameMethodProcessor(this, RenameMessages.CRenameTopProcessor_method, false); case CRefactory.ARGUMENT_CLASS_TYPE: - return new CRenameClassProcessor(this, Messages.CRenameTopProcessor_type); + return new CRenameClassProcessor(this, RenameMessages.CRenameTopProcessor_type); case CRefactory.ARGUMENT_NAMESPACE: - return new CRenameTypeProcessor(this, Messages.CRenameTopProcessor_namespace); + return new CRenameTypeProcessor(this, RenameMessages.CRenameTopProcessor_namespace); case CRefactory.ARGUMENT_TYPE: - return new CRenameTypeProcessor(this, Messages.CRenameTopProcessor_type); + return new CRenameTypeProcessor(this, RenameMessages.CRenameTopProcessor_type); case CRefactory.ARGUMENT_MACRO: - return new CRenameMacroProcessor(this, Messages.CRenameTopProcessor_macro); + return new CRenameMacroProcessor(this, RenameMessages.CRenameTopProcessor_macro); case CRefactory.ARGUMENT_INCLUDE_DIRECTIVE: - return new CRenameIncludeProcessor(this, Messages.CRenameIncludeProcessor_includeDirective); + return new CRenameIncludeProcessor(this, RenameMessages.CRenameIncludeProcessor_includeDirective); default: return null; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameProcessorDelegate.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameProcessorDelegate.java index 8bb0227963a..d0ee515963c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameProcessorDelegate.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameProcessorDelegate.java @@ -112,7 +112,7 @@ public abstract class CRenameProcessorDelegate { final public String getProcessorName() { String identifier= getArgument().getName(); if (identifier != null) { - return NLS.bind(Messages.CRenameProcessorDelegate_wizard_title, fProcessorBaseName, identifier); + return NLS.bind(RenameMessages.CRenameProcessorDelegate_wizard_title, fProcessorBaseName, identifier); } return null; } @@ -209,7 +209,7 @@ public abstract class CRenameProcessorDelegate { public RefactoringStatus checkFinalConditions(IProgressMonitor monitor, CheckConditionsContext context) throws CoreException, OperationCanceledException { RefactoringStatus result= new RefactoringStatus(); - monitor.beginTask(Messages.CRenameProcessorDelegate_task_checkFinalCondition, 2); + monitor.beginTask(RenameMessages.CRenameProcessorDelegate_task_checkFinalCondition, 2); IFile file= getArgument().getSourceFile(); //assert file!=null; @@ -258,18 +258,18 @@ public abstract class CRenameProcessorDelegate { if (potentialMatchCount != 0) { String msg= null; if (potentialMatchCount == 1) { - msg= Messages.CRenameProcessorDelegate_warning_potentialMatch_singular; + msg= RenameMessages.CRenameProcessorDelegate_warning_potentialMatch_singular; } else { - msg= NLS.bind(Messages.CRenameProcessorDelegate_warning_potentialMatch_plural, potentialMatchCount); + msg= NLS.bind(RenameMessages.CRenameProcessorDelegate_warning_potentialMatch_plural, potentialMatchCount); } result.addWarning(msg); } if (commentCount != 0) { String msg= null; if (commentCount == 1) { - msg= Messages.CRenameProcessorDelegate_warning_commentMatch_singular; + msg= RenameMessages.CRenameProcessorDelegate_warning_commentMatch_singular; } else { - msg= NLS.bind(Messages.CRenameProcessorDelegate_warning_commentMatch_plural, commentCount); + msg= NLS.bind(RenameMessages.CRenameProcessorDelegate_warning_commentMatch_plural, commentCount); } result.addWarning(msg); } @@ -326,7 +326,7 @@ public abstract class CRenameProcessorDelegate { return m1.getOffset() - m2.getOffset(); }}); - pm.beginTask(Messages.CRenameProcessorDelegate_task_createChange, fMatches.size()); + pm.beginTask(RenameMessages.CRenameProcessorDelegate_task_createChange, fMatches.size()); final String identifier= getArgument().getName(); final String replacement= getReplacementText(); CompositeChange overallChange= new CompositeChange(getProcessorName()); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameRefactoringInputPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameRefactoringInputPage.java index 5f08f5d2279..4b5518ee272 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameRefactoringInputPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameRefactoringInputPage.java @@ -114,7 +114,7 @@ public class CRenameRefactoringInputPage extends UserInputWizardPage { GridLayout gl; Label label= new Label(top, SWT.NONE); - label.setText(Messages.CRenameRefactoringInputPage_label_newName); + label.setText(RenameMessages.CRenameRefactoringInputPage_label_newName); fNewName= new Text(top, SWT.BORDER); fNewName.setText(fSearchString); fNewName.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); @@ -122,7 +122,7 @@ public class CRenameRefactoringInputPage extends UserInputWizardPage { if (hasOption(CRefactory.OPTION_DO_VIRTUAL)) { fDoVirtual= new Button(top, SWT.CHECK); - fDoVirtual.setText(Messages.CRenameRefactoringInputPage_renameBaseAndDerivedMethods); + fDoVirtual.setText(RenameMessages.CRenameRefactoringInputPage_renameBaseAndDerivedMethods); fDoVirtual.setLayoutData(gd= new GridData()); gd.horizontalSpan= 2; } @@ -131,7 +131,7 @@ public class CRenameRefactoringInputPage extends UserInputWizardPage { // Specify the scope. skipLine(top); label = new Label(top, SWT.NONE); - label.setText(Messages.CRenameRefactoringInputPage_label_scope); + label.setText(RenameMessages.CRenameRefactoringInputPage_label_scope); label.setLayoutData(gd= new GridData(GridData.FILL_HORIZONTAL)); gd.horizontalSpan= 2; @@ -144,29 +144,29 @@ public class CRenameRefactoringInputPage extends UserInputWizardPage { gl.marginWidth = 0; fWorkspace= new Button(group, SWT.RADIO); - fWorkspace.setText(Messages.CRenameRefactoringInputPage_button_workspace); + fWorkspace.setText(RenameMessages.CRenameRefactoringInputPage_button_workspace); fWorkspace.setLayoutData(gd= new GridData()); fDependent= new Button(group, SWT.RADIO); - fDependent.setText(Messages.CRenameRefactoringInputPage_button_relatedProjects); + fDependent.setText(RenameMessages.CRenameRefactoringInputPage_button_relatedProjects); fDependent.setLayoutData(gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING)); gd.horizontalIndent= 8; fSingle= new Button(group, SWT.RADIO); - fSingle.setText(Messages.CRenameRefactoringInputPage_button_singleProject); + fSingle.setText(RenameMessages.CRenameRefactoringInputPage_button_singleProject); fSingle.setLayoutData(gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING)); gd.horizontalIndent= 8; gd.horizontalSpan= 2; fWorkingSet= new Button(group, SWT.RADIO); - fWorkingSet.setText(Messages.CRenameRefactoringInputPage_button_workingSet); + fWorkingSet.setText(RenameMessages.CRenameRefactoringInputPage_button_workingSet); fWorkingSetSpec= new Text(group, SWT.SINGLE|SWT.BORDER|SWT.READ_ONLY); fWorkingSetSpec.setLayoutData(gd= new GridData(GridData.FILL_HORIZONTAL)); gd.horizontalIndent= 8; gd.horizontalSpan= 2; fWorkingSetButton= new Button(group, SWT.PUSH); - fWorkingSetButton.setText(Messages.CRenameRefactoringInputPage_button_chooseWorkingSet); + fWorkingSetButton.setText(RenameMessages.CRenameRefactoringInputPage_button_chooseWorkingSet); setButtonLayoutData(fWorkingSetButton); } @@ -175,43 +175,43 @@ public class CRenameRefactoringInputPage extends UserInputWizardPage { if (hasOption(CRefactory.OPTION_IN_CODE)) { group= createLabelAndGroup(group, skippedLine, top); fReferences= new Button(group, SWT.CHECK); - fReferences.setText(Messages.CRenameRefactoringInputPage_button_sourceCode); + fReferences.setText(RenameMessages.CRenameRefactoringInputPage_button_sourceCode); } if (hasOption(CRefactory.OPTION_IN_INACTIVE_CODE)) { group= createLabelAndGroup(group, skippedLine, top); fInInactiveCode= new Button(group, SWT.CHECK); - fInInactiveCode.setText(Messages.CRenameRefactoringInputPage_button_inactiveCode); + fInInactiveCode.setText(RenameMessages.CRenameRefactoringInputPage_button_inactiveCode); } if (hasOption(CRefactory.OPTION_IN_COMMENT)) { group= createLabelAndGroup(group, skippedLine, top); fInComment= new Button(group, SWT.CHECK); - fInComment.setText(Messages.CRenameRefactoringInputPage_button_comments); + fInComment.setText(RenameMessages.CRenameRefactoringInputPage_button_comments); } if (hasOption(CRefactory.OPTION_IN_STRING_LITERAL)) { group= createLabelAndGroup(group, skippedLine, top); fInString= new Button(group, SWT.CHECK); - fInString.setText(Messages.CRenameRefactoringInputPage_button_strings); + fInString.setText(RenameMessages.CRenameRefactoringInputPage_button_strings); } if (hasOption(CRefactory.OPTION_IN_MACRO_DEFINITION)) { group= createLabelAndGroup(group, skippedLine, top); fInMacro= new Button(group, SWT.CHECK); - fInMacro.setText(Messages.CRenameRefactoringInputPage_button_macroDefinitions); + fInMacro.setText(RenameMessages.CRenameRefactoringInputPage_button_macroDefinitions); } if (hasOption(CRefactory.OPTION_IN_INCLUDE_DIRECTIVE)) { group= createLabelAndGroup(group, skippedLine, top); fInInclude= new Button(group, SWT.CHECK); - fInInclude.setText(Messages.CRenameRefactoringInputPage_button_includes); + fInInclude.setText(RenameMessages.CRenameRefactoringInputPage_button_includes); } if (hasOption(CRefactory.OPTION_IN_PREPROCESSOR_DIRECTIVE)) { group= createLabelAndGroup(group, skippedLine, top); fInPreprocessor= new Button(group, SWT.CHECK); - fInPreprocessor.setText(Messages.CRenameRefactoringInputPage_button_preprocessor); + fInPreprocessor.setText(RenameMessages.CRenameRefactoringInputPage_button_preprocessor); } if (hasOption(CRefactory.OPTION_EXHAUSTIVE_FILE_SEARCH)) { skipLine(top); fExhausiveFileSearch= new Button(top, SWT.CHECK); - fExhausiveFileSearch.setText(Messages.CRenameRefactoringInputPage_button_exhaustiveFileSearch); + fExhausiveFileSearch.setText(RenameMessages.CRenameRefactoringInputPage_button_exhaustiveFileSearch); fExhausiveFileSearch.setLayoutData(gd= new GridData()); gd.horizontalIndent= 5; gd.horizontalSpan= 2; @@ -233,7 +233,7 @@ public class CRenameRefactoringInputPage extends UserInputWizardPage { } GridData gd; Label label = new Label(top, SWT.NONE); - label.setText(Messages.CRenameRefactoringInputPage_label_updateWithin); + label.setText(RenameMessages.CRenameRefactoringInputPage_label_updateWithin); label.setLayoutData(gd= new GridData()); gd.horizontalSpan= 2; group= new Composite(top, SWT.NONE); @@ -497,7 +497,7 @@ public class CRenameRefactoringInputPage extends UserInputWizardPage { setErrorMessage(null); setPageComplete(false); } else if (!CConventions.isValidIdentifier(txt)) { - setErrorMessage(NLS.bind(Messages.CRenameRefactoringInputPage_errorInvalidIdentifier, txt)); + setErrorMessage(NLS.bind(RenameMessages.CRenameRefactoringInputPage_errorInvalidIdentifier, txt)); setPageComplete(false); } else { setErrorMessage(null); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameCSourceFolderChange.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameCSourceFolderChange.java index 2cf1e55a9c5..c41264a4c63 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameCSourceFolderChange.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameCSourceFolderChange.java @@ -59,7 +59,7 @@ public class RenameCSourceFolderChange extends Change { @Override public String getName() { - return NLS.bind(Messages.RenameCSourceFolderChange_Name0, oldName.lastSegment(), newName.lastSegment()); + return NLS.bind(RenameMessages.RenameCSourceFolderChange_Name0, oldName.lastSegment(), newName.lastSegment()); } @Override @@ -72,7 +72,7 @@ public class RenameCSourceFolderChange extends Change { return RefactoringStatus.create(Status.OK_STATUS); } else { return RefactoringStatus.create(new Status(IStatus.ERROR, CUIPlugin.PLUGIN_ID, - NLS.bind(Messages.RenameCSourceFolderChange_ErroMsg, folder.getName()))); + NLS.bind(RenameMessages.RenameCSourceFolderChange_ErroMsg, folder.getName()))); } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/Messages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameMessages.java similarity index 96% rename from core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/Messages.java rename to core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameMessages.java index b260f67a467..812dc402167 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/Messages.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameMessages.java @@ -13,8 +13,16 @@ package org.eclipse.cdt.internal.ui.refactoring.rename; import org.eclipse.osgi.util.NLS; -public class Messages extends NLS { - public static String ASTManager_error_macro_name_conflict; +public class RenameMessages extends NLS { + static { + // Initialize resource bundle. + NLS.initializeMessages(RenameMessages.class.getName(), RenameMessages.class); + } + + private RenameMessages() { + } + + public static String ASTManager_error_macro_name_conflict; public static String ASTManager_subtask_analyzing; public static String ASTManager_task_analyze; public static String ASTManager_task_generateAst; @@ -102,12 +110,4 @@ public class Messages extends NLS { public static String RenameCSourceFolderChange_Name0; public static String RenameSourceFolder_0; public static String TextSearch_monitor_categorizeMatches; - - static { - // Initialize resource bundle. - NLS.initializeMessages(Messages.class.getName(), Messages.class); - } - - private Messages() { - } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/Messages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameMessages.properties similarity index 100% rename from core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/Messages.properties rename to core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameMessages.properties diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameSourceFolder.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameSourceFolder.java index 9d0b8828467..a2ebb02a7c8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameSourceFolder.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameSourceFolder.java @@ -51,7 +51,7 @@ public class RenameSourceFolder extends RenameParticipant { @Override public String getName() { - return Messages.RenameSourceFolder_0; + return RenameMessages.RenameSourceFolder_0; } @Override diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/TextSearchWrapper.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/TextSearchWrapper.java index 12f8f7a2bf1..57af2ad3349 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/TextSearchWrapper.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/TextSearchWrapper.java @@ -301,7 +301,7 @@ public class TextSearchWrapper { } public void categorizeMatches(List matches, IProgressMonitor monitor) { - monitor.beginTask(Messages.TextSearch_monitor_categorizeMatches, matches.size()); + monitor.beginTask(RenameMessages.TextSearch_monitor_categorizeMatches, matches.size()); IFile file= null; ArrayList locations= null; for (Iterator iter = matches.iterator(); iter.hasNext();) {