Changed namespaceToExternalForm to use Namespace.getScheme() rather than Namespace.getName()

2 files changed, 5 insertions, 4 deletions

diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/BaseID.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/BaseID.java
index 8e92b142a..91a9e6ef6 100644
--- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/BaseID.java
+++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/BaseID.java
@@ -61,7 +61,7 @@ public abstract class BaseID implements ID {
 	public String toExternalForm() {
 		return namespace.toExternalForm(this);
 	}
-	
+
 	protected abstract int namespaceCompareTo(BaseID o);
 
 	protected abstract boolean namespaceEquals(BaseID o);
@@ -71,9 +71,10 @@ public abstract class BaseID implements ID {
 	protected abstract int namespaceHashCode();
 
 	protected String namespaceToExternalForm() {
-		return namespace.getName()+Namespace.PROTOCOL_SEPARATOR+namespaceGetName();
+		return namespace.getScheme() + Namespace.SCHEME_SEPARATOR
+				+ namespaceGetName();
 	}
-	
+
 	public Object getAdapter(Class clazz) {
 		return null;
 	}
diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/Namespace.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/Namespace.java
index 262a86d47..32296c5eb 100644
--- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/Namespace.java
+++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/Namespace.java
@@ -39,7 +39,7 @@ import java.io.Serializable;
  */
 public abstract class Namespace implements Serializable {
 	private static final long serialVersionUID = 3976740272094720312L;
-	public static final String PROTOCOL_SEPARATOR = ":";
+	public static final String SCHEME_SEPARATOR = ":";
 
 	private String name;