NEW - bug 258904: [Discovery] Remove throw declarations for runtime IDCreateException

https://bugs.eclipse.org/bugs/show_bug.cgi?id=258904

3 files changed, 7 insertions, 19 deletions

diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/IServiceIDFactory.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/IServiceIDFactory.java
index 03478ff84..16b213c97 100644
--- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/IServiceIDFactory.java
+++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/IServiceIDFactory.java
@@ -11,7 +11,6 @@
 
 package org.eclipse.ecf.discovery.identity;
 
-import org.eclipse.ecf.core.identity.IDCreateException;
 import org.eclipse.ecf.core.identity.Namespace;
 
 /**
@@ -32,8 +31,6 @@ public interface IServiceIDFactory {
 	 * @since 3.0
 	 * 
 	 * @return IServiceTypeID created. Will not be <code>null</code>.
-	 * @throws IDCreateException
-	 *             if some problem creating the new IServiceTypeID.
 	 */
 	public IServiceTypeID createServiceTypeID(Namespace namespace,
 			String serviceType);
@@ -50,8 +47,6 @@ public interface IServiceIDFactory {
 	 * @since 3.0
 	 * 
 	 * @return IServiceTypeID created. Will not be <code>null</code>.
-	 * @throws IDCreateException
-	 *             if some problem creating the new IServiceTypeID.
 	 */
 	public IServiceTypeID createServiceTypeID(Namespace namespace,
 			String[] serviceType);
@@ -79,12 +74,10 @@ public interface IServiceIDFactory {
 	 * @since 3.0
 	 * 
 	 * @return IServiceTypeID created. Will not be <code>null</code>.
-	 * @throws IDCreateException
-	 *             if some problem creating the new IServiceTypeID.
 	 */
 	public IServiceTypeID createServiceTypeID(Namespace namespace,
 			String[] services, String[] scopes, String[] protocols,
-			String namingAuthority) throws IDCreateException;
+			String namingAuthority);
 
 	/**
 	 * Create an IServiceTypeID. Creates an immutable IServiceTypeID.
@@ -101,11 +94,9 @@ public interface IServiceIDFactory {
 	 * @since 3.0
 	 * 
 	 * @return IServiceTypeID created. Will not be <code>null</code>.
-	 * @throws IDCreateException
-	 *             if some problem creating the new IServiceTypeID.
 	 */
 	public IServiceTypeID createServiceTypeID(Namespace namespace,
-			String[] serviceType, String[] protocols) throws IDCreateException;
+			String[] serviceType, String[] protocols);
 
 	/**
 	 * Create an IServiceTypeID. Creates an immutable IServiceTypeID from a non-
@@ -120,9 +111,7 @@ public interface IServiceIDFactory {
 	 * @since 3.0
 	 * 
 	 * @return IServiceTypeID created. Will not be <code>null</code>.
-	 * @throws IDCreateException
-	 *             if some problem creating the new IServiceTypeID.
 	 */
 	public IServiceTypeID createServiceTypeID(Namespace namespace,
-			IServiceTypeID aServiceTypeID) throws IDCreateException;
+			IServiceTypeID aServiceTypeID);
 }
diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/ServiceIDFactory.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/ServiceIDFactory.java
index 2870d29a8..1c320f864 100644
--- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/ServiceIDFactory.java
+++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/ServiceIDFactory.java
@@ -54,7 +54,7 @@ public class ServiceIDFactory implements IServiceIDFactory {
 	 * @since 3.0
 	 * @see org.eclipse.ecf.discovery.identity.IServiceIDFactory#createServiceTypeID(org.eclipse.ecf.core.identity.Namespace, java.lang.String[], java.lang.String[], java.lang.String[], java.lang.String)
 	 */
-	public IServiceTypeID createServiceTypeID(Namespace namespace, String[] serviceType, String[] scopes, String[] protocols, String namingAuthority) throws IDCreateException {
+	public IServiceTypeID createServiceTypeID(Namespace namespace, String[] serviceType, String[] scopes, String[] protocols, String namingAuthority) {
 		try {
 			IServiceTypeID aServiceType = new ServiceTypeID(namespace, serviceType, scopes, protocols, namingAuthority);
 			return (IServiceTypeID) IDFactory.getDefault().createID(namespace, new Object[] {aServiceType});
@@ -67,7 +67,7 @@ public class ServiceIDFactory implements IServiceIDFactory {
 	 * @see org.eclipse.ecf.discovery.identity.IServiceIDFactory#createServiceTypeID(org.eclipse.ecf.core.identity.Namespace, java.lang.String[], java.lang.String[])
 	 * @since 3.0
 	 */
-	public IServiceTypeID createServiceTypeID(Namespace namespace, String[] serviceType, String[] protocols) throws IDCreateException {
+	public IServiceTypeID createServiceTypeID(Namespace namespace, String[] serviceType, String[] protocols) {
 		return this.createServiceTypeID(namespace, serviceType, IServiceTypeID.DEFAULT_SCOPE, protocols, IServiceTypeID.DEFAULT_NA);
 	}
 
@@ -75,7 +75,7 @@ public class ServiceIDFactory implements IServiceIDFactory {
 	 * @see org.eclipse.ecf.discovery.identity.IServiceIDFactory#createServiceTypeID(org.eclipse.ecf.core.identity.Namespace, org.eclipse.ecf.discovery.identity.IServiceTypeID)
 	 * @since 3.0
 	 */
-	public IServiceTypeID createServiceTypeID(Namespace namespace, IServiceTypeID aServiceTypeId) throws IDCreateException {
+	public IServiceTypeID createServiceTypeID(Namespace namespace, IServiceTypeID aServiceTypeId) {
 		return (IServiceTypeID) IDFactory.getDefault().createID(namespace, new Object[] {aServiceTypeId});
 	}
 }
diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/ServiceTypeID.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/ServiceTypeID.java
index 13a2241e6..f6c795c86 100644
--- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/ServiceTypeID.java
+++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/ServiceTypeID.java
@@ -58,9 +58,8 @@ public class ServiceTypeID extends BaseID implements IServiceTypeID {
 	 * Clients should not call this method directly. Use the {@link Namespace} and/or {@link ServiceIDFactory} instead.
 	 * @param namespace
 	 * @param aType
-	 * @throws IDCreateException
 	 */
-	public ServiceTypeID(Namespace namespace, String aType) throws IDCreateException {
+	public ServiceTypeID(Namespace namespace, String aType) {
 		this(namespace);
 		if (aType != null) {
 			try {