Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkuppe2008-06-13 02:34:57 -0400
committermkuppe2008-06-13 02:34:57 -0400
commitda8c4c68fcf7e4ade550759028900519f44fc9e8 (patch)
treeb7a9e8777f36de0ab259842b1634cf20075488de
parent1f86d22761e0ccea1c33bad8e28a20887ee375e5 (diff)
downloadorg.eclipse.ecf-da8c4c68fcf7e4ade550759028900519f44fc9e8.tar.gz
org.eclipse.ecf-da8c4c68fcf7e4ade550759028900519f44fc9e8.tar.xz
org.eclipse.ecf-da8c4c68fcf7e4ade550759028900519f44fc9e8.zip
RESOLVED - bug 236810: IDiscoveryContainerAdapter may extend IContainer
https://bugs.eclipse.org/bugs/show_bug.cgi?id=236810
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/provider/discovery/CompositeDiscoveryContainer.java4
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/provider/discovery/SingletonDiscoveryContainer.java2
2 files changed, 3 insertions, 3 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 d8cf6139c..8cc4b5b51 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
@@ -181,7 +181,7 @@ public class CompositeDiscoveryContainer extends AbstractDiscoveryContainerAdapt
}
private IServiceID getServiceIDForDiscoveryContainer(IServiceID service, IDiscoveryContainerAdapter dca) {
- Namespace connectNamespace = dca.getConnectNamespace();
+ Namespace connectNamespace = dca.getServicesNamespace();
if (!connectNamespace.equals(service.getNamespace())) {
try {
return ServiceIDFactory.getDefault().createServiceID(connectNamespace, service.getServiceTypeID().getName(), service.getName());
@@ -246,7 +246,7 @@ public class CompositeDiscoveryContainer extends AbstractDiscoveryContainerAdapt
}
private IServiceTypeID getServiceTypeIDForDiscoveryContainer(IServiceTypeID type, IDiscoveryContainerAdapter dca) {
- Namespace connectNamespace = dca.getConnectNamespace();
+ Namespace connectNamespace = dca.getServicesNamespace();
if (!connectNamespace.equals(type.getNamespace())) {
try {
return (IServiceTypeID) connectNamespace.createInstance(new Object[] {type});
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 d608e5167..64a9aa9a0 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
@@ -22,7 +22,7 @@ import org.eclipse.ecf.discovery.identity.IServiceTypeID;
/**
*
*/
-public class SingletonDiscoveryContainer implements IDiscoveryContainerAdapter {
+public class SingletonDiscoveryContainer implements IDiscoveryContainerAdapter, IContainer {
private IDiscoveryContainerAdapter discovery;
private IContainer container;

Back to the top