Refactored ecf event classes. Added (sub) interfaces to specify accessors for certain event types.

17 files changed, 103 insertions, 65 deletions

diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectConnector.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectConnector.java
index 06052da93..edcb4684c 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectConnector.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectConnector.java
@@ -9,7 +9,7 @@
 
 package org.eclipse.ecf.core;
 
-import org.eclipse.ecf.core.events.SharedObjectEvent;
+import org.eclipse.ecf.core.events.ISharedObjectEvent;
 import org.eclipse.ecf.core.identity.ID;
 import org.eclipse.ecf.core.util.AsynchResult;
 import org.eclipse.ecf.core.util.QueueException;
@@ -24,8 +24,8 @@ public interface ISharedObjectConnector {
 
     public ID getSender();
     public ID[] getReceivers();
-    public void enqueue(SharedObjectEvent event) throws QueueException;
-    public void enqueue(SharedObjectEvent[] events) throws QueueException;
-    public AsynchResult[] callAsynch(SharedObjectEvent arg) throws Exception;
+    public void enqueue(ISharedObjectEvent event) throws QueueException;
+    public void enqueue(ISharedObjectEvent[] events) throws QueueException;
+    public AsynchResult[] callAsynch(ISharedObjectEvent arg) throws Exception;
     public void dispose();
 }
\ No newline at end of file
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainerListener.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainerListener.java
index 68a1182a2..ee6f6816d 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainerListener.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainerListener.java
@@ -9,7 +9,7 @@
 
 package org.eclipse.ecf.core;
 
-import org.eclipse.ecf.core.events.ContainerEvent;
+import org.eclipse.ecf.core.events.IContainerEvent;
 
 /**
  * Listener for objects that wish to receive events from an ISharedObjectContainer
@@ -18,5 +18,5 @@ import org.eclipse.ecf.core.events.ContainerEvent;
  * @see ISharedObjectContainer#addListener(ISharedObjectContainerListener, String)
  */
 public interface ISharedObjectContainerListener {
-    public void handleEvent(ContainerEvent evt);
+    public void handleEvent(IContainerEvent evt);
 }
\ No newline at end of file
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/IContainerEvent.java
index 189c80664..8bfa0efa8 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/IContainerEvent.java
@@ -12,7 +12,7 @@ package org.eclipse.ecf.core.events;
 import org.eclipse.ecf.core.identity.ID;
 import org.eclipse.ecf.core.util.Event;
 
-public interface ContainerEvent extends Event {
+public interface IContainerEvent extends Event {
 
     public ID getLocalContainerID();
 }
\ No newline at end of file
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ISharedObjectActivatedEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ISharedObjectActivatedEvent.java
new file mode 100644
index 000000000..fbd49a619
--- /dev/null
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ISharedObjectActivatedEvent.java
@@ -0,0 +1,17 @@
+/*******************************************************************************
+ * 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 org.eclipse.ecf.core.identity.ID;
+
+public interface ISharedObjectActivatedEvent extends IContainerEvent {
+    public ID getActivatedID();
+    public ID[] getGroupMemberIDs();
+}
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ISharedObjectContainerDepartedEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ISharedObjectContainerDepartedEvent.java
new file mode 100644
index 000000000..086fa3b85
--- /dev/null
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ISharedObjectContainerDepartedEvent.java
@@ -0,0 +1,16 @@
+/*******************************************************************************
+ * 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 org.eclipse.ecf.core.identity.ID;
+
+public interface ISharedObjectContainerDepartedEvent extends IContainerEvent {
+    public ID getDepartedContainerID();
+}
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ISharedObjectContainerJoinedEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ISharedObjectContainerJoinedEvent.java
new file mode 100644
index 000000000..67b4fa364
--- /dev/null
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ISharedObjectContainerJoinedEvent.java
@@ -0,0 +1,16 @@
+/*******************************************************************************
+ * 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 org.eclipse.ecf.core.identity.ID;
+
+public interface ISharedObjectContainerJoinedEvent extends IContainerEvent {
+    public ID getJoinedContainerID();
+}
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ISharedObjectDeactivatedEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ISharedObjectDeactivatedEvent.java
new file mode 100644
index 000000000..29be7a93c
--- /dev/null
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ISharedObjectDeactivatedEvent.java
@@ -0,0 +1,16 @@
+/*******************************************************************************
+ * 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 org.eclipse.ecf.core.identity.ID;
+
+public interface ISharedObjectDeactivatedEvent extends IContainerEvent {
+    public ID getDeactivatedID();
+}
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ISharedObjectEvent.java
index 8c0fee4b8..177655e89 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ISharedObjectEvent.java
@@ -12,10 +12,9 @@ package org.eclipse.ecf.core.events;
 import org.eclipse.ecf.core.identity.ID;
 import org.eclipse.ecf.core.util.Event;
 
-public interface SharedObjectEvent extends Event {
+public interface ISharedObjectEvent extends Event {
 
     public ID getSenderSharedObjectID();
-
     public Event getEvent();
 
 }
\ No newline at end of file
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ISharedObjectMessageEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ISharedObjectMessageEvent.java
new file mode 100644
index 000000000..8ac0b71b6
--- /dev/null
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ISharedObjectMessageEvent.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * 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 org.eclipse.ecf.core.identity.ID;
+
+public interface ISharedObjectMessageEvent extends ISharedObjectEvent {
+
+    public ID getRemoteContainerID();
+    public Object getData();
+}
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
deleted file mode 100644
index 404cde04b..000000000
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/LocalSharedObjectEvent.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 org.eclipse.ecf.core.identity.ID;
-import org.eclipse.ecf.core.util.Event;
-
-public class LocalSharedObjectEvent implements SharedObjectEvent {
-
-    private final ID senderSharedObjectID;
-    private final Event event;
-
-    public LocalSharedObjectEvent(ID s, Event evt) {
-        super();
-        this.senderSharedObjectID = s;
-        this.event = evt;
-    }
-
-    public ID getSenderSharedObjectID() {
-        return senderSharedObjectID;
-    }
-    public Event getEvent() {
-        return event;
-    }
-
-    public String toString() {
-        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 c8ec089ce..d989b3edc 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
@@ -14,28 +14,23 @@ import java.io.Serializable;
 import org.eclipse.ecf.core.identity.ID;
 import org.eclipse.ecf.core.util.Event;
 
-public class RemoteSharedObjectEvent implements SharedObjectEvent, Serializable {
+public class RemoteSharedObjectEvent implements ISharedObjectMessageEvent, Serializable {
 
     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) {
+    public RemoteSharedObjectEvent(ID senderObj, ID remoteCont, Object data) {
         super();
         this.senderSharedObjectID = senderObj;
-        this.localContainerID = localCont;
         this.remoteContainerID = remoteCont;
         this.data = data;
     }
 
-    public ID getLocalContainerID() {
-        return localContainerID;
-    }
     /*
      * (non-Javadoc)
      * 
-     * @see org.eclipse.ecf.api.events.SharedObjectEvent#getSenderSharedObject()
+     * @see org.eclipse.ecf.api.events.ISharedObjectEvent#getSenderSharedObject()
      */
     public ID getSenderSharedObjectID() {
         return senderSharedObjectID;
@@ -53,7 +48,6 @@ public class RemoteSharedObjectEvent implements SharedObjectEvent, Serializable
     public String toString() {
         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();
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 46249511a..44d074f81 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
@@ -13,7 +13,7 @@ import java.util.Arrays;
 
 import org.eclipse.ecf.core.identity.ID;
 
-public class SharedObjectActivatedEvent implements ContainerEvent {
+public class SharedObjectActivatedEvent implements ISharedObjectActivatedEvent {
 
     private final ID activatedID;
     private final ID[] groupMemberIDs;
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 34bdc4132..c5820d42e 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
@@ -11,7 +11,7 @@ package org.eclipse.ecf.core.events;
 
 import org.eclipse.ecf.core.identity.ID;
 
-public class SharedObjectContainerDepartedEvent implements ContainerEvent {
+public class SharedObjectContainerDepartedEvent implements ISharedObjectContainerDepartedEvent {
 
     private final ID departedContainerID;
     private final ID localContainerID;
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 0e374ea25..b0dce3de1 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
@@ -11,7 +11,7 @@ package org.eclipse.ecf.core.events;
 
 import org.eclipse.ecf.core.identity.ID;
 
-public class SharedObjectContainerJoinedEvent implements ContainerEvent {
+public class SharedObjectContainerJoinedEvent implements ISharedObjectContainerJoinedEvent {
 
     private final ID joinedContainerID;
     private final ID localContainerID;
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 742d8621e..4c1c3b376 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
@@ -11,7 +11,7 @@ package org.eclipse.ecf.core.events;
 
 import org.eclipse.ecf.core.identity.ID;
 
-public class SharedObjectDeactivatedEvent implements ContainerEvent {
+public class SharedObjectDeactivatedEvent implements ISharedObjectDeactivatedEvent {
 
     private final ID deactivatedID;
     private final ID localContainerID;
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 b5da978a1..e5309ff60 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
@@ -30,7 +30,7 @@ import org.eclipse.ecf.core.SharedObjectDescription;
 import org.eclipse.ecf.core.SharedObjectDisconnectException;
 import org.eclipse.ecf.core.SharedObjectInitException;
 import org.eclipse.ecf.core.SharedObjectNotFoundException;
-import org.eclipse.ecf.core.events.ContainerEvent;
+import org.eclipse.ecf.core.events.IContainerEvent;
 import org.eclipse.ecf.core.identity.ID;
 import org.eclipse.ecf.core.util.AbstractFactory;
 import org.eclipse.ecf.core.util.Event;
@@ -421,7 +421,7 @@ public abstract class SharedObjectContainer implements ISharedObjectContainer {
 							targets[i],
 							null
 							/*
-							new SharedObjectEvent(
+							new ISharedObjectEvent(
 								msg.getClassName(),
 								msg.getMethodName(),
 								msg.getArgs())
@@ -1246,7 +1246,7 @@ public abstract class SharedObjectContainer implements ISharedObjectContainer {
     public void removeListener(ISharedObjectContainerListener l) {
         listeners.remove(l);
     }
-    protected void fireListeners(ContainerEvent evt) {
+    protected void fireListeners(IContainerEvent evt) {
         for (Enumeration e = listeners.elements(); e.hasMoreElements();) {
             ISharedObjectContainerListener l = (ISharedObjectContainerListener) e
                     .nextElement();
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 9c33ab0f3..194f660dd 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
@@ -35,7 +35,7 @@ import org.eclipse.ecf.core.SharedObjectCreateException;
 import org.eclipse.ecf.core.SharedObjectDescription;
 import org.eclipse.ecf.core.SharedObjectDisconnectException;
 import org.eclipse.ecf.core.SharedObjectNotFoundException;
-import org.eclipse.ecf.core.events.ContainerEvent;
+import org.eclipse.ecf.core.events.IContainerEvent;
 import org.eclipse.ecf.core.identity.ID;
 import org.eclipse.ecf.core.util.AbstractFactory;
 import org.osgi.framework.BundleContext;
@@ -99,7 +99,7 @@ public class StandaloneContainer implements ISharedObjectContainer,
     public void removeListener(ISharedObjectContainerListener l) {
         listeners.remove(l);
     }
-    protected void fireListeners(ContainerEvent evt) {
+    protected void fireListeners(IContainerEvent evt) {
         for (Enumeration e = listeners.elements(); e.hasMoreElements();) {
             ISharedObjectContainerListener l = (ISharedObjectContainerListener) e
                     .nextElement();