Fixed a number of method name inconsistencies, class name inconsistencies

17 files changed, 43 insertions, 126 deletions

diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IIDentifiable.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IIdentifiable.java
index 996fe5eea..17d0c7d77 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IIDentifiable.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IIdentifiable.java
@@ -7,7 +7,7 @@ import org.eclipse.ecf.core.identity.ID;
  * an ECF identity.  
  *
  */
-public interface IIDentifiable {
+public interface IIdentifiable {
 
     /**
      * Get the ID for this 'identifiable' object
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainer.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainer.java
index c9f1cd79b..bbab54383 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainer.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainer.java
@@ -89,7 +89,7 @@ public interface ISharedObjectContainer {
      * 
      * @return ID[] the IDs of the current group membership
      */
-    public ID[] getGroupMembership();
+    public ID[] getGroupMemberIDs();
     /**
      * @return true if this ISharedObjectContainer instance is in the
      *         'manager' role for the group, false otherwise
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainerConfig.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainerConfig.java
index c4c17d727..a929ab8e8 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainerConfig.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainerConfig.java
@@ -16,7 +16,7 @@ import java.util.Map;
  *
  * @see ISharedObjectContainer#getConfig()
  */
-public interface ISharedObjectContainerConfig extends IIDentifiable {
+public interface ISharedObjectContainerConfig extends IIdentifiable {
 
     /**
      * The properties associated with the owner ISharedObjectContainer
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContext.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContext.java
index b92e7b90a..18c0d2952 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContext.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContext.java
@@ -33,7 +33,7 @@ public interface ISharedObjectContext {
      * 
      * @return the ID of the enclosing container
      */
-    public ID getContainerID();
+    public ID getLocalContainerID();
     /**
      * Get the ISharedObjectManager for this context
      * @return ISharedObjectManager the shared object manager instance for this
@@ -88,9 +88,9 @@ public interface ISharedObjectContext {
     /**
      * (non-Javadoc)
      * 
-     * @see org.eclipse.ecf.core.ISharedObjectContainer#getGroupMembership()
+     * @see org.eclipse.ecf.core.ISharedObjectContainer#getGroupMemberIDs()
      */
-    public ID[] getGroupMembership();
+    public ID[] getGroupMemberIDs();
 
     /**
      * Send message to create a remote instance of an ISharedObject with the
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerEvent.java
index 4ce57b457..189c80664 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerEvent.java
@@ -14,5 +14,5 @@ import org.eclipse.ecf.core.util.Event;
 
 public interface ContainerEvent extends Event {
 
-    public ID getContainerID();
+    public ID getLocalContainerID();
 }
\ No newline at end of file
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/RemoteSharedObjectEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/RemoteSharedObjectEvent.java
index 9ab2b7a3a..e2d81119b 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/RemoteSharedObjectEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/RemoteSharedObjectEvent.java
@@ -18,15 +18,18 @@ public class RemoteSharedObjectEvent implements SharedObjectEvent, Serializable
 
     ID senderSharedObjectID;
     ID containerID;
-    Serializable data;
+    ID remoteContainerID;
+    Object data;
 
-    public RemoteSharedObjectEvent(ID sender, ID cont, Serializable data) {
+    public RemoteSharedObjectEvent(ID senderObj, ID localCont, ID remoteCont, Object data) {
         super();
-        this.senderSharedObjectID = sender;
-        this.containerID = cont;
+        this.senderSharedObjectID = senderObj;
+        this.containerID = localCont;
+        this.remoteContainerID = remoteCont;
+        this.data = data;
     }
 
-    public ID getContainer() {
+    public ID getLocalContainerID() {
         return containerID;
     }
     /*
@@ -37,24 +40,22 @@ public class RemoteSharedObjectEvent implements SharedObjectEvent, Serializable
     public ID getSenderSharedObjectID() {
         return senderSharedObjectID;
     }
+    public ID getRemoteContainerID() {
+        return remoteContainerID;
+    }
     public Event getEvent() {
         return this;
     }
-    public Serializable getData() {
+    public Object getData() {
         return data;
     }
 
     public String toString() {
         StringBuffer sb = new StringBuffer("RemoteSharedObjectEvent[sender:");
-        if (senderSharedObjectID != null)
-            sb.append(senderSharedObjectID.getName()).append(",");
-        else
-            sb.append("null,");
-        sb.append("container:");
-        if (containerID != null)
-            sb.append(containerID.getName()).append(",");
-        sb.append("data:");
-        sb.append(data).append("]");
+        sb.append("soid:").append((senderSharedObjectID==null)?"null":senderSharedObjectID.getName()).append(";");
+        sb.append("lcont:").append((containerID==null)?"null":containerID.getName()).append(";");
+        sb.append("rcont:").append((remoteContainerID==null)?"null":remoteContainerID.getName()).append(";");
+        sb.append("data:").append("]");
         return sb.toString();
     }
 }
\ No newline at end of file
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectActivatedEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectActivatedEvent.java
index 535e83127..d16048279 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectActivatedEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectActivatedEvent.java
@@ -24,14 +24,14 @@ public class SharedObjectActivatedEvent implements ContainerEvent {
         this.members = others;
     }
 
-    public ID getActivated() {
+    public ID getActivatedID() {
         return activated;
     }
 
-    public ID getContainerID() {
+    public ID getLocalContainerID() {
         return containerID;
     }
-    public ID[] getMembers() {
+    public ID[] getGroupMemberIDs() {
         return members;
     }
 
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerDepartedEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerDepartedEvent.java
index 2d5a2fa8e..5c9cf68b5 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerDepartedEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerDepartedEvent.java
@@ -22,10 +22,10 @@ public class SharedObjectContainerDepartedEvent implements ContainerEvent {
         this.other = o;
     }
 
-    public ID getDepartedContainer() {
+    public ID getDepartedContainerID() {
         return other;
     }
-    public ID getContainerID() {
+    public ID getLocalContainerID() {
         return containerID;
     }
 }
\ No newline at end of file
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerEjectedEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerEjectedEvent.java
deleted file mode 100644
index aa9ba0a75..000000000
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerEjectedEvent.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Composent, Inc. and others. All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: Composent, Inc. - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.ecf.core.events;
-
-import java.io.Serializable;
-
-import org.eclipse.ecf.core.identity.ID;
-
-public class SharedObjectContainerEjectedEvent implements ContainerEvent {
-
-    ID containerID = null;
-    ID groupManagerID = null;
-
-    Serializable data = null;
-
-    public SharedObjectContainerEjectedEvent(ID containerID, ID groupManagerID,
-            Serializable data) {
-        this.containerID = containerID;
-        this.groupManagerID = groupManagerID;
-        this.data = data;
-    }
-    public ID getContainerID() {
-        return containerID;
-    }
-
-    public ID getGroupManager() {
-        return groupManagerID;
-    }
-    public Serializable getData() {
-        return data;
-    }
-
-}
\ No newline at end of file
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerJoinEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerJoinedEvent.java
index 68b72b1f8..f4aaa7db5 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerJoinEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerJoinedEvent.java
@@ -11,22 +11,22 @@ package org.eclipse.ecf.core.events;
 
 import org.eclipse.ecf.core.identity.ID;
 
-public class SharedObjectContainerJoinEvent implements ContainerEvent {
+public class SharedObjectContainerJoinedEvent implements ContainerEvent {
 
     ID other;
     ID containerID;
 
-    public SharedObjectContainerJoinEvent(ID container, ID o) {
+    public SharedObjectContainerJoinedEvent(ID container, ID o) {
         super();
         this.containerID = container;
         this.other = o;
     }
 
-    public ID getOtherContainerID() {
+    public ID getJoinedContainerID() {
         return other;
     }
 
-    public ID getContainerID() {
+    public ID getLocalContainerID() {
         return containerID;
     }
 }
\ No newline at end of file
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerLeaveEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerLeaveEvent.java
deleted file mode 100644
index 2d3c6faa8..000000000
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerLeaveEvent.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Composent, Inc. and others. All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: Composent, Inc. - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.ecf.core.events;
-
-import java.io.Serializable;
-
-import org.eclipse.ecf.core.identity.ID;
-
-public class SharedObjectContainerLeaveEvent implements ContainerEvent {
-
-    ID containerID = null;
-    ID groupManagerID = null;
-
-    Serializable data = null;
-
-    public SharedObjectContainerLeaveEvent(ID containerID, ID groupManagerID) {
-        this.containerID = containerID;
-        this.groupManagerID = groupManagerID;
-    }
-    public ID getContainerID() {
-        return containerID;
-    }
-
-    public ID getGroupManager() {
-        return groupManagerID;
-    }
-    public void setData(Serializable data) {
-        this.data = data;
-    }
-
-}
\ No newline at end of file
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectDeactivatedEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectDeactivatedEvent.java
index 09839ea8c..3c6ecdc50 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectDeactivatedEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectDeactivatedEvent.java
@@ -21,10 +21,10 @@ public class SharedObjectDeactivatedEvent implements ContainerEvent {
         this.containerID = container;
         this.deactivated = deact;
     }
-    public ID getDeactivated() {
+    public ID getDeactivatedID() {
         return deactivated;
     }
-    public ID getContainerID() {
+    public ID getLocalContainerID() {
         return containerID;
     }
     public String toString() {
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/impl/standalone/SharedObjectContainer.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/impl/standalone/SharedObjectContainer.java
index 209c37a1c..b5da978a1 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/impl/standalone/SharedObjectContainer.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/impl/standalone/SharedObjectContainer.java
@@ -1302,7 +1302,7 @@ public abstract class SharedObjectContainer implements ISharedObjectContainer {
      * 
      * @see org.eclipse.ecf.core.ISharedObjectContainer#getGroupMembership()
      */
-    public ID[] getGroupMembership() {
+    public ID[] getGroupMemberIDs() {
         return getOtherItemsIDs();
     }
 
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/impl/standalone/SharedObjectWrapper.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/impl/standalone/SharedObjectWrapper.java
index 9a695e1bd..b8cdbb8e6 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/impl/standalone/SharedObjectWrapper.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/impl/standalone/SharedObjectWrapper.java
@@ -9,7 +9,7 @@ import org.eclipse.ecf.core.ISharedObjectConfig;
 import org.eclipse.ecf.core.SharedObjectInitException;
 import org.eclipse.ecf.core.events.SharedObjectActivatedEvent;
 import org.eclipse.ecf.core.events.SharedObjectContainerDepartedEvent;
-import org.eclipse.ecf.core.events.SharedObjectContainerJoinEvent;
+import org.eclipse.ecf.core.events.SharedObjectContainerJoinedEvent;
 import org.eclipse.ecf.core.events.SharedObjectDeactivatedEvent;
 import org.eclipse.ecf.core.identity.ID;
 import org.eclipse.ecf.core.util.AsynchResult;
@@ -95,12 +95,6 @@ final class SharedObjectWrapper {
 	}
 	private void destroyed() {
 		if (!queue.isStopped()) {
-		    /*
-			RepSpaceReference mySpaceRef = sharedObjectConfig.getSpaceReference();
-			if (mySpaceRef != null) {
-				mySpaceRef.clear();
-			}
-			*/
 			// Enqueue destroy message on our RepObject's queue
 			if (thread != null)
 				queue.enqueue(new DisposeEvent());
@@ -119,7 +113,7 @@ final class SharedObjectWrapper {
 	void memberChanged(Item m, boolean add) {
 		if (thread != null) {
 			if (add) {
-				send(new SharedObjectContainerJoinEvent(containerID,m.getID()));
+				send(new SharedObjectContainerJoinedEvent(containerID,m.getID()));
 			} else {
 				send(new SharedObjectContainerDepartedEvent(containerID,m.getID()));
 			}
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/impl/standalone/StandaloneContainer.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/impl/standalone/StandaloneContainer.java
index 611f60297..9dbb20065 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/impl/standalone/StandaloneContainer.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/impl/standalone/StandaloneContainer.java
@@ -162,7 +162,7 @@ public class StandaloneContainer implements ISharedObjectContainer,
      * 
      * @see org.eclipse.ecf.core.ISharedObjectContainer#getGroupMembership()
      */
-    public ID[] getGroupMembership() {
+    public ID[] getGroupMemberIDs() {
         return new ID[] { getID() };
     }
 
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/impl/standalone/StandaloneContext.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/impl/standalone/StandaloneContext.java
index 74b67d597..6b956710e 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/impl/standalone/StandaloneContext.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/impl/standalone/StandaloneContext.java
@@ -44,7 +44,7 @@ public class StandaloneContext implements ISharedObjectContext {
     /* (non-Javadoc)
      * @see org.eclipse.ecf.core.ISharedObjectContext#getContainerID()
      */
-    public synchronized ID getContainerID() {
+    public synchronized ID getLocalContainerID() {
         if (isInactive()) {
             return null;
         } return container.getConfig().getID();
@@ -117,10 +117,10 @@ public class StandaloneContext implements ISharedObjectContext {
     /* (non-Javadoc)
      * @see org.eclipse.ecf.core.ISharedObjectContext#getGroupMembership()
      */
-    public synchronized ID[] getGroupMembership() {
+    public synchronized ID[] getGroupMemberIDs() {
         if (isInactive()) {
             return null;
-        } else return container.getGroupMembership();
+        } else return container.getGroupMemberIDs();
     }
 
     /* (non-Javadoc)
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/impl/standalone/StandaloneSharedObjectWrapper.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/impl/standalone/StandaloneSharedObjectWrapper.java
index 8a6c471ef..50c986617 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/impl/standalone/StandaloneSharedObjectWrapper.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/impl/standalone/StandaloneSharedObjectWrapper.java
@@ -7,7 +7,7 @@ import org.eclipse.ecf.core.ISharedObject;
 import org.eclipse.ecf.core.SharedObjectInitException;
 import org.eclipse.ecf.core.events.SharedObjectActivatedEvent;
 import org.eclipse.ecf.core.events.SharedObjectContainerDepartedEvent;
-import org.eclipse.ecf.core.events.SharedObjectContainerJoinEvent;
+import org.eclipse.ecf.core.events.SharedObjectContainerJoinedEvent;
 import org.eclipse.ecf.core.events.SharedObjectDeactivatedEvent;
 import org.eclipse.ecf.core.identity.ID;
 import org.eclipse.ecf.core.util.Event;
@@ -95,7 +95,7 @@ final class StandaloneSharedObjectWrapper {
 	void memberChanged(Item m, boolean add) {
 		if (thread != null) {
 			if (add) {
-				send(new SharedObjectContainerJoinEvent(containerID,m.getID()));
+				send(new SharedObjectContainerJoinedEvent(containerID,m.getID()));
 			} else {
 				send(new SharedObjectContainerDepartedEvent(containerID,m.getID()));
 			}