Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkuppe2008-06-12 05:01:47 -0400
committermkuppe2008-06-12 05:01:47 -0400
commitfe5b8800ddb367791667bb67e51e9d6ef110b9cf (patch)
tree6e4bd997862d2d1bb83de9097709319159b47d13
parent23288f5a4c654ec841cab11b5a17eff9deca4c5b (diff)
downloadorg.eclipse.ecf-fe5b8800ddb367791667bb67e51e9d6ef110b9cf.tar.gz
org.eclipse.ecf-fe5b8800ddb367791667bb67e51e9d6ef110b9cf.tar.xz
org.eclipse.ecf-fe5b8800ddb367791667bb67e51e9d6ef110b9cf.zip
RESOLVED - bug 236810: IDiscoveryContainerAdapter may extend IContainer
https://bugs.eclipse.org/bugs/show_bug.cgi?id=236810
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/AbstractDiscoveryContainerAdapter.java3
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryContainerAdapter.java3
2 files changed, 3 insertions, 3 deletions
diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/AbstractDiscoveryContainerAdapter.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/AbstractDiscoveryContainerAdapter.java
index bb8bc67b3..dca8a806b 100644
--- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/AbstractDiscoveryContainerAdapter.java
+++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/AbstractDiscoveryContainerAdapter.java
@@ -13,14 +13,13 @@ package org.eclipse.ecf.discovery;
import java.util.*;
import org.eclipse.core.runtime.Assert;
import org.eclipse.ecf.core.AbstractContainer;
-import org.eclipse.ecf.core.IContainer;
import org.eclipse.ecf.core.identity.*;
import org.eclipse.ecf.core.util.Trace;
import org.eclipse.ecf.discovery.identity.IServiceTypeID;
import org.eclipse.ecf.internal.discovery.DiscoveryDebugOption;
import org.eclipse.ecf.internal.discovery.DiscoveryPlugin;
-public abstract class AbstractDiscoveryContainerAdapter extends AbstractContainer implements IDiscoveryContainerAdapter, IContainer {
+public abstract class AbstractDiscoveryContainerAdapter extends AbstractContainer implements IDiscoveryContainerAdapter {
/**
* Collection of service listeners i.e. Collection<IServiceListener>.
diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryContainerAdapter.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryContainerAdapter.java
index 1e1c7c6f7..bc97156bd 100644
--- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryContainerAdapter.java
+++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryContainerAdapter.java
@@ -10,6 +10,7 @@
package org.eclipse.ecf.discovery;
import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.ecf.core.IContainer;
import org.eclipse.ecf.core.identity.Namespace;
import org.eclipse.ecf.core.util.ECFException;
import org.eclipse.ecf.discovery.identity.*;
@@ -28,7 +29,7 @@ import org.eclipse.ecf.discovery.identity.*;
* implementation.
*
*/
-public interface IDiscoveryContainerAdapter extends IAdaptable {
+public interface IDiscoveryContainerAdapter extends IContainer, IAdaptable {
/** ECF Service Property Names **/
public static final String CONTAINER_FACTORY_NAME_PROPERTY = "org.eclipse.ecf.containerFactoryName"; //$NON-NLS-1$

Back to the top