[115727] externalize strings that need them or mark them as non-nls

8 files changed, 91 insertions, 70 deletions

diff --git a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/ValidatorHelper.java b/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/ValidatorHelper.java
index 37febb0673..d7c0b7a380 100644
--- a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/ValidatorHelper.java
+++ b/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/ValidatorHelper.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
+ * Copyright (c) 2001, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -35,15 +35,14 @@ import org.xml.sax.ext.LexicalHandler;
  */
 public class ValidatorHelper
 {                           
-  public static final String copyright = "(c) Copyright IBM Corporation 2002.";
   public List namespaceURIList = new Vector();
   public boolean isGrammarEncountered = false;    
   public boolean isDTDEncountered = false;
   public boolean isNamespaceEncountered = false;
-  public String schemaLocationString = "";
+  public String schemaLocationString = ""; //$NON-NLS-1$
   public int numDTDElements = 0;
 
-  public static final boolean IS_LINUX = java.io.File.separator.equals("/");
+  public static final boolean IS_LINUX = java.io.File.separator.equals("/"); //$NON-NLS-1$
 
   /**
    * Constructor.
@@ -64,10 +63,10 @@ public class ValidatorHelper
     
     reader = new org.apache.xerces.parsers.SAXParser();     
 
-    reader.setFeature("http://apache.org/xml/features/continue-after-fatal-error", false);
-    reader.setFeature("http://xml.org/sax/features/namespace-prefixes", true);
-    reader.setFeature("http://xml.org/sax/features/namespaces", false);
-    reader.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+    reader.setFeature("http://apache.org/xml/features/continue-after-fatal-error", false); //$NON-NLS-1$
+    reader.setFeature("http://xml.org/sax/features/namespace-prefixes", true); //$NON-NLS-1$
+    reader.setFeature("http://xml.org/sax/features/namespaces", false); //$NON-NLS-1$
+    reader.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); //$NON-NLS-1$
     reader.setContentHandler(new MyContentHandler());
     reader.setErrorHandler(new InternalErrorHandler()); 
 
@@ -103,7 +102,7 @@ public class ValidatorHelper
       {
       }
     };
-    reader.setProperty("http://xml.org/sax/properties/lexical-handler", lexicalHandler);
+    reader.setProperty("http://xml.org/sax/properties/lexical-handler", lexicalHandler); //$NON-NLS-1$
     
     return reader;
   }  
@@ -178,7 +177,7 @@ public class ValidatorHelper
     public String getPrefix(String name)
     {
       String prefix = null;
-      int index = name.indexOf(":");
+      int index = name.indexOf(":"); //$NON-NLS-1$
       if (index != -1)
       {
         prefix = name.substring(0, index);
@@ -188,7 +187,7 @@ public class ValidatorHelper
         
     public String getUnprefixedName(String name)
     {
-      int index = name.indexOf(":");
+      int index = name.indexOf(":"); //$NON-NLS-1$
       if (index != -1)
       {
         name = name.substring(index + 1);
@@ -198,7 +197,7 @@ public class ValidatorHelper
     
     public String getPrefixedName(String prefix, String localName)
     {
-      return prefix != null && prefix.length() > 0 ? prefix + ":" + localName : localName;     
+      return prefix != null && prefix.length() > 0 ? prefix + ":" + localName : localName;      //$NON-NLS-1$
     }
 
     public void startElement(String namespaceURI, String localName, String rawName, Attributes atts)
@@ -213,19 +212,19 @@ public class ValidatorHelper
         for (int i =0; i < nAtts; i++)
         {              
           String attributeName = atts.getQName(i);       
-          if (attributeName.equals("xmlns") || attributeName.startsWith("xmlns:"))
+          if (attributeName.equals("xmlns") || attributeName.startsWith("xmlns:")) //$NON-NLS-1$ //$NON-NLS-2$
           {                                         
             isNamespaceEncountered = true;    
             String value = atts.getValue(i);                 
-            if (value.startsWith("http://www.w3.org/") && value.endsWith("/XMLSchema-instance"))
+            if (value.startsWith("http://www.w3.org/") && value.endsWith("/XMLSchema-instance")) //$NON-NLS-1$ //$NON-NLS-2$
             {
-              schemaInstancePrefix = attributeName.equals("xmlns") ? "" : getUnprefixedName(attributeName);
+              schemaInstancePrefix = attributeName.equals("xmlns") ? "" : getUnprefixedName(attributeName); //$NON-NLS-1$ //$NON-NLS-2$
             }                   
           }                 
         }
         
         String prefix = getPrefix(rawName);
-        String rootElementNamespaceDeclarationName = (prefix != null && prefix.length() > 0) ? "xmlns:" + prefix : "xmlns";
+        String rootElementNamespaceDeclarationName = (prefix != null && prefix.length() > 0) ? "xmlns:" + prefix : "xmlns"; //$NON-NLS-1$ //$NON-NLS-2$
         String rootElementNamespace = rootElementNamespaceDeclarationName != null ? atts.getValue(rootElementNamespaceDeclarationName) : null;        
         
         String location = null;
@@ -234,10 +233,10 @@ public class ValidatorHelper
         // to determine a location
         if (schemaInstancePrefix != null)
         {                     
-          location = atts.getValue(getPrefixedName(schemaInstancePrefix, "noNamespaceSchemaLocation"));
+          location = atts.getValue(getPrefixedName(schemaInstancePrefix, "noNamespaceSchemaLocation")); //$NON-NLS-1$
           if (location == null)
           {
-        	String schemaLoc = atts.getValue(getPrefixedName(schemaInstancePrefix, "schemaLocation")); 
+        	String schemaLoc = atts.getValue(getPrefixedName(schemaInstancePrefix, "schemaLocation"));  //$NON-NLS-1$
             StringTokenizer st = new StringTokenizer(schemaLoc);
             while(st.hasMoreTokens())
             {
diff --git a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/XMLValidationMessages.java b/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/XMLValidationMessages.java
new file mode 100644
index 0000000000..77c6683aa4
--- /dev/null
+++ b/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/XMLValidationMessages.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2005 IBM Corporation and others.
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *   IBM - Initial API and implementation
+ * 
+ */
+package org.eclipse.wst.xml.core.internal.validation;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * Strings used by XML Validation
+ */
+public class XMLValidationMessages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.wst.xml.core.internal.validation.xmlvalidation";//$NON-NLS-1$
+
+	public static String _UI_PROBLEMS_VALIDATING_UNKNOWN_HOST;
+	public static String _UI_PROBLEMS_VALIDATING_FILE_NOT_FOUND;
+	public static String _UI_PROBLEMS_CONNECTION_REFUSED;
+	public static String _UI_REF_FILE_ERROR_MESSAGE;
+
+	static {
+		// load message values from bundle file
+		NLS.initializeMessages(BUNDLE_NAME, XMLValidationMessages.class);
+	}
+
+	private XMLValidationMessages() {
+		// cannot create new instance
+	}
+}
diff --git a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/XMLValidator.java b/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/XMLValidator.java
index 90ee2b69a5..a8bc2617a0 100644
--- a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/XMLValidator.java
+++ b/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/XMLValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
+ * Copyright (c) 2001, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -20,11 +20,9 @@ import java.io.Reader;
 import java.io.StringReader;
 import java.net.ConnectException;
 import java.net.UnknownHostException;
-import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.List;
-import java.util.ResourceBundle;
 
 import org.apache.xerces.impl.XMLErrorReporter;
 import org.apache.xerces.parsers.StandardParserConfiguration;
@@ -34,6 +32,7 @@ import org.apache.xerces.xni.XMLResourceIdentifier;
 import org.apache.xerces.xni.XNIException;
 import org.apache.xerces.xni.parser.XMLEntityResolver;
 import org.apache.xerces.xni.parser.XMLInputSource;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
 import org.eclipse.wst.xml.core.internal.validation.core.LazyURLInputStream;
 import org.eclipse.wst.xml.core.internal.validation.core.logging.LoggerFactory;
@@ -51,31 +50,23 @@ import org.xml.sax.ext.DeclHandler;
  */
 public class XMLValidator
 {
-  public static final String copyright = "(c) Copyright IBM Corporation 2002.";
   protected URIResolver uriResolver = null;
   //protected MyEntityResolver entityResolver = null;
   protected Hashtable ingoredErrorKeyTable = new Hashtable();
-  
-  protected ResourceBundle resourceBundle;
 
-  protected static final String IGNORE_ALWAYS = "IGNORE_ALWAYS";
-  protected static final String IGNORE_IF_DTD_WITHOUT_ELEMENT_DECL = "IGNORE_IF_DTD_WITHOUT_ELEMENT_DECL";
-  protected static final String PREMATURE_EOF = "PrematureEOF";
-  protected static final String ROOT_ELEMENT_TYPE_MUST_MATCH_DOCTYPEDECL = "RootElementTypeMustMatchDoctypedecl";
-  protected static final String MSG_ELEMENT_NOT_DECLARED = "MSG_ELEMENT_NOT_DECLARED";
-  
-  private static final String _UI_PROBLEMS_VALIDATING_FILE_NOT_FOUND = "_UI_PROBLEMS_VALIDATING_FILE_NOT_FOUND";
-  private static final String _UI_PROBLEMS_VALIDATING_UNKNOWN_HOST = "_UI_PROBLEMS_VALIDATING_UNKNOWN_HOST";
-  private static final String _UI_PROBLEMS_CONNECTION_REFUSED = "_UI_PROBLEMS_CONNECTION_REFUSED";
+  protected static final String IGNORE_ALWAYS = "IGNORE_ALWAYS"; //$NON-NLS-1$
+  protected static final String IGNORE_IF_DTD_WITHOUT_ELEMENT_DECL = "IGNORE_IF_DTD_WITHOUT_ELEMENT_DECL"; //$NON-NLS-1$
+  protected static final String PREMATURE_EOF = "PrematureEOF"; //$NON-NLS-1$
+  protected static final String ROOT_ELEMENT_TYPE_MUST_MATCH_DOCTYPEDECL = "RootElementTypeMustMatchDoctypedecl"; //$NON-NLS-1$
+  protected static final String MSG_ELEMENT_NOT_DECLARED = "MSG_ELEMENT_NOT_DECLARED"; //$NON-NLS-1$
   
-  private static final String FILE_NOT_FOUND_KEY = "FILE_NOT_FOUND";
+  private static final String FILE_NOT_FOUND_KEY = "FILE_NOT_FOUND"; //$NON-NLS-1$
 
   /**
    * Constructor.
    */
   public XMLValidator()
   {                          
-	resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.xml.core.internal.validation.xmlvalidation");
     // Here we add some error keys that we need to filter out when we're validation 
     // against a DTD without any element declarations.       
     ingoredErrorKeyTable.put(PREMATURE_EOF, IGNORE_ALWAYS);
@@ -119,18 +110,18 @@ public class XMLValidator
         }
       };
 
-      reader.setFeature("http://apache.org/xml/features/continue-after-fatal-error", false);
-      reader.setFeature("http://xml.org/sax/features/namespace-prefixes", valinfo.isNamespaceEncountered());
-      reader.setFeature("http://xml.org/sax/features/namespaces", valinfo.isNamespaceEncountered());              
-      reader.setFeature("http://xml.org/sax/features/validation", valinfo.isGrammarEncountered()); 
-      reader.setFeature("http://apache.org/xml/features/validation/schema", valinfo.isGrammarEncountered());
+      reader.setFeature("http://apache.org/xml/features/continue-after-fatal-error", false); //$NON-NLS-1$
+      reader.setFeature("http://xml.org/sax/features/namespace-prefixes", valinfo.isNamespaceEncountered()); //$NON-NLS-1$
+      reader.setFeature("http://xml.org/sax/features/namespaces", valinfo.isNamespaceEncountered());               //$NON-NLS-1$
+      reader.setFeature("http://xml.org/sax/features/validation", valinfo.isGrammarEncountered());  //$NON-NLS-1$
+      reader.setFeature("http://apache.org/xml/features/validation/schema", valinfo.isGrammarEncountered()); //$NON-NLS-1$
       
       // MH make sure validation works even when a customer entityResolver is note set (i.e. via setURIResolver())
       if (entityResolver != null)
       {  
-        reader.setProperty("http://apache.org/xml/properties/internal/entity-resolver", entityResolver);
+        reader.setProperty("http://apache.org/xml/properties/internal/entity-resolver", entityResolver); //$NON-NLS-1$
       }  
-      reader.setProperty("http://xml.org/sax/properties/declaration-handler", new MyDeclHandler());     
+      reader.setProperty("http://xml.org/sax/properties/declaration-handler", new MyDeclHandler());      //$NON-NLS-1$
     } 
     catch(Exception e)
     { 
@@ -257,15 +248,15 @@ public class XMLValidator
     {
       if (cause instanceof FileNotFoundException)
       {
-        validationMessageStr = MessageFormat.format(resourceBundle.getString(_UI_PROBLEMS_VALIDATING_FILE_NOT_FOUND), new Object [] { validationMessageStr });
+        validationMessageStr = NLS.bind(XMLValidationMessages._UI_PROBLEMS_VALIDATING_FILE_NOT_FOUND, new Object [] { validationMessageStr });
       }
       else if (cause instanceof UnknownHostException)
       {
-    	validationMessageStr = MessageFormat.format(resourceBundle.getString(_UI_PROBLEMS_VALIDATING_UNKNOWN_HOST), new Object [] { validationMessageStr });
+    	validationMessageStr = NLS.bind(XMLValidationMessages._UI_PROBLEMS_VALIDATING_UNKNOWN_HOST, new Object [] { validationMessageStr });
       }
       else if(cause instanceof ConnectException)
       {
-    	validationMessageStr = resourceBundle.getString(_UI_PROBLEMS_CONNECTION_REFUSED);
+    	validationMessageStr = XMLValidationMessages._UI_PROBLEMS_CONNECTION_REFUSED;
       }
     }
 
@@ -517,7 +508,7 @@ public class XMLValidator
 		          reportError = false;
 		        }
 		      }
-		      if ("schema_reference.4".equals(key) && arguments.length > 0)
+		      if ("schema_reference.4".equals(key) && arguments.length > 0) //$NON-NLS-1$
               {
                 Object location = arguments[0];  
                 if (location != null)
diff --git a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/Helper.java b/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/Helper.java
index 29bd9195b6..d9497af689 100644
--- a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/Helper.java
+++ b/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/Helper.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
+ * Copyright (c) 2001, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -37,12 +37,11 @@ import org.eclipse.wst.validation.internal.provisional.core.IMessage;
  */
 public class Helper extends WorkbenchContext
 {
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-  public static final String GET_PROJECT_FILES = "getAllFiles";
-  public static final String GET_FILE = "getFile";
+  public static final String GET_PROJECT_FILES = "getAllFiles"; //$NON-NLS-1$
+  public static final String GET_FILE = "getFile"; //$NON-NLS-1$
   //dw private static final IContainer[] NO_CONTAINERS = new IContainer[0];
-  public static final String VALIDATION_MARKER = "org.eclipse.wst.validation.problemmarker";
-  public static final String VALIDATION_MARKER_OWNER = "owner";  
+  public static final String VALIDATION_MARKER = "org.eclipse.wst.validation.problemmarker"; //$NON-NLS-1$
+  public static final String VALIDATION_MARKER_OWNER = "owner";   //$NON-NLS-1$
 
   /**
    * Constructor.
diff --git a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/LazyURLInputStream.java b/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/LazyURLInputStream.java
index cb5dbf5c37..834cb0b23a 100644
--- a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/LazyURLInputStream.java
+++ b/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/LazyURLInputStream.java
@@ -69,7 +69,7 @@ public class LazyURLInputStream extends InputStream
   {
 	if (pretendFileIsStillOpen) return 0;
 	createInnerStreamIfRequired();
-	if (inner == null) throw new IOException("Stream not available");
+	if (inner == null) throw new IOException("Stream not available"); //$NON-NLS-1$
 	return inner.available();
   }
 
@@ -117,7 +117,7 @@ public class LazyURLInputStream extends InputStream
   {
 	if (pretendFileIsStillOpen) return -1;
 	createInnerStreamIfRequired();
-	if (inner == null) throw new IOException("Stream not available");
+	if (inner == null) throw new IOException("Stream not available"); //$NON-NLS-1$
 	int bytesRead = inner.read();
 	if (bytesRead == -1 && !hasMarks) closeStream();
 	return bytesRead;
@@ -127,7 +127,7 @@ public class LazyURLInputStream extends InputStream
 	public int read(byte[] b) throws IOException {
 		if (pretendFileIsStillOpen) return -1;
 		createInnerStreamIfRequired();
-		if (inner == null) throw new IOException("Stream not available");
+		if (inner == null) throw new IOException("Stream not available"); //$NON-NLS-1$
 		int bytesRead = inner.read(b);
 		if (bytesRead == -1 && !hasMarks) closeStream();
 		return bytesRead;
@@ -137,7 +137,7 @@ public class LazyURLInputStream extends InputStream
   {    
 	if (pretendFileIsStillOpen) return -1;
 	createInnerStreamIfRequired();
-	if (inner == null) throw new IOException("Stream not available");
+	if (inner == null) throw new IOException("Stream not available"); //$NON-NLS-1$
 	int bytesRead = inner.read(b, off, len);
 	if (bytesRead == -1 && !hasMarks) closeStream();
 	return bytesRead;
@@ -147,7 +147,7 @@ public class LazyURLInputStream extends InputStream
   {
 	if (pretendFileIsStillOpen) return;
 	createInnerStreamIfRequired();
-	if (inner == null) throw new IOException("Stream not available");
+	if (inner == null) throw new IOException("Stream not available"); //$NON-NLS-1$
 	inner.reset();
   }
 
@@ -155,7 +155,7 @@ public class LazyURLInputStream extends InputStream
   {   
 	if (pretendFileIsStillOpen) return 0;
 	createInnerStreamIfRequired();
-	if (inner == null) throw new IOException("Stream not available");
+	if (inner == null) throw new IOException("Stream not available"); //$NON-NLS-1$
 	return inner.skip(n);
   }
 }
diff --git a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/ValidationInfo.java b/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/ValidationInfo.java
index 378dbf2cc5..fa2e1a597f 100644
--- a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/ValidationInfo.java
+++ b/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/ValidationInfo.java
@@ -12,11 +12,12 @@ package org.eclipse.wst.xml.core.internal.validation.core;
 
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.ResourceBundle;
+
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.wst.xml.core.internal.validation.XMLValidationMessages;
 
 /**
  * This class handles messages from a validator. This class can handle
@@ -29,14 +30,11 @@ public class ValidationInfo implements ValidationReport
   public static int SEV_ERROR = 0;
   public static int SEV_WARNING = 1;
   
-  private static String _UI_REF_FILE_ERROR_MESSAGE = "_UI_REF_FILE_ERROR_MESSAGE";
   private String validating_file_uri = null;
   private URL validating_file_url = null;
   private boolean valid = true;
   private List messages = new ArrayList();
   private HashMap nestedMessages = new HashMap();
-  
-  protected ResourceBundle resourceBundle;
 
   /**
    * Constructor.
@@ -46,7 +44,6 @@ public class ValidationInfo implements ValidationReport
    */
   public ValidationInfo(String uri)
   {
-	resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.xml.core.internal.validation.xmlvalidation");
     if(uri != null)
     {
       this.validating_file_uri = uri;
@@ -200,7 +197,7 @@ public class ValidationInfo implements ValidationReport
         ValidationMessage container = (ValidationMessage) nestedMessages.get(nesteduri);
         if(container == null)
         {
-          container = new ValidationMessage(MessageFormat.format(resourceBundle.getString(_UI_REF_FILE_ERROR_MESSAGE), new Object [] { nesteduri }), 1, 0, nesteduri);
+          container = new ValidationMessage(NLS.bind(XMLValidationMessages._UI_REF_FILE_ERROR_MESSAGE, new Object [] { nesteduri }), 1, 0, nesteduri);
        
           // Initially set the nested error to a warning. This will automatically be changed
           // to an error if a nested message has a severity of error.
@@ -279,8 +276,8 @@ public class ValidationInfo implements ValidationReport
 //      {
 //      }
 //    }
-    uri = uri.replaceAll("%20"," ");
-    uri = uri.replaceAll("%5E", "^");
+    uri = uri.replaceAll("%20"," "); //$NON-NLS-1$ //$NON-NLS-2$
+    uri = uri.replaceAll("%5E", "^"); //$NON-NLS-1$ //$NON-NLS-2$
     uri = uri.replace('\\','/');
     
     return uri;
diff --git a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/ValidationMessage.java b/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/ValidationMessage.java
index eb66b2000b..807ea9aca5 100644
--- a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/ValidationMessage.java
+++ b/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/ValidationMessage.java
@@ -24,7 +24,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IMessage;
  */
 public class ValidationMessage
 {
-  public static final QualifiedName ERROR_MESSAGE_MAP_QUALIFIED_NAME = new QualifiedName("org.eclipse.wst.xml.validation", "errorMessageMap");
+  public static final QualifiedName ERROR_MESSAGE_MAP_QUALIFIED_NAME = new QualifiedName("org.eclipse.wst.xml.validation", "errorMessageMap"); //$NON-NLS-1$ //$NON-NLS-2$
   protected String message;
   protected int lineNumber;
   protected int columnNumber;
diff --git a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/logging/LoggerFactory.java b/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/logging/LoggerFactory.java
index 4d11843030..9a49c5de46 100644
--- a/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/logging/LoggerFactory.java
+++ b/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/core/logging/LoggerFactory.java
@@ -22,8 +22,8 @@ public class LoggerFactory
   private static ILogger      logger            = null;
   private static ClassLoader  classloader       = null;
   private static String       loggerClass       = null;
-  private static final String commandlinelogger = "org.eclipse.wst.xml.validation.internal.core.logging.CommandLineLogger";
-  private static final String eclipselogger     = "org.eclipse.wst.xml.validation.internal.core.logging.EclipseLogger";
+  private static final String commandlinelogger = "org.eclipse.wst.xml.validation.internal.core.logging.CommandLineLogger"; //$NON-NLS-1$
+  private static final String eclipselogger     = "org.eclipse.wst.xml.validation.internal.core.logging.EclipseLogger"; //$NON-NLS-1$
   private static String       defaultlogger     = commandlinelogger;
 
   /**