Removed ISharedObjectContext.sendMessage(ID, byte []) and

changed signature of ISharedObjectContext.sendMessage(ID, Serializable)
to ISharedObjectContext.sendMessage(ID, Object)

3 files changed, 4 insertions, 39 deletions

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 18c0d2952..514b92547 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
@@ -10,7 +10,6 @@
 package org.eclipse.ecf.core;
 
 import java.io.IOException;
-import java.io.Serializable;
 
 import org.eclipse.ecf.core.identity.ID;
 import org.eclipse.ecf.core.util.QueueEnqueue;
@@ -145,27 +144,10 @@ public interface ISharedObjectContext {
      *            container).
      * 
      * @throws IOException
-     *             thrown if message cannot be sent by container
-     */
-    public void sendMessage(ID toContainerID, byte[] data) throws IOException;
-    /**
-     * Send arbitrary message to remote instance of the ISharedObject with same
-     * ID as this instance (ISharedObject.getID() returns same unique value).
-     * This method allows ISharedObject instances to send arbitrary data to one
-     * or more remote replicas of this ISharedObject.
-     * 
-     * @param toContainerID
-     *            the ID of the remote ISharedObjectContainer that is the target
-     *            container for the message request. If this parameter is null,
-     *            the request is assumed to be made of <b>all </b> remote
-     *            containers currently in the given group (excepting the local
-     *            container).
-     * 
-     * @throws IOException
      *             thrown if message cannot be sent by container, or if data
      *             cannot be serialized
      */
-    public void sendMessage(ID toContainerID, Serializable data)
+    public void sendMessage(ID toContainerID, Object data)
             throws IOException;
 
     /**
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 9dbb20065..9c33ab0f3 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
@@ -9,7 +9,6 @@
 
 package org.eclipse.ecf.internal.impl.standalone;
 
-import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
@@ -451,11 +450,7 @@ public class StandaloneContainer implements ISharedObjectContainer,
         System.out.println("Container.sendCreate("+objID+","+containerID+","+sd+")");
     }
     
-    protected void sendMessage(ID objID, ID containerID, byte [] data) {
-        System.out.println("Container.sendMessage("+objID+","+containerID+","+new String(data)+")");
-    }
-
-    protected void sendMessage(ID objID, ID containerID, Serializable data) {
+    protected void sendMessage(ID objID, ID containerID, Object data) {
         System.out.println("Container.sendMessage("+objID+","+containerID+","+data+")");
     }
 
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 6b956710e..57036cc0f 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
@@ -5,7 +5,6 @@
 package org.eclipse.ecf.internal.impl.standalone;
 
 import java.io.IOException;
-import java.io.Serializable;
 import java.util.Map;
 
 import org.eclipse.ecf.core.IOSGIService;
@@ -147,20 +146,9 @@ public class StandaloneContext implements ISharedObjectContext {
     }
 
     /* (non-Javadoc)
-     * @see org.eclipse.ecf.core.ISharedObjectContext#sendMessage(org.eclipse.ecf.core.identity.ID, byte[])
+     * @see org.eclipse.ecf.core.ISharedObjectContext#sendMessage(org.eclipse.ecf.core.identity.ID, java.lang.Object)
      */
-    public void sendMessage(ID toContainerID, byte[] data) throws IOException {
-        if (isInactive()) {
-            return;
-        } else {
-            container.sendMessage(sharedObjectID,toContainerID,data); 
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.ecf.core.ISharedObjectContext#sendMessage(org.eclipse.ecf.core.identity.ID, java.io.Serializable)
-     */
-    public void sendMessage(ID toContainerID, Serializable data)
+    public void sendMessage(ID toContainerID, Object data)
             throws IOException {
         if (isInactive()) {
             return;