Changed comm package interfaces and classes

7 files changed, 33 insertions, 23 deletions

diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/comm/ConnectionEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/comm/ConnectionEvent.java
index 58ae847cd..33eadd630 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/comm/ConnectionEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/comm/ConnectionEvent.java
@@ -4,26 +4,18 @@ import org.eclipse.ecf.core.util.Event;
 
 public class ConnectionEvent implements Event {
 
-	Object odata = null;
-	byte [] bdata = null;
+	Object data = null;
 	IConnection connection = null;
 	
-	public ConnectionEvent(IConnection source, Object odata) {
+	public ConnectionEvent(IConnection source, Object data) {
 	    this.connection = source;
-		this.odata = odata;
-	}
-	public ConnectionEvent(IConnection source, byte [] bdata) {
-	    this.connection = source;
-	    this.bdata = bdata;
+	    this.data = data;
 	}
 	public IConnection getConnection() {
 		return connection;
 	}
-	public Object getOData() {
-		return odata;
-	}
-	public byte [] getBData() {
-	    return bdata;
+	public Object getData() {
+	    return data;
 	}
 
 }
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/comm/ConnectionRequestHandler.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/comm/ConnectionRequestHandler.java
new file mode 100644
index 000000000..61160db9c
--- /dev/null
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/comm/ConnectionRequestHandler.java
@@ -0,0 +1,14 @@
+/*
+ * Created on Dec 23, 2004
+ *
+ */
+package org.eclipse.ecf.internal.comm;
+
+import java.io.Serializable;
+import java.net.Socket;
+
+public interface ConnectionRequestHandler {
+
+    public Serializable checkConnect(Socket aSocket, String target, Object data, ISynchAsynchConnection conn) throws Exception;
+    
+}
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/comm/DisconnectConnectionEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/comm/DisconnectConnectionEvent.java
index e61d7f210..b5947a456 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/comm/DisconnectConnectionEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/comm/DisconnectConnectionEvent.java
@@ -13,10 +13,6 @@ public class DisconnectConnectionEvent extends ConnectionEvent {
 		exception = e;
 	}
 
-	public Object getData() {
-		return super.getOData();
-	}
-	
 	public Throwable getException() {
 		return exception;
 	}
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/comm/IConnectionEventHandler.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/comm/IConnectionEventHandler.java
index a8a205294..af8405178 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/comm/IConnectionEventHandler.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/comm/IConnectionEventHandler.java
@@ -3,6 +3,6 @@ package org.eclipse.ecf.internal.comm;
 public interface IConnectionEventHandler {
 
 	public boolean handleSuspectEvent(ConnectionEvent event);
-	public void handleDisconnectEvent(ConnectionEvent event);
+	public void handleDisconnectEvent(DisconnectConnectionEvent event);
 	public Object getAdapter(Class clazz);
 }
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/comm/SuspectConnectionEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/comm/SuspectConnectionEvent.java
new file mode 100644
index 000000000..2fd668f44
--- /dev/null
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/comm/SuspectConnectionEvent.java
@@ -0,0 +1,9 @@
+package org.eclipse.ecf.internal.comm;
+
+class SuspectConnectionEvent extends ConnectionEvent {
+
+    public SuspectConnectionEvent(IConnection source, Object data) {
+        super(source, data);
+    }
+
+}
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/comm/SynchConnectionEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/comm/SynchConnectionEvent.java
index 29fd588e0..d89dab156 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/comm/SynchConnectionEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/comm/SynchConnectionEvent.java
@@ -1,9 +1,8 @@
 package org.eclipse.ecf.internal.comm;
 
-import java.io.Serializable;
 
 public class SynchConnectionEvent extends ConnectionEvent {
-	public SynchConnectionEvent(ISynchConnection conn, Serializable data) {
+	public SynchConnectionEvent(ISynchConnection conn, Object data) {
 		super(conn, data);
 	}
 }
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 61b4b8193..211dacb45 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
@@ -468,7 +468,7 @@ public abstract class SharedObjectContainer implements ISharedObjectContainer {
 		throws IOException, IllegalAccessException {
 		if (isClosing)
 			throw new IllegalStateException(CONTAINERCLOSING);
-		processAsynchPacket(verifyPacket((Serializable) evt.getOData()));
+		processAsynchPacket(verifyPacket((Serializable) evt.getData()));
 	}
 	protected void processAsynchPacket(ContainerPacket p) throws IOException, IllegalAccessException {
 		switch (p.msg) {
@@ -521,7 +521,7 @@ public abstract class SharedObjectContainer implements ISharedObjectContainer {
 		throws IOException, IllegalAccessException {
 		if (isClosing)
 			throw new IllegalStateException(CONTAINERCLOSING);
-		return processSynchPacket((IAsynchConnection) evt.getConnection(), verifyPacket((Serializable) evt.getOData()));
+		return processSynchPacket((IAsynchConnection) evt.getConnection(), verifyPacket((Serializable) evt.getData()));
 	}
 	protected Serializable processSynchPacket(
 		IAsynchConnection conn,
@@ -1058,7 +1058,7 @@ public abstract class SharedObjectContainer implements ISharedObjectContainer {
 	}
 	protected final class MsgReceiver implements IAsynchConnectionEventHandler, ISynchConnectionEventHandler {
 
-		public void handleDisconnectEvent(ConnectionEvent evt) {
+		public void handleDisconnectEvent(DisconnectConnectionEvent evt) {
 			SharedObjectContainer.this.handleDisconnectEvent(
 				(DisconnectConnectionEvent) evt);
 		}