Cosmetic fixes.

8 files changed, 94 insertions, 82 deletions

diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerDescription.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerDescription.java
index 25a9feebc..fae04e44e 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerDescription.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerDescription.java
@@ -62,9 +62,15 @@ public class SharedObjectContainerDescription {
     }
 
     public String toString() {
-        StringBuffer b = new StringBuffer("SharedObjectContainerDescription[");
-        b.append(name).append(";");
-        b.append(instantiatorClass).append("]");
+        StringBuffer b = new StringBuffer("SharedObjectContainerDescription {");
+        b.append("name: ").append(name).append(", ");
+        if (instantiator == null)
+        	b.append("instantiatorClass: ").append(instantiatorClass).append(", ");
+        else
+            b.append("instantiator: ").append(instantiator).append(", ");
+
+        b.append("classLoader: ").append(classLoader).append(", ");
+        b.append("description: ").append(description).append("}");
         return b.toString();
     }
 
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectDescription.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectDescription.java
index bdb95de2a..a7d2d3cf9 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectDescription.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectDescription.java
@@ -26,7 +26,7 @@ public class SharedObjectDescription implements Serializable {
 
     protected transient ClassLoader classLoader;
     protected ID id;
-    protected ID homeid;
+    protected ID homeID;
     protected String className;
     protected Map properties;
     protected long identifier;
@@ -38,7 +38,7 @@ public class SharedObjectDescription implements Serializable {
             String className, Map dict, long ident) {
         this.classLoader = loader;
         this.id = objectID;
-        this.homeid = homeID;
+        this.homeID = homeID;
         this.className = className;
         if (dict != null) this.properties = dict;
         else this.properties = new Hashtable();
@@ -85,10 +85,10 @@ public class SharedObjectDescription implements Serializable {
         this.id = theID;
     }
     public ID getHomeID() {
-        return homeid;
+        return homeID;
     }
     public void setHomeID(ID theID) {
-        this.homeid = theID;
+        this.homeID = theID;
     }
     public String getClassname() {
         return className;
@@ -113,13 +113,13 @@ public class SharedObjectDescription implements Serializable {
     }
     
     public String toString() {
-        StringBuffer sb = new StringBuffer("SharedObjectDescription[");
-        sb.append("cl:").append(classLoader);
-        sb.append("oid:").append((id==null)?"null":(id.getName()));
-        sb.append("hid:").append((homeid==null)?"null":(homeid.getName()));
-        sb.append("cn:").append(className);
-        sb.append("props:").append(properties);
-        sb.append("id:").append(identifier).append("]");
+        StringBuffer sb = new StringBuffer("SharedObjectDescription {");
+        sb.append("classLoader: ").append(classLoader).append(", ");
+        sb.append("id: ").append(id).append(", ");
+        sb.append("homeID: ").append(homeID).append(", ");
+        sb.append("className: ").append(className).append(", ");
+        sb.append("properties: ").append(properties).append(", ");
+        sb.append("identifier: ").append(identifier).append("}");
         return sb.toString();
     }
 }
\ No newline at end of file
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/LocalSharedObjectEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/LocalSharedObjectEvent.java
index d241360ee..404cde04b 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/LocalSharedObjectEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/LocalSharedObjectEvent.java
@@ -13,29 +13,26 @@ import org.eclipse.ecf.core.util.Event;
 
 public class LocalSharedObjectEvent implements SharedObjectEvent {
 
-    ID sender;
-    Event event;
+    private final ID senderSharedObjectID;
+    private final Event event;
 
     public LocalSharedObjectEvent(ID s, Event evt) {
         super();
-        this.sender = s;
+        this.senderSharedObjectID = s;
         this.event = evt;
     }
 
     public ID getSenderSharedObjectID() {
-        return sender;
+        return senderSharedObjectID;
     }
     public Event getEvent() {
         return event;
     }
 
     public String toString() {
-        StringBuffer sb = new StringBuffer("LocalSharedObjectEvent[sender:");
-        if (sender != null)
-            sb.append(sender.getName()).append(",");
-        else
-            sb.append("null,");
-        sb.append("event:").append(event).append("]");
+        StringBuffer sb = new StringBuffer("LocalSharedObjectEvent {");
+        sb.append("senderSharedObjectID: ").append(senderSharedObjectID).append(", ");
+        sb.append("event: ").append(event).append("}");
         return sb.toString();
     }
 }
\ 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 e2d81119b..c8ec089ce 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
@@ -16,21 +16,21 @@ import org.eclipse.ecf.core.util.Event;
 
 public class RemoteSharedObjectEvent implements SharedObjectEvent, Serializable {
 
-    ID senderSharedObjectID;
-    ID containerID;
-    ID remoteContainerID;
-    Object data;
+    private final ID senderSharedObjectID;
+    private final ID localContainerID;
+    private final ID remoteContainerID;
+    private final Object data;
 
     public RemoteSharedObjectEvent(ID senderObj, ID localCont, ID remoteCont, Object data) {
         super();
         this.senderSharedObjectID = senderObj;
-        this.containerID = localCont;
+        this.localContainerID = localCont;
         this.remoteContainerID = remoteCont;
         this.data = data;
     }
 
     public ID getLocalContainerID() {
-        return containerID;
+        return localContainerID;
     }
     /*
      * (non-Javadoc)
@@ -51,11 +51,11 @@ public class RemoteSharedObjectEvent implements SharedObjectEvent, Serializable
     }
 
     public String toString() {
-        StringBuffer sb = new StringBuffer("RemoteSharedObjectEvent[sender:");
-        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("]");
+        StringBuffer sb = new StringBuffer("RemoteSharedObjectEvent {");
+        sb.append("senderSharedObjectID: ").append(senderSharedObjectID).append(", ");
+        sb.append("localContainerID: ").append(localContainerID).append(", ");
+        sb.append("remoteContainerID: ").append(remoteContainerID).append(", ");
+        sb.append("data: ").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 d16048279..46249511a 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
@@ -9,46 +9,39 @@
 
 package org.eclipse.ecf.core.events;
 
+import java.util.Arrays;
+
 import org.eclipse.ecf.core.identity.ID;
 
 public class SharedObjectActivatedEvent implements ContainerEvent {
 
-    ID activated;
-    ID[] members;
-    ID containerID;
+    private final ID activatedID;
+    private final ID[] groupMemberIDs;
+    private final ID localContainerID;
 
     public SharedObjectActivatedEvent(ID container, ID act, ID[] others) {
         super();
-        this.containerID = container;
-        this.activated = act;
-        this.members = others;
+        this.localContainerID = container;
+        this.activatedID = act;
+        this.groupMemberIDs = others;
     }
 
     public ID getActivatedID() {
-        return activated;
+        return activatedID;
     }
 
     public ID getLocalContainerID() {
-        return containerID;
+        return localContainerID;
     }
     public ID[] getGroupMemberIDs() {
-        return members;
+        return groupMemberIDs;
     }
 
     public String toString() {
-        StringBuffer sb = new StringBuffer(
-                "SharedObjectActivatedEvent[activated:");
-        if (activated != null)
-            sb.append(activated.getName()).append(",");
-        else
-            sb.append("null,");
-        sb.append("[");
-        for (int i = 0; i < members.length; i++) {
-            sb.append(members[i].getName());
-            if (i < members.length - 1)
-                sb.append(",");
-        }
-        sb.append("]]");
+        StringBuffer sb = new StringBuffer("SharedObjectActivatedEvent {");
+        sb.append("activatedID: ").append(activatedID).append(", ");
+        sb.append("groupMemberIDs: ").append(Arrays.asList(groupMemberIDs)).append(", ");
+        sb.append("localContainerID: ").append(localContainerID).append("}");
         return sb.toString();
     }
 }
\ No newline at end of file
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 5c9cf68b5..34bdc4132 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
@@ -13,19 +13,29 @@ import org.eclipse.ecf.core.identity.ID;
 
 public class SharedObjectContainerDepartedEvent implements ContainerEvent {
 
-    ID other;
-    ID containerID;
+    private final ID departedContainerID;
+    private final ID localContainerID;
 
     public SharedObjectContainerDepartedEvent(ID container, ID o) {
         super();
-        this.containerID = container;
-        this.other = o;
+        this.localContainerID = container;
+        this.departedContainerID = o;
     }
 
     public ID getDepartedContainerID() {
-        return other;
+        return departedContainerID;
     }
     public ID getLocalContainerID() {
-        return containerID;
+        return localContainerID;
     }
+    
+    /* (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
+	public String toString() {
+		StringBuffer buf = new StringBuffer("SharedObjectContainerDepartedEvent {");
+		buf.append("departedContainerID: ").append(departedContainerID).append(", ");
+		buf.append("localContainerID: ").append(localContainerID).append("}");
+		return buf.toString();
+	}
 }
\ No newline at end of file
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerJoinedEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerJoinedEvent.java
index f4aaa7db5..0e374ea25 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerJoinedEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerJoinedEvent.java
@@ -13,20 +13,30 @@ import org.eclipse.ecf.core.identity.ID;
 
 public class SharedObjectContainerJoinedEvent implements ContainerEvent {
 
-    ID other;
-    ID containerID;
+    private final ID joinedContainerID;
+    private final ID localContainerID;
 
     public SharedObjectContainerJoinedEvent(ID container, ID o) {
         super();
-        this.containerID = container;
-        this.other = o;
+        this.localContainerID = container;
+        this.joinedContainerID = o;
     }
 
     public ID getJoinedContainerID() {
-        return other;
+        return joinedContainerID;
     }
 
     public ID getLocalContainerID() {
-        return containerID;
+        return localContainerID;
     }
+    
+    /* (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
+	public String toString() {
+		StringBuffer buf = new StringBuffer("SharedObjectContainerJoinedEvent {");
+		buf.append("joinedContainerID: ").append(joinedContainerID).append(", ");
+		buf.append("localContainerID: ").append(localContainerID).append("}");
+		return buf.toString();
+	}
 }
\ 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 3c6ecdc50..742d8621e 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
@@ -13,28 +13,24 @@ import org.eclipse.ecf.core.identity.ID;
 
 public class SharedObjectDeactivatedEvent implements ContainerEvent {
 
-    ID deactivated;
-    ID containerID;
+    private final ID deactivatedID;
+    private final ID localContainerID;
 
     public SharedObjectDeactivatedEvent(ID container, ID deact) {
         super();
-        this.containerID = container;
-        this.deactivated = deact;
+        this.localContainerID = container;
+        this.deactivatedID = deact;
     }
     public ID getDeactivatedID() {
-        return deactivated;
+        return deactivatedID;
     }
     public ID getLocalContainerID() {
-        return containerID;
+        return localContainerID;
     }
     public String toString() {
-        StringBuffer sb = new StringBuffer(
-                "SharedObjectDeactivatedEvent[deactivated:");
-        if (deactivated != null)
-            sb.append(deactivated.getName());
-        else
-            sb.append("null");
-        sb.append("]");
+        StringBuffer sb = new StringBuffer("SharedObjectDeactivatedEvent {");
+        sb.append("deactivatedID: ").append(deactivatedID).append(", ");
+        sb.append("localContainerID: ").append(localContainerID).append("}");
         return sb.toString();
     }
 }
\ No newline at end of file