Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2005-08-21 23:05:00 +0000
committerslewis2005-08-21 23:05:00 +0000
commit00c8ebb6c108ae0404bc83c26a926bb7a51f12a7 (patch)
treebdebd856ea3d501dd0a002240e12826457464ae0 /examples/bundles/org.eclipse.ecf.example.sdo.editor
parent03b8cc52417e1ec173a5cf0a0f7e8cc0991c0504 (diff)
downloadorg.eclipse.ecf-00c8ebb6c108ae0404bc83c26a926bb7a51f12a7.tar.gz
org.eclipse.ecf-00c8ebb6c108ae0404bc83c26a926bb7a51f12a7.tar.xz
org.eclipse.ecf-00c8ebb6c108ae0404bc83c26a926bb7a51f12a7.zip
Added getConnectNamespace() to ISharedObjectContext so that shared objects would have access to the Namespace needed to connect to a target. Added abstract Namespace.getScheme() method to require Namespace subclasses to provide a URI 'scheme' that is to be associated with the Namespace. An example would be, for Namespace 'xmpp.jive', the scheme 'xmpp'. ID instances created within the given Namespace will use this Namespace scheme for constructing URIs in response to ID.toURI(). So, for example, for an ID whose getName() method returns 'slewis@ecf1.osuosl.org' the value returned from ID.toURI() would be: 'xmpp://slewis@ecf1.osuosl.org'.
Updated all dependent example and test code. Added documentation to IIDFactory, Namespace classes. Refactored org.eclipse.ecf.example.collab plugin to be much cleaner and simpler example code.
Diffstat (limited to 'examples/bundles/org.eclipse.ecf.example.sdo.editor')
-rw-r--r--examples/bundles/org.eclipse.ecf.example.sdo.editor/src/org/eclipse/ecf/example/sdo/editor/EditorPlugin.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/examples/bundles/org.eclipse.ecf.example.sdo.editor/src/org/eclipse/ecf/example/sdo/editor/EditorPlugin.java b/examples/bundles/org.eclipse.ecf.example.sdo.editor/src/org/eclipse/ecf/example/sdo/editor/EditorPlugin.java
index a7889467a..ffd370938 100644
--- a/examples/bundles/org.eclipse.ecf.example.sdo.editor/src/org/eclipse/ecf/example/sdo/editor/EditorPlugin.java
+++ b/examples/bundles/org.eclipse.ecf.example.sdo.editor/src/org/eclipse/ecf/example/sdo/editor/EditorPlugin.java
@@ -12,7 +12,6 @@ package org.eclipse.ecf.example.sdo.editor;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
-
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
@@ -22,7 +21,7 @@ import org.eclipse.ecf.core.ISharedObjectContainer;
import org.eclipse.ecf.core.identity.ID;
import org.eclipse.ecf.core.identity.IDFactory;
import org.eclipse.ecf.core.util.ECFException;
-import org.eclipse.ecf.example.collab.Client;
+import org.eclipse.ecf.example.collab.CollabClient;
import org.eclipse.ecf.sdo.DataGraphSharingFactory;
import org.eclipse.ecf.sdo.ISharedDataGraph;
import org.eclipse.ecf.sdo.IUpdateConsumer;
@@ -31,7 +30,6 @@ import org.eclipse.ecf.sdo.WaitableSubscriptionCallback;
import org.eclipse.ecf.sdo.emf.EMFUpdateProvider;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
-
import commonj.sdo.DataGraph;
/**
@@ -176,7 +174,7 @@ public class EditorPlugin extends AbstractUIPlugin {
private ISharedObjectContainer getContainer(IProject project)
throws ECFException {
- return Client.getContainer(project);
+ return CollabClient.getContainer(project);
}
private PublishedGraphTracker getTracker(ISharedObjectContainer container)

Back to the top