[248077] [Refactoring] An improper message is displayed in Rename wizard.

3 files changed, 7 insertions, 5 deletions

diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/Checks.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/Checks.java
index bb0280bc6c..243aa72790 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/Checks.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/Checks.java
@@ -19,7 +19,7 @@ public class Checks {
 	public static RefactoringStatus checkName(String name) {
 		RefactoringStatus result= new RefactoringStatus();
 		if ("".equals(name)) //$NON-NLS-1$
-			return RefactoringStatus.createFatalErrorStatus("RefactoringMessages.Checks_Choose_name");  //$NON-NLS-1$
+			return RefactoringStatus.createFatalErrorStatus(RefactoringMessages.getString("Checks_Choose_name"));  //$NON-NLS-1$
 		return result;
 	}
 	
@@ -29,8 +29,8 @@ public class Checks {
 	
 	public static RefactoringStatus checkComponentName(String name) {
 		RefactoringStatus result= new RefactoringStatus();
-		if (!NameValidator.isValid(name)) //$NON-NLS-1$
-			return RefactoringStatus.createFatalErrorStatus("RefactoringMessages.Checks_Choose_name");  //$NON-NLS-1$
+		if (!NameValidator.isValid(name))
+			return RefactoringStatus.createFatalErrorStatus(RefactoringMessages.getString("Checks_Choose_name"));  //$NON-NLS-1$
 
 		return result;
 	}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/messages.properties b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/messages.properties
index 7f451853b1..62ac4e0e57 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/messages.properties
+++ b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/messages.properties
@@ -50,4 +50,6 @@ XSDComponentRenameParticipant.xsd_component_rename_participant=XSD component ren
 WSDLComponentRenameParticipant.wsdl_component_rename_participant=WSDL component rename participant
 ResourceRenameParticipant.File_Rename_update_reference=File rename refactoring changes
 RenameComponentRefactoring_checking=Checking...
-RenameComponentRefactoring_searching=Searching...
\ No newline at end of file
+RenameComponentRefactoring_searching=Searching...
+Checks_Choose_name=Invalid name
+RenameComponentRefactoring_another_name=Name already used
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/RenameComponentProcessor.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/RenameComponentProcessor.java
index ae19995161..b49d4fbe6d 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/RenameComponentProcessor.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/RenameComponentProcessor.java
@@ -280,7 +280,7 @@ public class RenameComponentProcessor extends RenameProcessor implements INameUp
 		final RefactoringStatus result = Checks.checkName(name);
 		result.merge(Checks.checkComponentName(name));
 		if (Checks.isAlreadyNamed(selectedComponent, name))
-			result.addFatalError("RefactoringMessages.RenameComponentRefactoring_another_name");
+			result.addFatalError(RefactoringMessages.getString("RenameComponentRefactoring_another_name")); //$NON-NLS-1$
 		return result;
 	}