Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2005-08-18 07:14:36 +0000
committerslewis2005-08-18 07:14:36 +0000
commit89aea927766639afc4cab9410dcc30e06821ac18 (patch)
treec30f2fc19d6a81a148eec22724cb31b8081e71c9 /examples/bundles/org.eclipse.ecf.example.sdo.editor
parentfbb64a3d23b8544c579743492a5aec1ff3f91660 (diff)
downloadorg.eclipse.ecf-89aea927766639afc4cab9410dcc30e06821ac18.tar.gz
org.eclipse.ecf-89aea927766639afc4cab9410dcc30e06821ac18.tar.xz
org.eclipse.ecf-89aea927766639afc4cab9410dcc30e06821ac18.zip
Changed IContainer.joinGroup to IContainer.connect, IContainer.leaveGroup to IContainer.disconnect. Changed names of relevant exception classes, and event classes to match connect/disconnect name change. Updated documentation. Formatted all code in org.eclipse.ecf. Changed namespace schema so that no IDInstantiator exists. Now just Namespace subclass is expected for namespace extension point. Removed IDInstantiator interface from org.eclipse.ecf.core.identity.provider. Removed dependent classes. Merged with changes from Boris. Still need to add Namespace getConnectNamespace() to IContainer interface. That's next up.
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/PublishedGraphTracker.java20
1 files changed, 10 insertions, 10 deletions
diff --git a/examples/bundles/org.eclipse.ecf.example.sdo.editor/src/org/eclipse/ecf/example/sdo/editor/PublishedGraphTracker.java b/examples/bundles/org.eclipse.ecf.example.sdo.editor/src/org/eclipse/ecf/example/sdo/editor/PublishedGraphTracker.java
index be91ce931..9b2748040 100644
--- a/examples/bundles/org.eclipse.ecf.example.sdo.editor/src/org/eclipse/ecf/example/sdo/editor/PublishedGraphTracker.java
+++ b/examples/bundles/org.eclipse.ecf.example.sdo.editor/src/org/eclipse/ecf/example/sdo/editor/PublishedGraphTracker.java
@@ -23,8 +23,8 @@ import org.eclipse.ecf.core.ISharedObjectContext;
import org.eclipse.ecf.core.SharedObjectDescription;
import org.eclipse.ecf.core.SharedObjectInitException;
import org.eclipse.ecf.core.events.ISharedObjectActivatedEvent;
-import org.eclipse.ecf.core.events.ISharedObjectContainerDepartedEvent;
-import org.eclipse.ecf.core.events.ISharedObjectContainerJoinedEvent;
+import org.eclipse.ecf.core.events.ISharedObjectContainerDisconnectedEvent;
+import org.eclipse.ecf.core.events.ISharedObjectContainerConnectedEvent;
import org.eclipse.ecf.core.events.ISharedObjectDeactivatedEvent;
import org.eclipse.ecf.core.events.ISharedObjectMessageEvent;
import org.eclipse.ecf.core.identity.ID;
@@ -257,21 +257,21 @@ public class PublishedGraphTracker implements ISharedObject {
handleLeave(e.getRemoteContainerID());
break;
}
- } else if (event instanceof ISharedObjectContainerJoinedEvent) {
- ISharedObjectContainerJoinedEvent e = (ISharedObjectContainerJoinedEvent) event;
- if (e.getJoinedContainerID().equals(
+ } else if (event instanceof ISharedObjectContainerConnectedEvent) {
+ ISharedObjectContainerConnectedEvent e = (ISharedObjectContainerConnectedEvent) event;
+ if (e.getTargetID().equals(
getContext().getLocalContainerID()))
// this container joined
handleJoined();
else if (getContext().isGroupManager())
// some other container joined and we're the server
- handleJoined(e.getJoinedContainerID());
- } else if (event instanceof ISharedObjectContainerDepartedEvent) {
- ISharedObjectContainerDepartedEvent e = (ISharedObjectContainerDepartedEvent) event;
+ handleJoined(e.getTargetID());
+ } else if (event instanceof ISharedObjectContainerDisconnectedEvent) {
+ ISharedObjectContainerDisconnectedEvent e = (ISharedObjectContainerDisconnectedEvent) event;
// some other container departed -- same as peer deactivation
- if (!e.getDepartedContainerID().equals(
+ if (!e.getTargetID().equals(
getContext().getLocalContainerID()))
- handleLeave(e.getDepartedContainerID());
+ handleLeave(e.getTargetID());
} else if (event instanceof ISharedObjectActivatedEvent) {
ISharedObjectActivatedEvent e = (ISharedObjectActivatedEvent) event;
if (e.getActivatedID().equals(config.getSharedObjectID()))

Back to the top