Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2010-05-18 00:46:33 -0400
committerslewis2010-05-18 00:46:33 -0400
commit09fd5fe67ac8f19e51949a572d98220d19522d0a (patch)
tree4c1bde0b52cdcc040234e53274e9348479e83485 /providers/bundles/org.eclipse.ecf.provider.xmpp
parent88d808f9bfd08231cd81fd9ffbf13dcfdd3f7ea9 (diff)
downloadorg.eclipse.ecf-09fd5fe67ac8f19e51949a572d98220d19522d0a.tar.gz
org.eclipse.ecf-09fd5fe67ac8f19e51949a572d98220d19522d0a.tar.xz
org.eclipse.ecf-09fd5fe67ac8f19e51949a572d98220d19522d0a.zip
Fix for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=313276
Diffstat (limited to 'providers/bundles/org.eclipse.ecf.provider.xmpp')
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/XMPPRemoteServiceAdapterFactory.java41
1 files changed, 10 insertions, 31 deletions
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/XMPPRemoteServiceAdapterFactory.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/XMPPRemoteServiceAdapterFactory.java
index aa239eb2d..c24f2c12a 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/XMPPRemoteServiceAdapterFactory.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/XMPPRemoteServiceAdapterFactory.java
@@ -11,55 +11,35 @@
package org.eclipse.ecf.internal.provider.xmpp;
-import java.util.ArrayList;
-import java.util.Dictionary;
-import java.util.List;
-
import org.eclipse.ecf.core.identity.ID;
import org.eclipse.ecf.core.sharedobject.ISharedObject;
import org.eclipse.ecf.core.sharedobject.ISharedObjectContainer;
import org.eclipse.ecf.provider.remoteservice.generic.RegistrySharedObject;
import org.eclipse.ecf.provider.remoteservice.generic.RemoteServiceContainerAdapterFactory;
-import org.eclipse.ecf.remoteservice.Constants;
import org.eclipse.ecf.remoteservice.IRemoteServiceContainerAdapter;
public class XMPPRemoteServiceAdapterFactory extends
RemoteServiceContainerAdapterFactory {
class XMPPRegistrySharedObject extends RegistrySharedObject {
- /* (non-Javadoc)
- * @see org.eclipse.ecf.provider.remoteservice.generic.RegistrySharedObject#getTargetsFromProperties(java.util.Dictionary)
- */
- protected ID[] getTargetsFromProperties(Dictionary properties) {
- if (properties == null) return null;
- List results = new ArrayList();
- Object o = properties.get(Constants.SERVICE_REGISTRATION_TARGETS);
- if (o != null) {
- if (o instanceof ID) results.add(o);
- if (o instanceof ID[]) {
- ID [] targets = (ID[]) o;
- for(int i=0; i < targets.length; i++) results.add(targets[i]);
- }
- }
- return (ID []) results.toArray(new ID[] {});
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ecf.core.sharedobject.BaseSharedObject#getLocalContainerID()
- */
protected ID getLocalContainerID() {
// For XMPP, the local container ID is its connected ID.
return getContext().getConnectedID();
}
}
-
+
public XMPPRemoteServiceAdapterFactory() {
super();
}
-
- /* (non-Javadoc)
- * @see org.eclipse.ecf.provider.remoteservice.generic.RemoteServiceContainerAdapterFactory#createAdapter(org.eclipse.ecf.core.sharedobject.ISharedObjectContainer, java.lang.Class, org.eclipse.ecf.core.identity.ID)
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.ecf.provider.remoteservice.generic.
+ * RemoteServiceContainerAdapterFactory
+ * #createAdapter(org.eclipse.ecf.core.sharedobject.ISharedObjectContainer,
+ * java.lang.Class, org.eclipse.ecf.core.identity.ID)
*/
protected ISharedObject createAdapter(ISharedObjectContainer container,
Class adapterType, ID adapterID) {
@@ -69,6 +49,5 @@ public class XMPPRemoteServiceAdapterFactory extends
return null;
}
}
-
-
+
}

Back to the top