String internalizations for bug 224907.

6 files changed, 10 insertions, 28 deletions

diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IDFactory.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IDFactory.java
index e5a9b9b7b..7b83d1895 100644
--- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IDFactory.java
+++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IDFactory.java
@@ -13,7 +13,8 @@ import java.util.*;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.ecf.core.util.Trace;
-import org.eclipse.ecf.internal.core.identity.*;
+import org.eclipse.ecf.internal.core.identity.Activator;
+import org.eclipse.ecf.internal.core.identity.IdentityDebugOptions;
 import org.eclipse.osgi.util.NLS;
 
 /**
@@ -188,12 +189,12 @@ public class IDFactory implements IIDFactory {
 		Trace.entering(Activator.PLUGIN_ID, IdentityDebugOptions.METHODS_ENTERING, IDFactory.class, "createID", new Object[] {n, Trace.getArgumentsString(args)}); //$NON-NLS-1$
 		// Verify namespace is non-null
 		if (n == null)
-			logAndThrow(Messages.IDFactory_Namespace_Not_Null, null);
+			logAndThrow("Namespace cannot be null", null); //$NON-NLS-1$
 		// Make sure that namespace is in table of known namespace. If not,
 		// throw...we don't create any instances that we don't know about!
 		Namespace ns = getNamespace0(n);
 		if (ns == null)
-			logAndThrow(NLS.bind(Messages.IDFactory_Namespace_Not_Found, n.getName()), null);
+			logAndThrow(NLS.bind("Namespace {0} not found", n.getName()), null); //$NON-NLS-1$
 		// We're OK, go ahead and setup array of classes for call to
 		// instantiator
 		// Ask instantiator to actually create instance
@@ -211,7 +212,7 @@ public class IDFactory implements IIDFactory {
 	public ID createID(String namespaceName, Object[] args) throws IDCreateException {
 		Namespace n = getNamespaceByName(namespaceName);
 		if (n == null)
-			throw new IDCreateException(NLS.bind(Messages.IDFactory_Namespace_Not_Found, namespaceName));
+			throw new IDCreateException(NLS.bind("Namespace {0} not found", namespaceName)); //$NON-NLS-1$
 		return createID(n, args);
 	}
 
@@ -230,7 +231,7 @@ public class IDFactory implements IIDFactory {
 	 */
 	public ID createStringID(String idstring) throws IDCreateException {
 		if (idstring == null)
-			throw new IDCreateException(Messages.IDFactory_StringID_Not_Null);
+			throw new IDCreateException("StringID cannot be null"); //$NON-NLS-1$
 		Namespace n = new StringID.StringIDNamespace();
 		return createID(n, new String[] {idstring});
 	}
diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/LongID.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/LongID.java
index 03f17c036..48942c18f 100644
--- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/LongID.java
+++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/LongID.java
@@ -8,8 +8,6 @@
  ******************************************************************************/
 package org.eclipse.ecf.core.identity;
 
-import org.eclipse.ecf.internal.core.identity.Messages;
-
 /**
  * A unique ID class based upon Long/long
  * 
@@ -23,7 +21,7 @@ public class LongID extends BaseID {
 		private static final long serialVersionUID = -1580533392719331665L;
 
 		public LongNamespace() {
-			super(LongID.class.getName(), Messages.LongID_LongID_Namespace_Description);
+			super(LongID.class.getName(), "LongID Namespace"); //$NON-NLS-1$
 		}
 
 		/**
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 0173a928f..74e69bd93 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
@@ -11,7 +11,6 @@ package org.eclipse.ecf.core.identity;
 import java.io.Serializable;
 import org.eclipse.core.runtime.*;
 import org.eclipse.ecf.internal.core.identity.Activator;
-import org.eclipse.ecf.internal.core.identity.Messages;
 
 /**
  * Namespace base class
@@ -59,7 +58,7 @@ public abstract class Namespace implements Serializable, IAdaptable {
 	}
 
 	public final boolean initialize(String n, String desc) {
-		Assert.isNotNull(n, Messages.Namespace_Namespace_Name_Not_Null);
+		Assert.isNotNull(n, "Namespace<init> name cannot be null"); //$NON-NLS-1$
 		if (!isInitialized) {
 			this.name = n;
 			this.description = desc;
diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/StringID.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/StringID.java
index 37ad572b7..2b2e2df0b 100644
--- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/StringID.java
+++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/StringID.java
@@ -8,8 +8,6 @@
  ******************************************************************************/
 package org.eclipse.ecf.core.identity;
 
-import org.eclipse.ecf.internal.core.identity.Messages;
-
 /**
  * A string-based identity
  * 
@@ -25,12 +23,12 @@ public class StringID extends BaseID {
 		}
 
 		public StringIDNamespace() {
-			super(StringID.class.getName(), Messages.StringID_StringID_Namespace_Description);
+			super(StringID.class.getName(), "StringID Namespace"); //$NON-NLS-1$
 		}
 
 		public ID createInstance(Object[] parameters) throws IDCreateException {
 			if (parameters == null || parameters.length == 0) {
-				throw new IDCreateException(Messages.StringID_StringID_Name_Not_Null);
+				throw new IDCreateException("StringID name cannot be null"); //$NON-NLS-1$
 			}
 			return new StringID(this, (String) parameters[0]);
 		}
diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Messages.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Messages.java
index 21a912150..eff592dd8 100644
--- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Messages.java
+++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Messages.java
@@ -24,13 +24,6 @@ public class Messages extends NLS {
 	public static String GUID_GUID_Namespace_Description_Default;
 	public static String GUID_IBM_SECURE_RANDOM;
 	public static String GUID_SHA1;
-	public static String IDFactory_Namespace_Not_Found;
-	public static String IDFactory_Namespace_Not_Null;
-	public static String IDFactory_StringID_Not_Null;
-	public static String LongID_LongID_Namespace_Description;
-	public static String Namespace_Namespace_Name_Not_Null;
-	public static String StringID_StringID_Name_Not_Null;
-	public static String StringID_StringID_Namespace_Description;
 	public static String Trace_Date_Time_Format;
 	static {
 		// initialize resource bundle
diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/messages.properties b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/messages.properties
index 74c09a5c1..1a555983f 100644
--- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/messages.properties
+++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/messages.properties
@@ -1,14 +1,7 @@
-IDFactory_Namespace_Not_Null=Namespace cannot be null
-IDFactory_StringID_Not_Null=StringID cannot be null
-Namespace_Namespace_Name_Not_Null=Namespace<init> name cannot be null
 GUID_GUID_Namespace_Description_Default=GUID Namespace
 GUID_IBM_SECURE_RANDOM=IBMSECURERANDOM
 GUID_SHA1=SHA1PRNG
 Trace_Date_Time_Format=[MM/dd/yy;HH:mm:ss:SSS]
-StringID_StringID_Namespace_Description=StringID Namespace
-StringID_StringID_Name_Not_Null=StringID name cannot be null
 Base64_Input_Data_Not_Null=Input data cannot be null
 Base64_Invalid_Value=Invalid value "{0}" in base64 string
 GUID_GUID_Creation_Failure=GUID creation failure: 
-LongID_LongID_Namespace_Description=LongID Namespace
-IDFactory_Namespace_Not_Found = Namespace "{0}" not found