### Eclipse Workspace Patch 1.0
#P org.eclipse.wst.xsd.ui
Index: src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/RenameComponentProcessor.java
===================================================================
RCS file: /cvsroot/webtools/wst/components/xsd/plugins/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/RenameComponentProcessor.java,v
retrieving revision 1.2
diff -u -r1.2 RenameComponentProcessor.java
--- src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/RenameComponentProcessor.java	11 Jan 2006 03:01:54 -0000	1.2
+++ src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/RenameComponentProcessor.java	7 Feb 2006 22:17:33 -0000
@@ -66,15 +66,15 @@
 	public static final String IDENTIFIER = "org.eclipse.wst.xml.refactor.renameComponentProcessor"; //$NON-NLS-1$
 
 	public static String quoteString(String value) {
-		value = value == null ? "" : value;
+		value = value == null ? "" : value; //$NON-NLS-1$
 
 		StringBuffer sb = new StringBuffer();
-		if (!value.startsWith("\"")) {
-			sb.append("\"");
+		if (!value.startsWith("\"")) { //$NON-NLS-1$
+			sb.append("\""); //$NON-NLS-1$
 		}
 		sb.append(value);
-		if (!value.endsWith("\"")) {
-			sb.append("\"");
+		if (!value.endsWith("\"")) { //$NON-NLS-1$
+			sb.append("\""); //$NON-NLS-1$
 		}
 		return sb.toString();
 	}
@@ -130,7 +130,7 @@
 				newName = quoteString(newName);
 
 				ReplaceEdit replaceEdit = new ReplaceEdit(match.getOffset(), match.getLength(), newName);
-				String editName = RefactoringMessages.getString("RenameComponentProcessor.Component_Refactoring_update_declatation");;
+				String editName = Messages.UPDATE_COMPONENT_DECLARATION;
 				TextChangeCompatibility.addTextEdit(textChange, editName, replaceEdit);
 			}
 		}
@@ -204,10 +204,10 @@
 		final RefactoringStatus status = new RefactoringStatus();
 		try {
 			monitor.beginTask("", 2); //$NON-NLS-1$
-			monitor.setTaskName("RefactoringMessages.RenameComponentRefactoring_checking");
+			monitor.setTaskName(Messages.REFACTORING_CHECKING);
 			status.merge(checkNewElementName(getNewElementName()));
 			monitor.worked(1);
-			monitor.setTaskName("RefactoringMessages.RenameComponentRefactoring_searching");
+			monitor.setTaskName(Messages.REFACTORING_SEARCHING);
 			status.merge(createRenameChanges(new SubProgressMonitor(monitor, 1)));
 		}
 		finally {
@@ -239,7 +239,7 @@
 		final RefactoringStatus result = Checks.checkName(name);
 		result.merge(Checks.checkComponentName(name));
 		if (Checks.isAlreadyNamed(selectedComponent, name))
-			result.addFatalError("RefactoringMessages.RenameComponentRefactoring_another_name");
+			result.addFatalError(Messages.REFACTORING_ANOTHER_NAME);
 		return result;
 	}
 
@@ -269,11 +269,11 @@
 
 	private TextChangeManager updateChangeManager(IProgressMonitor pm, RefactoringStatus status) throws CoreException {
 		TextChangeManager manager = getChangeManager();
-		System.out.println("addDeclarationUpate-------------------");
+		System.out.println("addDeclarationUpate-------------------"); //$NON-NLS-1$
 		// only one declaration gets updated
 		addDeclarationUpdate(manager);
 		if (getUpdateReferences()) {
-			System.out.println("addOccurences--------------------------");
+			System.out.println("addOccurences--------------------------"); //$NON-NLS-1$
 			addOccurrences(manager, pm, status);
 		}
 		return manager;
@@ -283,7 +283,7 @@
 		Assert.isNotNull(monitor);
 		final RefactoringStatus status = new RefactoringStatus();
 		try {
-			monitor.beginTask("RefactoringMessages.RenameComponentRefactoring_searching", 1);
+			monitor.beginTask(Messages.REFACTORING_SEARCHING, 1);
 			updateChangeManager(new SubProgressMonitor(monitor, 1), status);
 		}
 		finally {
@@ -308,7 +308,7 @@
 	protected String[] getAffectedProjectNatures() throws CoreException {
 		// TODO: find project natures of the files that are going to be
 		// refactored
-		return new String[]{"org.eclipse.jdt.core.javanature"};
+		return new String[]{"org.eclipse.jdt.core.javanature"}; //$NON-NLS-1$
 	}
 
 	/*
@@ -356,7 +356,7 @@
 	 */
 	public String getProcessorName() {
 		return RefactoringMessages.getFormattedString("RenameComponentRefactoring.name", //$NON-NLS-1$
-					new String[]{selectedComponent.getNamespaceURI() + ":" + selectedComponent.getName(), newName});
+				new String[]{selectedComponent.getNamespaceURI() + ":" + selectedComponent.getName(), newName});
 
 	}
 
@@ -450,7 +450,7 @@
 	public Change postCreateChange(Change[] participantChanges, IProgressMonitor pm) throws CoreException, OperationCanceledException {
 		Assert.isNotNull(pm);
 		try {
-			String changeName = RefactoringMessages.getString("RenameComponentProcessor.Component_Refactoring_updates");
+			String changeName = Messages.COMPONENT_NAME_REFACTORING_CHANGES;
 			TextChange[] changes = changeManager.getAllChanges();
 			// System.out.println("all changes(" + getChangeManager() + ")" +
 			// changes.length);
@@ -465,7 +465,7 @@
 			};
 			if (changes.length > 0) {
 				// Arrays.sort(changes, c);
-				CompositeChange compositeChange = new CompositeChange("!" + changeName, changes);
+				CompositeChange compositeChange = new CompositeChange("!" + changeName, changes); //$NON-NLS-1$
 				compositeChange.markAsSynthetic();
 				return compositeChange;
 			}
Index: src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/ResourceRenameParticipant.java
===================================================================
RCS file: /cvsroot/webtools/wst/components/xsd/plugins/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/ResourceRenameParticipant.java,v
retrieving revision 1.1
diff -u -r1.1 ResourceRenameParticipant.java
--- src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/ResourceRenameParticipant.java	10 Jan 2006 07:39:25 -0000	1.1
+++ src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/ResourceRenameParticipant.java	7 Feb 2006 22:17:33 -0000
@@ -26,7 +26,6 @@
 import org.eclipse.ltk.core.refactoring.TextChange;
 import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
 import org.eclipse.ltk.core.refactoring.participants.RenameParticipant;
-import org.eclipse.wst.xsd.ui.internal.refactor.RefactoringMessages;
 import org.eclipse.wst.xsd.ui.internal.refactor.TextChangeManager;
 import org.eclipse.xsd.XSDNamedComponent;
 import org.eclipse.xsd.XSDSchema;
@@ -40,8 +39,8 @@
 	private TextChangeManager changeManager;
 
 	
-	private static String XSD_CONTENT_TYPE_ID = "org.eclipse.wst.xsd.core.xsdsource";
-	private static String WSDL_CONTENT_TYPE_ID = "org.eclipse.wst.wsdl.wsdlsource";
+	private static String XSD_CONTENT_TYPE_ID = "org.eclipse.wst.xsd.core.xsdsource"; //$NON-NLS-1$
+	private static String WSDL_CONTENT_TYPE_ID = "org.eclipse.wst.wsdl.wsdlsource"; //$NON-NLS-1$
 
 
 	/* (non-Javadoc)
@@ -72,7 +71,7 @@
 	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#getName()
 	 */
 	public String getName() {
-		return RefactoringMessages.getString("ResourceRenameParticipant.compositeChangeName");
+		return Messages.XSD_FILE_RENAME_REFERENCES;
 	}
 	
 	private IPath getNewFilePath() {
@@ -110,7 +109,7 @@
 	{
 		try
 		{
-			String changeName = RefactoringMessages.getString("RenameResourceChange.rename_resource_reference_change");
+			String changeName = Messages.RENAMING_RESOURCE_FILE_REFERENCES;
 			TextChange[] changes =  changeManager.getAllChanges();
 			if(changes.length > 0){
 				return new CompositeChange(changeName, changes);
Index: src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/RenameTargetNamespaceProcessor.java
===================================================================
RCS file: /cvsroot/webtools/wst/components/xsd/plugins/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/RenameTargetNamespaceProcessor.java,v
retrieving revision 1.2
diff -u -r1.2 RenameTargetNamespaceProcessor.java
--- src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/RenameTargetNamespaceProcessor.java	11 Jan 2006 03:01:54 -0000	1.2
+++ src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/RenameTargetNamespaceProcessor.java	7 Feb 2006 22:17:33 -0000
@@ -42,9 +42,9 @@
 import org.eclipse.wst.xsd.ui.internal.refactor.INameUpdating;
 import org.eclipse.wst.xsd.ui.internal.refactor.IReferenceUpdating;
 import org.eclipse.wst.xsd.ui.internal.refactor.RefactoringComponent;
-import org.eclipse.wst.xsd.ui.internal.refactor.RefactoringMessages;
 import org.eclipse.wst.xsd.ui.internal.refactor.TextChangeManager;
 import org.eclipse.xsd.XSDSchema;
+import org.eclipse.wst.xsd.ui.internal.refactor.RefactoringMessages;
 
 
 public class RenameTargetNamespaceProcessor extends RenameProcessor implements INameUpdating, IReferenceUpdating
@@ -93,7 +93,7 @@
 	{
 		// TODO: find project natures of the files that are going to be
 		// refactored
-		return new String[]{"org.eclipse.jdt.core.javanature"};
+		return new String[]{"org.eclipse.jdt.core.javanature"}; //$NON-NLS-1$
 	}
 
 	/*
@@ -189,7 +189,7 @@
 	{
 		try
 		{
-			String changeName = RefactoringMessages.getString("RenameComponentProcessor.Component_Refactoring_updates");
+			String changeName = Messages.COMPONENT_NAME_REFACTORING_CHANGES;
 			return new CompositeChange(changeName, changeManager.getAllChanges());
 		} finally
 		{
Index: src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/XMLComponentRenameParticipant.java
===================================================================
RCS file: /cvsroot/webtools/wst/components/xsd/plugins/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/XMLComponentRenameParticipant.java,v
retrieving revision 1.3
diff -u -r1.3 XMLComponentRenameParticipant.java
--- src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/XMLComponentRenameParticipant.java	23 Jan 2006 05:53:22 -0000	1.3
+++ src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/XMLComponentRenameParticipant.java	7 Feb 2006 22:17:33 -0000
@@ -28,7 +28,6 @@
 import org.eclipse.wst.common.core.search.SearchMatch;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xsd.ui.internal.refactor.RefactoringMessages;
 import org.eclipse.wst.xsd.ui.internal.refactor.TextChangeManager;
 import org.eclipse.wst.xsd.ui.internal.refactor.util.TextChangeCompatibility;
 import org.eclipse.xsd.util.XSDConstants;
@@ -54,7 +53,7 @@
 	}
 	
 	public String getName() {
-		return "XML Component Rename Participant";
+		return Messages.XML_COMPONENT_RENAME_PARTICIPANT;
 	}
 
 	public RefactoringStatus checkConditions(IProgressMonitor monitor,
@@ -75,7 +74,7 @@
 		Assert.isNotNull(monitor);
 		final RefactoringStatus status= new RefactoringStatus();
 		try {
-			monitor.beginTask("RefactoringMessages.RenameComponentRefactoring_searching", 1); 
+			monitor.beginTask(Messages.REFACTORING_SEARCHING, 1); 
 			createRenameChanges(new SubProgressMonitor(monitor, 1));
 			//updateChangeManager(new SubProgressMonitor(monitor, 1), status);
 		} finally {
@@ -91,7 +90,7 @@
 			SearchMatch match = (SearchMatch) iter.next();
 			TextChange textChange = getChangeManager().get(match.getFile());
 			String newName = getArguments().getNewName();
-			String qualifier = "";
+			String qualifier = ""; //$NON-NLS-1$
 			if(getArguments() instanceof ComponentRenameArguments){
 				qualifier = ((ComponentRenameArguments)getArguments()).getQualifier();
 			}
@@ -106,7 +105,7 @@
 			}
 			
 			ReplaceEdit replaceEdit = new ReplaceEdit(match.getOffset(), match.getLength(), newName );
-			String editName = RefactoringMessages.getString("RenameComponentProcessor.Component_Refactoring_update_reference");
+			String editName = Messages.UPDATE_COMPONENT_REFERENCE;
           //  System.out.println("textChange " + textChange + "/ replaceEdit " + replaceEdit);
 			TextChangeCompatibility.addTextEdit(textChange, editName, replaceEdit);
    		}
@@ -120,7 +119,7 @@
 			String prefix = XSDConstants.lookupQualifier(node, targetNamespace);
 			if (prefix != null && prefix.length() > 0) {
 				sb.append(prefix);
-				sb.append(":");
+				sb.append(":"); //$NON-NLS-1$
 				sb.append(newName);
 			} else {
 				sb.append(newName);
Index: src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/XSDComponentRenameParticipant.java
===================================================================
RCS file: /cvsroot/webtools/wst/components/xsd/plugins/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/XSDComponentRenameParticipant.java,v
retrieving revision 1.2
diff -u -r1.2 XSDComponentRenameParticipant.java
--- src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/XSDComponentRenameParticipant.java	23 Jan 2006 05:53:22 -0000	1.2
+++ src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/XSDComponentRenameParticipant.java	7 Feb 2006 22:17:33 -0000
@@ -35,7 +35,7 @@
 
 	public String getName() {
 		
-		return "XSD component rename participant";
+		return Messages.XSD_COMPONENT_RENAME_PARTICIPANT;
 	}
 
 
Index: src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/ResourceRenameChange.java
===================================================================
RCS file: /cvsroot/webtools/wst/components/xsd/plugins/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/ResourceRenameChange.java,v
retrieving revision 1.1
diff -u -r1.1 ResourceRenameChange.java
--- src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/ResourceRenameChange.java	10 Jan 2006 07:39:25 -0000	1.1
+++ src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/ResourceRenameChange.java	7 Feb 2006 22:17:33 -0000
@@ -62,7 +62,7 @@
 		try {
 			if (false)
 				throw new NullPointerException();
-			pm.beginTask(RefactoringMessages.getString("XSDRenameResourceChange.rename_resource"), 1); //$NON-NLS-1$
+			pm.beginTask(RefactoringMessages.getString("XSDRenameResourceChange.rename_resource"), 1);
 
 			getResource().move(renamedResourcePath(fResourcePath, fNewName), getCoreRenameFlags(), pm);
 
Index: src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/RenameResourceProcessor.java
===================================================================
RCS file: /cvsroot/webtools/wst/components/xsd/plugins/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/RenameResourceProcessor.java,v
retrieving revision 1.2
diff -u -r1.2 RenameResourceProcessor.java
--- src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/RenameResourceProcessor.java	11 Jan 2006 03:01:54 -0000	1.2
+++ src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/RenameResourceProcessor.java	7 Feb 2006 22:17:33 -0000
@@ -126,13 +126,13 @@
 		Assert.isNotNull(newName, "new name"); //$NON-NLS-1$
 		IContainer c= fResource.getParent();
 		if (c == null)
-			return RefactoringStatus.createFatalErrorStatus(RefactoringMessages.getString("RenameResourceRefactoring.Internal_Error")); //$NON-NLS-1$
+			return RefactoringStatus.createFatalErrorStatus(Messages.INTERNAL_ERROR);
 						
 		if (c.findMember(newName) != null)
-			return RefactoringStatus.createFatalErrorStatus(RefactoringMessages.getString("RenameResourceRefactoring.alread_exists")); //$NON-NLS-1$
+			return RefactoringStatus.createFatalErrorStatus(Messages.RESOURCE_ALREADY_EXIST);
 			
 		if (!c.getFullPath().isValidSegment(newName))
-			return RefactoringStatus.createFatalErrorStatus(RefactoringMessages.getString("RenameResourceRefactoring.invalidName")); //$NON-NLS-1$
+			return RefactoringStatus.createFatalErrorStatus(Messages.INVALID_RESOURCE_NAME);
 	
 		RefactoringStatus result= RefactoringStatus.create(c.getWorkspace().validateName(newName, fResource.getType()));
 		if (! result.hasFatalError())
Index: src-refactor/org/eclipse/wst/xsd/ui/internal/search/actions/FindReferencesAction.java
===================================================================
RCS file: /cvsroot/webtools/wst/components/xsd/plugins/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/search/actions/FindReferencesAction.java,v
retrieving revision 1.2
diff -u -r1.2 FindReferencesAction.java
--- src-refactor/org/eclipse/wst/xsd/ui/internal/search/actions/FindReferencesAction.java	23 Jan 2006 05:53:21 -0000	1.2
+++ src-refactor/org/eclipse/wst/xsd/ui/internal/search/actions/FindReferencesAction.java	7 Feb 2006 22:17:33 -0000
@@ -43,7 +43,7 @@
 
   public void run()
   {
-    String pattern = "";
+    String pattern = ""; //$NON-NLS-1$
     if (editor != null)
     {  
       IEditorInput input = editor.getEditorInput();
@@ -76,9 +76,9 @@
                metaName = IXSDSearchConstants.ELEMENT_META_NAME; 
               }  
               QualifiedName elementQName = new QualifiedName(c.getTargetNamespace(), c.getName());
-              System.out.println("name" + c.getTargetNamespace() + ":" + c.getName());
+              System.out.println("name" + c.getTargetNamespace() + ":" + c.getName()); //$NON-NLS-1$ //$NON-NLS-2$
               SearchScope scope = new WorkspaceSearchScope();
-              String scopeDescription = "Workspace";    
+              String scopeDescription = Messages.SCOPE_WORKSPACE;    
               XSDSearchQuery searchQuery= new XSDSearchQuery(pattern, file, elementQName, metaName, XSDSearchQuery.LIMIT_TO_REFERENCES, scope, scopeDescription);    
               NewSearchUI.activateSearchResultView();
               NewSearchUI.runQueryInBackground(searchQuery);
Index: src-refactor/org/eclipse/wst/xsd/ui/internal/search/actions/ReferencesSearchGroup.java
===================================================================
RCS file: /cvsroot/webtools/wst/components/xsd/plugins/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/search/actions/ReferencesSearchGroup.java,v
retrieving revision 1.2
diff -u -r1.2 ReferencesSearchGroup.java
--- src-refactor/org/eclipse/wst/xsd/ui/internal/search/actions/ReferencesSearchGroup.java	23 Jan 2006 05:53:21 -0000	1.2
+++ src-refactor/org/eclipse/wst/xsd/ui/internal/search/actions/ReferencesSearchGroup.java	7 Feb 2006 22:17:33 -0000
@@ -35,7 +35,7 @@
  */
 public class ReferencesSearchGroup extends SearchGroup  {
 
-    private static final String MENU_TEXT= "References...";//SearchMessages.group_references; 
+    private static final String MENU_TEXT= Messages.REFERENCES;//SearchMessages.group_references; 
 
     private IWorkbenchSite fSite;
     private IEditorPart fEditor;
@@ -60,23 +60,23 @@
         fGroupId= ITextEditorActionConstants.GROUP_FIND;
 
         fFindReferencesAction= new FindReferencesAction(editor);
-        fFindReferencesAction.setText("Workspace");
-        fFindReferencesAction.setActionDefinitionId("SEARCH_REFERENCES_IN_WORKSPACE");
+        fFindReferencesAction.setText(Messages.WORKSPACE);
+        fFindReferencesAction.setActionDefinitionId("SEARCH_REFERENCES_IN_WORKSPACE"); //$NON-NLS-1$
         //fEditor.setAction("SearchReferencesInWorkspace", fFindReferencesAction); //$NON-NLS-1$
 
         fFindReferencesInProjectAction= new FindReferencesAction(fEditor);
-        fFindReferencesInProjectAction.setText("Project");        
-        fFindReferencesInProjectAction.setActionDefinitionId("SEARCH_REFERENCES_IN_PROJECT");
+        fFindReferencesInProjectAction.setText(Messages.PROJECT);        
+        fFindReferencesInProjectAction.setActionDefinitionId("SEARCH_REFERENCES_IN_PROJECT"); //$NON-NLS-1$
         //fEditor.setAction("SearchReferencesInProject", fFindReferencesInProjectAction); //$NON-NLS-1$
 
         fFindReferencesInHierarchyAction= new FindReferencesAction(fEditor);
-        fFindReferencesInHierarchyAction.setText("Hierarchy");          
-        fFindReferencesInHierarchyAction.setActionDefinitionId("SEARCH_REFERENCES_IN_HIERARCHY");
+        fFindReferencesInHierarchyAction.setText(Messages.HIERARCHY);          
+        fFindReferencesInHierarchyAction.setActionDefinitionId("SEARCH_REFERENCES_IN_HIERARCHY"); //$NON-NLS-1$
         //fEditor.setAction("SearchReferencesInHierarchy", fFindReferencesInHierarchyAction); //$NON-NLS-1$
         
         fFindReferencesInWorkingSetAction= new FindReferencesAction(fEditor);
-        fFindReferencesInWorkingSetAction.setText("Working Set...");         
-        fFindReferencesInWorkingSetAction.setActionDefinitionId(".SEARCH_REFERENCES_IN_WORKING_SET");
+        fFindReferencesInWorkingSetAction.setText(Messages.WORKING_SET);         
+        fFindReferencesInWorkingSetAction.setActionDefinitionId(".SEARCH_REFERENCES_IN_WORKING_SET"); //$NON-NLS-1$
         //fEditor.setAction("SearchReferencesInWorkingSet", fFindReferencesInWorkingSetAction); //$NON-NLS-1$
     }
 
Index: src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/wizard/RenameInputWizardPage.java
===================================================================
RCS file: /cvsroot/webtools/wst/components/xsd/plugins/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/wizard/RenameInputWizardPage.java,v
retrieving revision 1.1
diff -u -r1.1 RenameInputWizardPage.java
--- src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/wizard/RenameInputWizardPage.java	10 Jan 2006 07:39:24 -0000	1.1
+++ src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/wizard/RenameInputWizardPage.java	7 Feb 2006 22:17:33 -0000
@@ -28,7 +28,6 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.wst.xsd.ui.internal.refactor.IReferenceUpdating;
-import org.eclipse.wst.xsd.ui.internal.refactor.RefactoringMessages;
 
 /**
  * @author ebelisar
@@ -231,7 +230,7 @@
 		final IReferenceUpdating ref= (IReferenceUpdating)getRefactoring().getAdapter(IReferenceUpdating.class);
 		if (ref == null || !ref.canEnableUpdateReferences())	
 			return;
-		String title= RefactoringMessages.getString("RenameInputWizardPage.update_references"); //$NON-NLS-1$
+		String title= "Update references";
 		boolean defaultValue= true; 
 		fUpdateReferences= createCheckbox(result, title, defaultValue);
 		ref.setUpdateReferences(fUpdateReferences.getSelection());
@@ -244,7 +243,7 @@
 	}
 	
 	protected String getLabelText() {
-		return RefactoringMessages.getString("RenameInputWizardPage.new_name"); //$NON-NLS-1$
+		return "&New name:"; 
 	}
 	
 
Index: src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/structure/MakeTypeGlobalChange.java
===================================================================
RCS file: /cvsroot/webtools/wst/components/xsd/plugins/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/structure/MakeTypeGlobalChange.java,v
retrieving revision 1.1
diff -u -r1.1 MakeTypeGlobalChange.java
--- src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/structure/MakeTypeGlobalChange.java	10 Jan 2006 07:39:25 -0000	1.1
+++ src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/structure/MakeTypeGlobalChange.java	7 Feb 2006 22:17:33 -0000
@@ -90,7 +90,7 @@
 			doc.getModel().beginRecording(
 							this,
 							RefactoringMessages
-									.getString("_UI_ACTION_MAKE_ANONYMOUS_TYPE_GLOBAL"));
+									.getString("_UI_ACTION_MAKE_ANONYMOUS_TYPE_GLOBAL")); //$NON-NLS-1$
 			MakeAnonymousTypeGlobalCommand command = new MakeAnonymousTypeGlobalCommand(
 					component, name);
 			command.run();
@@ -115,8 +115,7 @@
 
 	public final Change perform(IProgressMonitor pm) throws CoreException {
 		try {
-			pm.beginTask(RefactoringMessages
-					.getString("XSDComponentRenameChange.Renaming"), 1); //$NON-NLS-1$
+			pm.beginTask(Messages.RENAMING, 1); 
 			Change result = createUndoChange();
 			doRename(new SubProgressMonitor(pm, 1));
 			return result;
Index: src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/MakeLocalElementGlobalAction.java
===================================================================
RCS file: /cvsroot/webtools/wst/components/xsd/plugins/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/MakeLocalElementGlobalAction.java,v
retrieving revision 1.1
diff -u -r1.1 MakeLocalElementGlobalAction.java
--- src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/MakeLocalElementGlobalAction.java	10 Jan 2006 07:39:25 -0000	1.1
+++ src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/MakeLocalElementGlobalAction.java	7 Feb 2006 22:17:33 -0000
@@ -24,8 +24,7 @@
 
 	public MakeLocalElementGlobalAction(ISelection selection, XSDSchema schema) {
 		super(selection, schema);
-        //TODO cs : fix up translation
-        setText("Make Global");
+        setText(Messages.MAKE_GLOBAL);
 		//setText(RefactoringMessages.getString("MakeLocalElementGlobalAction.text")); //$NON-NLS-1$
 	}
 	
Index: src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/MakeAnonymousTypeGlobalAction.java
===================================================================
RCS file: /cvsroot/webtools/wst/components/xsd/plugins/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/MakeAnonymousTypeGlobalAction.java,v
retrieving revision 1.1
diff -u -r1.1 MakeAnonymousTypeGlobalAction.java
--- src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/MakeAnonymousTypeGlobalAction.java	10 Jan 2006 07:39:25 -0000	1.1
+++ src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/MakeAnonymousTypeGlobalAction.java	7 Feb 2006 22:17:33 -0000
@@ -18,7 +18,6 @@
 import org.eclipse.wst.xsd.ui.internal.XSDEditorPlugin;
 import org.eclipse.wst.xsd.ui.internal.refactor.structure.MakeAnonymousTypeGlobalCommand;
 import org.eclipse.wst.xsd.ui.internal.refactor.structure.MakeTypeGlobalProcessor;
-import org.eclipse.wst.xsd.ui.internal.refactor.wizard.RefactoringWizardMessages;
 import org.eclipse.wst.xsd.ui.internal.refactor.wizard.RenameRefactoringWizard;
 import org.eclipse.xsd.XSDAttributeDeclaration;
 import org.eclipse.xsd.XSDComplexTypeDefinition;
@@ -37,7 +36,7 @@
 	
 	public MakeAnonymousTypeGlobalAction(ISelection selection, XSDSchema schema) {
 		super(selection, schema);
-		setText(RefactoringWizardMessages.MakeAnonymousTypeGlobalAction_text); //$NON-NLS-1$
+		setText(Messages.MAKE_ANONYMOUS); //$NON-NLS-1$
 	}
 	
 	public boolean canRun() {
@@ -47,20 +46,20 @@
 	
 
 	private String getNewDefaultName(){
-		if(fParentName != null && !"".equals(fParentName)){
+		if(fParentName != null && !"".equals(fParentName)){ //$NON-NLS-1$
 			if(isComplexType){
-				return fParentName + "ComplexType";
+				return fParentName + Messages.COMPLEXTYPE;
 			}
 			else{
-				return fParentName + "SimpleType";
+				return fParentName + Messages.SIMPLETYPE;
 			}
 		}
 		else{
 			if(isComplexType){
-				return "NewComplexType";
+				return Messages.NEW_COMPLEXTYPE;
 			}
 			else{
-				return "NewSimpleType";
+				return Messages.NEW_SIMPLETYPE;
 			}
 		}
 		
@@ -123,8 +122,8 @@
 		try {
 			RefactoringWizard wizard = new RenameRefactoringWizard(
 					refactoring,
-					RefactoringWizardMessages.RenameComponentWizard_defaultPageTitle, // TODO: provide correct strings
-					RefactoringWizardMessages.RenameComponentWizard_inputPage_description, null);
+					Messages.RENAME_WIZARD, // TODO: provide correct strings
+					Messages.RENAME_XML_SCHEMA, null);
 			RefactoringWizardOpenOperation op= new RefactoringWizardOpenOperation(wizard);
 			op.run(XSDEditorPlugin.getShell(), wizard.getDefaultPageTitle());
 			//triggerBuild();
@@ -145,7 +144,7 @@
 		DocumentImpl doc = (DocumentImpl) fSelectedComponent.getElement().getOwnerDocument();
 		doc.getModel().beginRecording(
 						this,
-						RefactoringWizardMessages.MakeAnonymousTypeGlobalAction_text);
+						Messages.MAKE_ANONYMOUS);
 		MakeAnonymousTypeGlobalCommand command = new MakeAnonymousTypeGlobalCommand(
 				fSelectedComponent, getNewDefaultName());
 		command.run();
Index: src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/messages.properties
===================================================================
RCS file: src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/messages.properties
diff -N src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/messages.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/messages.properties	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,13 @@
+REFACTORING_CHECKING=RefactoringMessages.RenameComponentRefactoring_checking
+REFACTORING_SEARCHING=RefactoringMessages.RenameComponentRefactoring_searching
+REFACTORING_ANOTHER_NAME=RefactoringMessages.RenameComponentRefactoring_another_name
+XML_COMPONENT_RENAME_PARTICIPANT=XML Component Rename Participant
+XSD_COMPONENT_RENAME_PARTICIPANT=XSD component rename participant
+COMPONENT_NAME_REFACTORING_CHANGES=Component name refactoring changes
+XSD_FILE_RENAME_REFERENCES=XSD file rename references updating changes
+RENAMING_RESOURCE_FILE_REFERENCES=Renaming resource name references
+UPDATE_COMPONENT_REFERENCE=Update component reference
+UPDATE_COMPONENT_DECLARATION=Update component declaration/definition
+INTERNAL_ERROR=Internal error
+RESOURCE_ALREADY_EXIST=Resource already exist
+INVALID_RESOURCE_NAME=Invalid resource name
Index: src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/structure/Messages.java
===================================================================
RCS file: src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/structure/Messages.java
diff -N src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/structure/Messages.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/structure/Messages.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,17 @@
+package org.eclipse.wst.xsd.ui.internal.refactor.structure;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.wst.xsd.ui.internal.refactor.structure.messages"; //$NON-NLS-1$
+
+	private Messages() {
+	}
+
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	public static String RENAMING;
+}
Index: src-refactor/org/eclipse/wst/xsd/ui/internal/search/actions/messages.properties
===================================================================
RCS file: src-refactor/org/eclipse/wst/xsd/ui/internal/search/actions/messages.properties
diff -N src-refactor/org/eclipse/wst/xsd/ui/internal/search/actions/messages.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src-refactor/org/eclipse/wst/xsd/ui/internal/search/actions/messages.properties	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,6 @@
+REFERENCES=References...
+WORKSPACE=Workspace
+PROJECT=Project
+HIERARCHY=Hierarchy
+WORKING_SET=Working Set...
+SCOPE_WORKSPACE=Workspace
Index: src-refactor/org/eclipse/wst/xsd/ui/internal/search/actions/Messages.java
===================================================================
RCS file: src-refactor/org/eclipse/wst/xsd/ui/internal/search/actions/Messages.java
diff -N src-refactor/org/eclipse/wst/xsd/ui/internal/search/actions/Messages.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src-refactor/org/eclipse/wst/xsd/ui/internal/search/actions/Messages.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,27 @@
+package org.eclipse.wst.xsd.ui.internal.search.actions;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.wst.xsd.ui.internal.search.actions.messages"; //$NON-NLS-1$
+
+	private Messages() {
+	}
+
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	public static String REFERENCES;
+
+	public static String WORKSPACE;
+
+	public static String PROJECT;
+
+	public static String HIERARCHY;
+
+	public static String WORKING_SET;
+
+	public static String SCOPE_WORKSPACE;
+}
Index: src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/structure/messages.properties
===================================================================
RCS file: src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/structure/messages.properties
diff -N src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/structure/messages.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/structure/messages.properties	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,1 @@
+RENAMING=Renaming...
Index: src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/Messages.java
===================================================================
RCS file: src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/Messages.java
diff -N src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/Messages.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/Messages.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,25 @@
+package org.eclipse.wst.xsd.ui.internal.refactor.actions;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.wst.xsd.ui.internal.refactor.actions.messages"; //$NON-NLS-1$
+
+	private Messages() {
+	}
+
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	public static String MAKE_GLOBAL;
+	
+	public static String COMPLEXTYPE;
+	public static String SIMPLETYPE;
+	public static String NEW_COMPLEXTYPE;
+	public static String NEW_SIMPLETYPE;
+	public static String RENAME_WIZARD;
+	public static String RENAME_XML_SCHEMA;
+	public static String MAKE_ANONYMOUS;
+}
Index: src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/Messages.java
===================================================================
RCS file: src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/Messages.java
diff -N src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/Messages.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/Messages.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,43 @@
+package org.eclipse.wst.xsd.ui.internal.refactor.rename;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.wst.xsd.ui.internal.refactor.rename.messages"; //$NON-NLS-1$
+
+	private Messages() {
+	}
+
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	public static String REFACTORING_CHECKING;
+
+	public static String REFACTORING_SEARCHING;
+
+	public static String REFACTORING_ANOTHER_NAME;
+
+	public static String XML_COMPONENT_RENAME_PARTICIPANT;
+
+	public static String XSD_COMPONENT_RENAME_PARTICIPANT;
+
+	public static String COMPONENT_NAME_REFACTORING_CHANGES;
+
+	public static String XSD_FILE_RENAME_REFERENCES;
+
+	public static String RENAMING_RESOURCE_FILE_REFERENCES;
+
+	public static String UPDATE_COMPONENT_REFERENCE;
+
+	public static String INTERNAL_ERROR;
+
+	public static String RESOURCE_ALREADY_EXIST;
+
+	public static String INVALID_RESOURCE_NAME;
+
+	public static String UPDATE_COMPONENT_DECLARATION;
+
+
+}
Index: src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/messages.properties
===================================================================
RCS file: src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/messages.properties
diff -N src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/messages.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/messages.properties	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,9 @@
+MAKE_GLOBAL=Make Global
+
+COMPLEXTYPE=ComplexType
+SIMPLETYPE=SimpleType
+NEW_COMPLEXTYPE=NewComplexType
+NEW_SIMPLETYPE=NewSimpleType
+RENAME_WIZARD=Rename wizard
+RENAME_XML_SCHEMA=Rename XML Schema component
+MAKE_ANONYMOUS=Make Anonymous Type Global