[150023] Catalog problem... file URIs with file:// are not marked with red x's

diff --git a/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/CatalogReader.java b/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/CatalogReader.java
index 91d2dd4..dc17d74 100644
--- a/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/CatalogReader.java
+++ b/bundles/org.eclipse.wst.xml.core/src-catalog/org/eclipse/wst/xml/core/internal/catalog/CatalogReader.java

@@ -20,6 +20,7 @@
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
+import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
 import org.eclipse.wst.xml.core.internal.Logger;
 import org.eclipse.wst.xml.core.internal.XMLCoreMessages;
 import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogElement;
@@ -92,7 +93,7 @@
 		    String key = attributes.getValue("", CompatabilityConstants.ATT_ID);   		     //$NON-NLS-1$
 	        catalogEntry.setKey(key);
 	        String entryUri = attributes.getValue("", CompatabilityConstants.ATT_URI);    //$NON-NLS-1$
-	        catalogEntry.setURI(entryUri);  
+	        catalogEntry.setURI(URIHelper.ensureURIProtocolFormat(entryUri));  
 	        String webURL = attributes.getValue("", CompatabilityConstants.ATT_WEB_URL); //$NON-NLS-1$
 			if (webURL != null)
 			{
@@ -154,7 +155,7 @@
       {
         CatalogEntry catalogEntry = (CatalogEntry) catalogElement;
         catalogEntry.setKey(key); 
-        catalogEntry.setURI(entryURI);     
+        catalogEntry.setURI(URIHelper.ensureURIProtocolFormat(entryURI));     
       }
       // process any other attributes
       for (int j = 0; j < attributes.getLength(); j++)

diff --git a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/EditCatalogEntryDialog.java b/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/EditCatalogEntryDialog.java
index 5718d71..c78f642 100644
--- a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/EditCatalogEntryDialog.java
+++ b/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/EditCatalogEntryDialog.java

@@ -49,6 +49,7 @@
 import org.eclipse.swt.widgets.Widget;
 import org.eclipse.ui.part.PageBook;
 import org.eclipse.wst.common.ui.internal.dialogs.SelectSingleFileDialog;
+import org.eclipse.wst.common.uriresolver.internal.URI;
 import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
 import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
 import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogElement;
@@ -588,7 +589,7 @@
 			if (!URIHelper.hasProtocol(uri)) {
 				uri = URIHelper.isAbsolute(uri) ? URIHelper.prependFileProtocol(uri) : URIHelper.prependPlatformResourceProtocol(uri);
 			}
-			getNextCatalog().setCatalogLocation(uri);
+			getNextCatalog().setCatalogLocation(URIHelper.ensureFileURIProtocolFormat(uri));
 		}
 
 		protected void updateWidgets(Widget widget) {
@@ -950,7 +951,7 @@
 			FileDialog dialog = new FileDialog(getShell(), SWT.SINGLE);
 			String file = dialog.open();
 			if (control instanceof Text && file != null) {
-				((Text) control).setText(file);
+				((Text) control).setText(URIHelper.ensureFileURIProtocolFormat(URI.createFileURI(file).toString()));
 			}
 		}
 	}