Fixes for supporting user BaseChannel subclass creation

2 files changed, 29 insertions, 9 deletions

diff --git a/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/BaseChannel.java b/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/BaseChannel.java
index f8fa370a1..b370fb26d 100644
--- a/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/BaseChannel.java
+++ b/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/BaseChannel.java
@@ -40,6 +40,11 @@ public class BaseChannel extends TransactionSharedObject implements IChannel {
 		byte[] getData() {
 			return channelData;
 		}
+		public String toString() {
+			StringBuffer buf = new StringBuffer("BaseChannel.ChannelMsg[");
+			buf.append("data=").append(getData()).append("]");
+			return buf.toString();
+		}
 	}
 	protected IChannelListener listener;
 	protected void setChannelListener(IChannelListener l) {
@@ -73,15 +78,10 @@ public class BaseChannel extends TransactionSharedObject implements IChannel {
 	 * @param channelEvent the IChannelEvent to receive and process
 	 */
 	protected void receiveChannelEvent(IChannelEvent channelEvent) {
-		if (channelEvent instanceof IChannelMessageEvent)
-			System.out.println("replica.receiveChannelMessage(" + getID() + ","
-					+ getLocalContainerID() + ") fromContainerID="
-					+ ((IChannelMessageEvent) channelEvent).getFromContainerID()
-					+ " message="
-					+ new String(((IChannelMessageEvent) channelEvent).getData()));
+		if (isPrimary())
+			System.out.println("host."+channelEvent);
 		else
-			System.out.println("replica.receiveChannelEvent("
-					+ channelEvent.getChannelID() + "," + channelEvent.getClass().getName()+")");
+			System.out.println("replica."+channelEvent);
 	}
 	/**
 	 * Override of TransasctionSharedObject.initialize().  This method is called on
@@ -137,6 +137,11 @@ public class BaseChannel extends TransactionSharedObject implements IChannel {
 			public ID getChannelID() {
 				return getID();
 			}
+			public String toString() {
+				StringBuffer buf = new StringBuffer("ChannelInitializeEvent[");
+				buf.append("chid=").append(getChannelID()).append(";groupMembers=").append(getGroupMembers()).append("]");
+				return buf.toString();
+			}
 		});
 	}
 	/**
@@ -165,6 +170,11 @@ public class BaseChannel extends TransactionSharedObject implements IChannel {
 			public ID getChannelID() {
 				return getID();
 			}
+			public String toString() {
+				StringBuffer buf = new StringBuffer("ChannelGroupJoinEvent[");
+				buf.append("chid=").append(getChannelID()).append(";targetid=").append(getTargetID()).append("]");
+				return buf.toString();
+			}
 		};
 	}
 	private IChannelGroupDepartEvent createChannelGroupDepartEvent(
@@ -177,6 +187,11 @@ public class BaseChannel extends TransactionSharedObject implements IChannel {
 			public ID getChannelID() {
 				return getID();
 			}
+			public String toString() {
+				StringBuffer buf = new StringBuffer("ChannelGroupDepartedEvent[");
+				buf.append("chid=").append(getChannelID()).append(";targetid=").append(getTargetID()).append("]");
+				return buf.toString();
+			}
 		};
 	}
 	private Event handleMessageEvent(final ISharedObjectMessageEvent event) {
@@ -197,6 +212,11 @@ public class BaseChannel extends TransactionSharedObject implements IChannel {
 					public ID getChannelID() {
 						return getID();
 					}
+					public String toString() {
+						StringBuffer buf = new StringBuffer("ChannelMessageEvent[");
+						buf.append("chid=").append(getChannelID()).append(";fromid=").append(getFromContainerID()).append(";data=").append(getData()).append("]");
+						return buf.toString();
+					}
 				});
 				// Discontinue processing of this event...we are it
 				return null;
diff --git a/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainer.java b/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainer.java
index 66a144d3f..ae805fb23 100644
--- a/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainer.java
@@ -117,7 +117,7 @@ public class DatashareContainer extends TCPClientSOContainer implements
 		ISharedObjectTransactionConfig transactionConfig = newChannelConfig
 				.getTransactionConfig();
 		ISharedObject so = null;
-		if (sotypedesc.getDescription() != null) {
+		if (sotypedesc.getName() != null) {
 			so = SharedObjectFactory
 					.getDefault()
 					.createSharedObject(