diff options
author | mkuppe | 2009-02-23 13:12:01 +0000 |
---|---|---|
committer | mkuppe | 2009-02-23 13:12:01 +0000 |
commit | 03aef52be2407329738c4caba254290e2cefbbf7 (patch) | |
tree | d4520c06e51e54039b31a5cdc7ea6d773c8f7ad7 /providers | |
parent | 3520dc40e76574eb6fd586642b693099e9047a9a (diff) | |
download | org.eclipse.ecf-03aef52be2407329738c4caba254290e2cefbbf7.tar.gz org.eclipse.ecf-03aef52be2407329738c4caba254290e2cefbbf7.tar.xz org.eclipse.ecf-03aef52be2407329738c4caba254290e2cefbbf7.zip |
RESOLVED - bug 257864: Turn checked into runtime exceptions
https://bugs.eclipse.org/bugs/show_bug.cgi?id=257864
Diffstat (limited to 'providers')
2 files changed, 6 insertions, 7 deletions
diff --git a/providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/provider/discovery/CompositeDiscoveryContainer.java b/providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/provider/discovery/CompositeDiscoveryContainer.java index 87076fb2d..3db5ad2ba 100644 --- a/providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/provider/discovery/CompositeDiscoveryContainer.java +++ b/providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/provider/discovery/CompositeDiscoveryContainer.java @@ -17,7 +17,7 @@ import org.eclipse.ecf.core.IContainer; import org.eclipse.ecf.core.events.*; import org.eclipse.ecf.core.identity.*; import org.eclipse.ecf.core.security.IConnectContext; -import org.eclipse.ecf.core.util.ECFException; +import org.eclipse.ecf.core.util.ECFRuntimeException; import org.eclipse.ecf.core.util.Trace; import org.eclipse.ecf.discovery.*; import org.eclipse.ecf.discovery.identity.*; @@ -285,7 +285,7 @@ public class CompositeDiscoveryContainer extends AbstractDiscoveryContainerAdapt /* (non-Javadoc) * @see org.eclipse.ecf.discovery.IDiscoveryContainerAdapter#registerService(org.eclipse.ecf.discovery.IServiceInfo) */ - public void registerService(final IServiceInfo serviceInfo) throws ECFException { + public void registerService(final IServiceInfo serviceInfo) { Assert.isNotNull(serviceInfo); synchronized (registeredServices) { Assert.isTrue(registeredServices.add(serviceInfo)); @@ -304,7 +304,7 @@ public class CompositeDiscoveryContainer extends AbstractDiscoveryContainerAdapt /* (non-Javadoc) * @see org.eclipse.ecf.discovery.IDiscoveryContainerAdapter#unregisterService(org.eclipse.ecf.discovery.IServiceInfo) */ - public void unregisterService(final IServiceInfo serviceInfo) throws ECFException { + public void unregisterService(final IServiceInfo serviceInfo) { Assert.isNotNull(serviceInfo); synchronized (registeredServices) { // no assert as unregisterService might be called with an non-existing ISI @@ -332,7 +332,7 @@ public class CompositeDiscoveryContainer extends AbstractDiscoveryContainerAdapt final IServiceInfo serviceInfo = (IServiceInfo) itr.next(); try { idca.registerService(serviceInfo); - } catch (final ECFException e) { + } catch (final ECFRuntimeException e) { // we eat the exception here since the original registerService call is long done Trace.catching(Activator.PLUGIN_ID, METHODS_CATCHING, this.getClass(), "addContainer(Object)", e); //$NON-NLS-1$ } diff --git a/providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/provider/discovery/SingletonDiscoveryContainer.java b/providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/provider/discovery/SingletonDiscoveryContainer.java index 3c518caa1..61a6d305d 100644 --- a/providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/provider/discovery/SingletonDiscoveryContainer.java +++ b/providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/provider/discovery/SingletonDiscoveryContainer.java @@ -14,7 +14,6 @@ import org.eclipse.ecf.core.*; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.identity.Namespace; import org.eclipse.ecf.core.security.IConnectContext; -import org.eclipse.ecf.core.util.ECFException; import org.eclipse.ecf.discovery.*; import org.eclipse.ecf.discovery.identity.IServiceID; import org.eclipse.ecf.discovery.identity.IServiceTypeID; @@ -116,7 +115,7 @@ public class SingletonDiscoveryContainer implements IDiscoveryContainerAdapter, /* (non-Javadoc) * @see org.eclipse.ecf.discovery.IDiscoveryContainerAdapter#registerService(org.eclipse.ecf.discovery.IServiceInfo) */ - public void registerService(final IServiceInfo serviceInfo) throws ECFException { + public void registerService(final IServiceInfo serviceInfo) { discovery.registerService(serviceInfo); } @@ -137,7 +136,7 @@ public class SingletonDiscoveryContainer implements IDiscoveryContainerAdapter, /* (non-Javadoc) * @see org.eclipse.ecf.discovery.IDiscoveryContainerAdapter#unregisterService(org.eclipse.ecf.discovery.IServiceInfo) */ - public void unregisterService(final IServiceInfo serviceInfo) throws ECFException { + public void unregisterService(final IServiceInfo serviceInfo) { discovery.unregisterService(serviceInfo); } |