MemType refactor

19 files changed, 76 insertions, 105 deletions

diff --git a/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/IMessageSubscription.java b/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/IMessageSubscription.java
index a6497478c5d..3c2932fb5da 100644
--- a/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/IMessageSubscription.java
+++ b/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/IMessageSubscription.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.ote.client.msg.core;
 import java.util.List;

 import java.util.Set;

 import org.eclipse.osee.ote.message.Message;

-import org.eclipse.osee.ote.message.enums.MemType;

+import org.eclipse.osee.ote.message.enums.DataType;

 import org.eclipse.osee.ote.message.tool.MessageMode;

 

 /**

@@ -28,7 +28,7 @@ public interface IMessageSubscription {
 

    MessageMode getMessageMode();

 

-   MemType getMemType();

+   DataType getMemType();

 

    /**

     * returns whether or not the subscription has been activated. A subscription is considered activated if and only if

@@ -40,7 +40,7 @@ public interface IMessageSubscription {
 

    boolean isResolved();

 

-   void changeMemType(MemType type);

+   void changeMemType(DataType type);

 

    void send() throws Exception;

 

@@ -50,7 +50,7 @@ public interface IMessageSubscription {
 

    void changeMessageMode(MessageMode mode);

 

-   Set<MemType> getAvailableTypes();

+   Set<DataType> getAvailableTypes();

 

    boolean addSubscriptionListener(ISubscriptionListener listener);

 

diff --git a/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/db/AbstractMessageDataBase.java b/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/db/AbstractMessageDataBase.java
index 0c5e2cede7b..815e3502fa8 100644
--- a/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/db/AbstractMessageDataBase.java
+++ b/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/db/AbstractMessageDataBase.java
@@ -19,7 +19,7 @@ import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.ote.client.msg.core.internal.MessageReference;
 import org.eclipse.osee.ote.message.Message;
 import org.eclipse.osee.ote.message.data.MessageData;
-import org.eclipse.osee.ote.message.enums.MemType;
+import org.eclipse.osee.ote.message.enums.DataType;
 import org.eclipse.osee.ote.message.interfaces.IMsgToolServiceClient;
 import org.eclipse.osee.ote.message.interfaces.IRemoteMessageService;
 import org.eclipse.osee.ote.message.tool.MessageMode;
@@ -53,7 +53,7 @@ public abstract class AbstractMessageDataBase {
       this.dictionary = dictionary;
    }
 
-   public MessageInstance findInstance(String name, MessageMode mode, MemType type) {
+   public MessageInstance findInstance(String name, MessageMode mode, DataType type) {
       MessageReference reference = new MessageReference(type, mode, name);
       return referenceToMsgMap.get(reference);
    }
@@ -62,7 +62,7 @@ public abstract class AbstractMessageDataBase {
       return acquireInstance(name, MessageMode.READER, null);
    }
 
-   public MessageInstance acquireInstance(String name, MessageMode mode, MemType type) throws Exception {
+   public MessageInstance acquireInstance(String name, MessageMode mode, DataType type) throws Exception {
       if (type == null) {
          Class<? extends Message> msgClass = dictionary.lookupMessage(name);
          Message msg = createMessage(msgClass);
diff --git a/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/db/MessageInstance.java b/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/db/MessageInstance.java
index 91f977ff068..b8e9b6a4aa1 100644
--- a/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/db/MessageInstance.java
+++ b/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/db/MessageInstance.java
@@ -10,11 +10,12 @@
  *******************************************************************************/
 package org.eclipse.osee.ote.client.msg.core.db;
 
-import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.Set;
 import org.eclipse.osee.ote.message.Message;
 import org.eclipse.osee.ote.message.commands.SubscribeToMessage;
 import org.eclipse.osee.ote.message.commands.UnSubscribeToMessage;
-import org.eclipse.osee.ote.message.enums.MemType;
+import org.eclipse.osee.ote.message.enums.DataType;
 import org.eclipse.osee.ote.message.interfaces.IMsgToolServiceClient;
 import org.eclipse.osee.ote.message.interfaces.IRemoteMessageService;
 import org.eclipse.osee.ote.message.tool.MessageMode;
@@ -26,15 +27,15 @@ import org.eclipse.osee.ote.message.tool.SubscriptionKey;
  */
 public class MessageInstance {
 
-   private final MemType type;
+   private final DataType type;
    private final MessageMode mode;
    private final Message msg;
    private SubscriptionKey serverSubscriptionKey = null;
    private int refcount = 0;
-   private final EnumSet<MemType> availableTypes = EnumSet.noneOf(MemType.class);
+   private final Set<DataType> availableTypes = new HashSet<DataType>();
    private boolean supported = true;
 
-   public MessageInstance(Message msg, MessageMode mode, MemType type) {
+   public MessageInstance(Message msg, MessageMode mode, DataType type) {
       this.msg = msg;
       this.mode = mode;
       this.type = type;
@@ -95,7 +96,7 @@ public class MessageInstance {
       return refcount > 0;
    }
 
-   public MemType getType() {
+   public DataType getType() {
       return type;
    }
 
@@ -103,7 +104,7 @@ public class MessageInstance {
       return mode;
    }
 
-   public EnumSet<MemType> getAvailableTypes() {
+   public Set<DataType> getAvailableTypes() {
       return availableTypes;
    }
 
diff --git a/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/ChannelProcessor.java b/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/ChannelProcessor.java
index bc77b3ec7d3..bb424c842dd 100644
--- a/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/ChannelProcessor.java
+++ b/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/ChannelProcessor.java
@@ -17,12 +17,11 @@ import java.util.Arrays;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.ExecutorService;
 import java.util.logging.Level;
-
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.ote.client.msg.core.db.AbstractMessageDataBase;
 import org.eclipse.osee.ote.client.msg.core.db.MessageInstance;
 import org.eclipse.osee.ote.message.data.MessageData;
-import org.eclipse.osee.ote.message.enums.MemType;
+import org.eclipse.osee.ote.message.enums.DataType;
 

 /**

  * Handles processing of updates from a channel. The channel processor maintains an internal queue whose max size

@@ -34,7 +33,7 @@ final public class ChannelProcessor {
 	private final ArrayBlockingQueue<Task> queue;

 	private final ExecutorService threadPool;

 	private final AbstractMessageDataBase msgDb;

-	private final MemType memType;

+	private final DataType memType;

 

 	/**

 	 * A task allows each channel to have multiple updates processed

@@ -75,7 +74,7 @@ final public class ChannelProcessor {
 

 	}

 

-	public ChannelProcessor(int depth, int bufferSize, ExecutorService threadPool, AbstractMessageDataBase msgDb, MemType memType) {

+	public ChannelProcessor(int depth, int bufferSize, ExecutorService threadPool, AbstractMessageDataBase msgDb, DataType memType) {

 		this.queue = new ArrayBlockingQueue<Task>(depth);

 		try {

 			// fill the queue with pre-allocated tasks

diff --git a/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/MessageReference.java b/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/MessageReference.java
index 85c7429e77f..5b5cfecd821 100644
--- a/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/MessageReference.java
+++ b/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/MessageReference.java
@@ -11,7 +11,7 @@
 package org.eclipse.osee.ote.client.msg.core.internal;

 

 import org.eclipse.osee.ote.message.Message;
-import org.eclipse.osee.ote.message.enums.MemType;
+import org.eclipse.osee.ote.message.enums.DataType;
 import org.eclipse.osee.ote.message.tool.MessageMode;
 

 /**

@@ -20,11 +20,11 @@ import org.eclipse.osee.ote.message.tool.MessageMode;
  */

 public class MessageReference {

 

-	private final MemType type;

+	private final DataType type;

 	private final MessageMode mode;

 	private final String msgClassName;

 

-	public MessageReference(MemType type, MessageMode mode, String msgClassName) {

+	public MessageReference(DataType type, MessageMode mode, String msgClassName) {

 		this.type = type;

 		this.mode = mode;

 		this.msgClassName = msgClassName;

@@ -40,7 +40,7 @@ public class MessageReference {
 		return msgClassName;

 	}

 

-	public MemType getType() {

+	public DataType getType() {

 		return type;

 	}

 

diff --git a/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/MessageSubscription.java b/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/MessageSubscription.java
index c8c44c428d9..c90b0e59805 100644
--- a/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/MessageSubscription.java
+++ b/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/MessageSubscription.java
@@ -13,7 +13,6 @@ package org.eclipse.osee.ote.client.msg.core.internal;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-
 import org.eclipse.osee.ote.client.msg.core.IMessageSubscription;
 import org.eclipse.osee.ote.client.msg.core.ISubscriptionListener;
 import org.eclipse.osee.ote.client.msg.core.db.AbstractMessageDataBase;
@@ -22,7 +21,7 @@ import org.eclipse.osee.ote.client.msg.core.internal.state.UnresolvedState;
 import org.eclipse.osee.ote.message.Message;
 import org.eclipse.osee.ote.message.commands.SetElementValue;
 import org.eclipse.osee.ote.message.commands.ZeroizeElement;
-import org.eclipse.osee.ote.message.enums.MemType;
+import org.eclipse.osee.ote.message.enums.DataType;
 import org.eclipse.osee.ote.message.interfaces.IRemoteMessageService;
 import org.eclipse.osee.ote.message.tool.MessageMode;
 

@@ -50,7 +49,7 @@ public class MessageSubscription implements IMessageSubscription {
 		bind(name, null, MessageMode.READER);

 	}

 

-	private void bind(String name, MemType type, MessageMode mode) {

+	private void bind(String name, DataType type, MessageMode mode) {

 		currentState = new UnresolvedState(name, this, type, mode);

 	}

 

@@ -65,7 +64,7 @@ public class MessageSubscription implements IMessageSubscription {
 	}

 

 	@Override

-	public synchronized MemType getMemType() {

+	public synchronized DataType getMemType() {

 		return currentState.getMemType();

 	}

 

@@ -109,7 +108,7 @@ public class MessageSubscription implements IMessageSubscription {
 	}

 

 	@Override

-	public synchronized Set<MemType> getAvailableTypes() {

+	public synchronized Set<DataType> getAvailableTypes() {

 		return currentState.getAvailableTypes();

 	}

 

@@ -119,7 +118,7 @@ public class MessageSubscription implements IMessageSubscription {
 			return;

 		}

 		String name = getMessageClassName();

-		MemType type = getMemType();

+		DataType type = getMemType();

 		notifyCanceled();

 		doCancel();

 		bind(name, type, mode);

@@ -140,7 +139,7 @@ public class MessageSubscription implements IMessageSubscription {
 	}

 

 	@Override

-	public synchronized void changeMemType(MemType type) {

+	public synchronized void changeMemType(DataType type) {

 		if (type == getMemType()) {

 			return;

 		}

diff --git a/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/MessageSubscriptionService.java b/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/MessageSubscriptionService.java
index db1d9a58f00..6a35fdef2a3 100644
--- a/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/MessageSubscriptionService.java
+++ b/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/MessageSubscriptionService.java
@@ -16,9 +16,9 @@ import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.nio.channels.DatagramChannel;
 import java.rmi.RemoteException;
-import java.util.EnumSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
@@ -35,7 +35,7 @@ import org.eclipse.osee.ote.core.environment.UserTestSessionKey;
 import org.eclipse.osee.ote.core.environment.interfaces.IHostTestEnvironment;
 import org.eclipse.osee.ote.message.commands.RecordCommand;
 import org.eclipse.osee.ote.message.commands.RecordCommand.MessageRecordDetails;
-import org.eclipse.osee.ote.message.enums.MemType;
+import org.eclipse.osee.ote.message.enums.DataType;
 import org.eclipse.osee.ote.message.interfaces.IMsgToolServiceClient;
 import org.eclipse.osee.ote.message.interfaces.IRemoteMessageService;
 import org.eclipse.osee.ote.message.interfaces.ITestEnvironmentMessageSystem;
@@ -183,40 +183,11 @@ public class MessageSubscriptionService implements IOteMessageService, IMessageD
    }
 
    private void createProccessors() throws IOException {
-      EnumSet<MemType> availableTypes = service.getAvailablePhysicalTypes();
+      Set<DataType> availableTypes = service.getAvailablePhysicalTypes();
 
       int port = PortUtil.getInstance().getConsecutiveValidPorts(availableTypes.size());
-      for (MemType type : availableTypes) {
-         final ChannelProcessor handler;
-         switch (type) {
-            case MUX:
-               handler = new ChannelProcessor(20, 256, threadPool, msgDatabase, type);
-               break;
-            case MUX_LM:
-               handler = new ChannelProcessor(5, 256, threadPool, msgDatabase, type);
-               break;
-            case PUB_SUB:
-               handler = new ChannelProcessor(10, 65455, threadPool, msgDatabase, type);
-               break;
-            case WIRE_AIU:
-               // pass through
-            case WIRE_MP_DIRECT:
-               // pass through
-            case IGTTS_WIRE:
-               handler = new ChannelProcessor(5, 512, threadPool, msgDatabase, type);
-               break;
-            case ETHERNET:
-               handler = new ChannelProcessor(5, 2048, threadPool, msgDatabase, type);
-               break;
-            case SERIAL:
-               handler = new ChannelProcessor(3, 10000, threadPool, msgDatabase, type);
-               break;
-            case TS_META_DATA:
-               handler = new ChannelProcessor(3, 2048, threadPool, msgDatabase, type);
-               break;
-            default:
-               throw new Error("no case for mem type of " + type);
-         }
+      for (DataType type : availableTypes) {
+         final ChannelProcessor handler = new ChannelProcessor(type.getToolingDepth(), type.getToolingBufferSize(), threadPool, msgDatabase, type);
          dispatcher.addChannel(localAddress, port, type, handler);
          port++;
       }
@@ -261,11 +232,11 @@ public class MessageSubscriptionService implements IOteMessageService, IMessageD
    }
 
    @Override
-   public InetSocketAddress getAddressByType(String messageName, int memType) throws RemoteException {
-      final DatagramChannel channel = dispatcher.getChannel(MemType.values()[memType]);
+   public InetSocketAddress getAddressByType(String messageName, DataType dataType) throws RemoteException {
+      final DatagramChannel channel = dispatcher.getChannel(dataType);
       OseeLog.log(Activator.class, Level.INFO, String.format(
             "callback from remote msg manager: msg=%s, type=%s, ip=%s:%d\n", messageName,
-            MemType.values()[memType], localAddress.toString(), channel.socket().getLocalPort()));
+            dataType.name(), localAddress.toString(), channel.socket().getLocalPort()));
 
       return new InetSocketAddress(localAddress, channel.socket().getLocalPort());
    }
diff --git a/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/UpdateDispatcher.java b/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/UpdateDispatcher.java
index 99e76339c2a..0175ddc9d49 100644
--- a/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/UpdateDispatcher.java
+++ b/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/UpdateDispatcher.java
@@ -16,13 +16,13 @@ import java.net.InetSocketAddress;
 import java.nio.channels.DatagramChannel;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.Selector;
-import java.util.EnumMap;
+import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.Set;
 import java.util.logging.Level;
-
 import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.ote.message.enums.MemType;
+import org.eclipse.osee.ote.message.enums.DataType;
 

 /**

  * A thread that listens for activity on a set of channels and then

@@ -37,7 +37,7 @@ public final class UpdateDispatcher {
 	private static final int RECEIVE_BUFFER_SIZE = 1024 * 128;
 
 	/** * Class Instance Fields ** */

-	private final EnumMap<MemType, DatagramChannel> channelMap = new EnumMap<MemType, DatagramChannel>(MemType.class);

+	private final Map<DataType, DatagramChannel> channelMap = new HashMap<DataType, DatagramChannel>();

 

 	private final InetSocketAddress remoteAddress;

 	private final Object gate = new Object();

@@ -122,11 +122,11 @@ public final class UpdateDispatcher {
 		return running;

 	}

 

-	public DatagramChannel getChannel(MemType type) {

+	public DatagramChannel getChannel(DataType type) {

 		return channelMap.get(type);

 	}

 

-	public SelectionKey addChannel(InetAddress localAddress, int port, MemType type, ChannelProcessor processor)

+	public SelectionKey addChannel(InetAddress localAddress, int port, DataType type, ChannelProcessor processor)

 			throws IOException {

 		final DatagramChannel channel = DatagramChannel.open();

 		channel.configureBlocking(false);

@@ -161,7 +161,7 @@ public final class UpdateDispatcher {
 			} catch (Exception ex) {

 				OseeLog.log(Activator.class, Level.WARNING, "Exception closing selector", ex);

 			} finally {

-				for (final MemType type : channelMap.keySet()) {

+				for (final DataType type : channelMap.keySet()) {

 					try {

 						final DatagramChannel channel = channelMap.get(type);

 						if (channel != null) {

diff --git a/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/state/AbstractSubscriptionState.java b/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/state/AbstractSubscriptionState.java
index ae506b657dd..9cea23ba1fc 100644
--- a/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/state/AbstractSubscriptionState.java
+++ b/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/state/AbstractSubscriptionState.java
@@ -11,7 +11,7 @@
 package org.eclipse.osee.ote.client.msg.core.internal.state;

 

 import org.eclipse.osee.ote.client.msg.core.internal.MessageSubscription;
-import org.eclipse.osee.ote.message.enums.MemType;
+import org.eclipse.osee.ote.message.enums.DataType;
 import org.eclipse.osee.ote.message.tool.MessageMode;
 

 /**

@@ -20,11 +20,11 @@ import org.eclipse.osee.ote.message.tool.MessageMode;
  */

 public abstract class AbstractSubscriptionState implements ISubscriptionState {

 

-	private final MemType type;

+	private final DataType type;

 	private final MessageMode mode;

 	private final MessageSubscription subscription;

 	

-	protected AbstractSubscriptionState(MessageSubscription subscription, MemType type, MessageMode mode) {

+	protected AbstractSubscriptionState(MessageSubscription subscription, DataType type, MessageMode mode) {

 		this.subscription = subscription;

 		this.type = type;

 		this.mode = mode;

@@ -38,7 +38,7 @@ public abstract class AbstractSubscriptionState implements ISubscriptionState {
 	

 

 	@Override

-	public MemType getMemType() {

+	public DataType getMemType() {

 		return type;

 	}

 

diff --git a/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/state/ActivateState.java b/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/state/ActivateState.java
index 98ed52e9fba..407f0129c67 100644
--- a/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/state/ActivateState.java
+++ b/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/state/ActivateState.java
@@ -16,7 +16,7 @@ import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.ote.client.msg.core.db.AbstractMessageDataBase;
 import org.eclipse.osee.ote.client.msg.core.db.MessageInstance;
 import org.eclipse.osee.ote.message.Message;
-import org.eclipse.osee.ote.message.enums.MemType;
+import org.eclipse.osee.ote.message.enums.DataType;
 

 /**

  * @author Ken J. Aguilar

@@ -81,7 +81,7 @@ public class ActivateState extends AbstractSubscriptionState {
 	}

 	

 	@Override

-	public Set<MemType> getAvailableTypes() {

+	public Set<DataType> getAvailableTypes() {

 		return instance.getAvailableTypes();

 	}

 

diff --git a/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/state/ISubscriptionState.java b/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/state/ISubscriptionState.java
index 55d74e22d32..2b02739cc55 100644
--- a/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/state/ISubscriptionState.java
+++ b/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/state/ISubscriptionState.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.ote.client.msg.core.internal.state;
 import java.util.Set;
 import org.eclipse.osee.ote.client.msg.core.db.AbstractMessageDataBase;
 import org.eclipse.osee.ote.message.Message;
-import org.eclipse.osee.ote.message.enums.MemType;
+import org.eclipse.osee.ote.message.enums.DataType;
 import org.eclipse.osee.ote.message.tool.MessageMode;
 

 /**

@@ -21,7 +21,7 @@ import org.eclipse.osee.ote.message.tool.MessageMode;
  *

  */

 public interface ISubscriptionState {

-	MemType getMemType();

+   DataType getMemType();

 

 	MessageMode getMode();

 

@@ -29,7 +29,7 @@ public interface ISubscriptionState {
 

 	Message getMessage();

 

-	Set<MemType> getAvailableTypes();

+	Set<DataType> getAvailableTypes();

 	

 	ISubscriptionState onMessageDbFound(AbstractMessageDataBase msgDB);

 

diff --git a/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/state/InactiveState.java b/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/state/InactiveState.java
index f332a35c967..1a13d88a66e 100644
--- a/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/state/InactiveState.java
+++ b/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/state/InactiveState.java
@@ -10,14 +10,14 @@
  *******************************************************************************/
 package org.eclipse.osee.ote.client.msg.core.internal.state;

 

-import java.util.EnumSet;
+import java.util.HashSet;
 import java.util.Set;
 import java.util.logging.Level;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.ote.client.msg.core.db.AbstractMessageDataBase;
 import org.eclipse.osee.ote.client.msg.core.db.MessageInstance;
 import org.eclipse.osee.ote.message.Message;
-import org.eclipse.osee.ote.message.enums.MemType;
+import org.eclipse.osee.ote.message.enums.DataType;
 

 /**

  * @author Ken J. Aguilar

@@ -91,8 +91,8 @@ public class InactiveState extends AbstractSubscriptionState {
 

 

 	@Override

-	public Set<MemType> getAvailableTypes() {

-		return EnumSet.noneOf(MemType.class);

+	public Set<DataType> getAvailableTypes() {

+		return new HashSet<DataType>();

 	}

 

 

diff --git a/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/state/UnresolvedState.java b/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/state/UnresolvedState.java
index b46cf755871..c62dab987d0 100644
--- a/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/state/UnresolvedState.java
+++ b/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/state/UnresolvedState.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.osee.ote.client.msg.core.internal.state;

 

-import java.util.EnumSet;
+import java.util.HashSet;
 import java.util.Set;
 import java.util.logging.Level;
 import org.eclipse.osee.framework.logging.OseeLog;
@@ -18,7 +18,7 @@ import org.eclipse.osee.ote.client.msg.core.db.AbstractMessageDataBase;
 import org.eclipse.osee.ote.client.msg.core.db.MessageInstance;
 import org.eclipse.osee.ote.client.msg.core.internal.MessageSubscription;
 import org.eclipse.osee.ote.message.Message;
-import org.eclipse.osee.ote.message.enums.MemType;
+import org.eclipse.osee.ote.message.enums.DataType;
 import org.eclipse.osee.ote.message.tool.MessageMode;
 

 /**

@@ -27,12 +27,12 @@ import org.eclipse.osee.ote.message.tool.MessageMode;
  */

 public class UnresolvedState extends AbstractSubscriptionState {

 

-	private MemType type;

+	private DataType type;

 

 	private final String msgClassName;

 	private MessageInstance instance = null;

 	

-	public UnresolvedState(String msgClassName, MessageSubscription subscription, MemType type, MessageMode mode) {

+	public UnresolvedState(String msgClassName, MessageSubscription subscription, DataType type, MessageMode mode) {

 		super(subscription, type, mode);

 		this.type = type;

 		this.msgClassName = msgClassName;

@@ -68,7 +68,7 @@ public class UnresolvedState extends AbstractSubscriptionState {
 	}

 

 	@Override

-	public MemType getMemType() {

+	public DataType getMemType() {

 		return type;

 	}

 	

@@ -88,8 +88,8 @@ public class UnresolvedState extends AbstractSubscriptionState {
 	}

 

 	@Override

-	public Set<MemType> getAvailableTypes() {

-		return EnumSet.noneOf(MemType.class);

+	public Set<DataType> getAvailableTypes() {

+		return new HashSet<DataType>();

 	}

 

 	@Override

diff --git a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/enums/DataType.java b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/enums/DataType.java
index b6cb938b0cf..e7b00b3ea95 100644
--- a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/enums/DataType.java
+++ b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/enums/DataType.java
@@ -22,5 +22,6 @@ import org.eclipse.osee.ote.message.interfaces.INamespace;
 public interface DataType extends Serializable, INamespace {
 
 	String name();
-	
+	int getToolingDepth();
+	int getToolingBufferSize();
 }
diff --git a/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/tree/MessageUpdateListener.java b/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/tree/MessageUpdateListener.java
index 60cd1db4b35..0805d8a106f 100644
--- a/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/tree/MessageUpdateListener.java
+++ b/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/tree/MessageUpdateListener.java
@@ -16,7 +16,7 @@ import org.eclipse.osee.ote.client.msg.core.AbstractMessageListener;
 import org.eclipse.osee.ote.client.msg.core.IMessageSubscription;
 import org.eclipse.osee.ote.message.MessageSystemException;
 import org.eclipse.osee.ote.message.data.MessageData;
-import org.eclipse.osee.ote.message.enums.MemType;
+import org.eclipse.osee.ote.message.enums.DataType;
 import org.eclipse.swt.widgets.Display;
 

 /**

@@ -52,7 +52,7 @@ public class MessageUpdateListener extends AbstractMessageListener {
 	}

 

 	@Override

-	public void onDataAvailable(MessageData data, MemType type) throws MessageSystemException {

+	public void onDataAvailable(MessageData data, DataType type) throws MessageSystemException {

 		if (type == getSubscription().getMemType()) {

 			node.incrementCounter();

 		}

diff --git a/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/tree/WatchedMessageNode.java b/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/tree/WatchedMessageNode.java
index 75b51540b5d..b71a2ee1a4b 100644
--- a/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/tree/WatchedMessageNode.java
+++ b/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/tree/WatchedMessageNode.java
@@ -23,7 +23,7 @@ import org.eclipse.osee.framework.ui.swt.OverlayImage;
 import org.eclipse.osee.framework.ui.swt.OverlayImage.Location;

 import org.eclipse.osee.ote.client.msg.core.IMessageSubscription;

 import org.eclipse.osee.ote.message.commands.RecordCommand.MessageRecordDetails;

-import org.eclipse.osee.ote.message.enums.MemType;

+import org.eclipse.osee.ote.message.enums.DataType;

 import org.eclipse.osee.ote.ui.message.OteMessageImage;

 import org.eclipse.osee.ote.ui.message.messageXViewer.MessageXViewerFactory;

 import org.eclipse.osee.ote.ui.message.watch.ElementPath;

@@ -63,7 +63,7 @@ public class WatchedMessageNode extends MessageNode {
       return null;

    }

 

-   public MemType getMemType() {

+   public DataType getMemType() {

       return subscription.getMemType();

    }

 

diff --git a/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/watch/action/SetDataSourceAction.java b/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/watch/action/SetDataSourceAction.java
index 942d4c849a1..04ff128f183 100644
--- a/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/watch/action/SetDataSourceAction.java
+++ b/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/watch/action/SetDataSourceAction.java
@@ -11,7 +11,7 @@
 package org.eclipse.osee.ote.ui.message.watch.action;

 

 import org.eclipse.jface.action.Action;
-import org.eclipse.osee.ote.message.enums.MemType;
+import org.eclipse.osee.ote.message.enums.DataType;
 import org.eclipse.osee.ote.ui.message.tree.WatchedMessageNode;
 

 /**

@@ -22,9 +22,9 @@ public class SetDataSourceAction extends Action {
 

 

 	private final WatchedMessageNode node;

-	private final MemType type;

+	private final DataType type;

 	

-	public SetDataSourceAction(WatchedMessageNode node, MemType type) {

+	public SetDataSourceAction(WatchedMessageNode node, DataType type) {

 		super(type.name(), Action.AS_RADIO_BUTTON);

 		this.node = node;

 		this.type = type;

diff --git a/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/watch/action/SetDataSourceMenu.java b/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/watch/action/SetDataSourceMenu.java
index d0c180058cb..7af228f7f78 100644
--- a/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/watch/action/SetDataSourceMenu.java
+++ b/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/watch/action/SetDataSourceMenu.java
@@ -15,7 +15,7 @@ import org.eclipse.jface.action.IContributionItem;
 import org.eclipse.jface.action.IMenuListener;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.nebula.widgets.xviewer.XSubMenuManager;
-import org.eclipse.osee.ote.message.enums.MemType;
+import org.eclipse.osee.ote.message.enums.DataType;
 import org.eclipse.osee.ote.ui.message.tree.WatchedMessageNode;
 

 /**

@@ -43,7 +43,7 @@ public class SetDataSourceMenu extends XSubMenuManager implements IMenuListener
 

 	@Override

 	public void menuAboutToShow(IMenuManager manager) {

-		for (MemType type : node.getSubscription().getAvailableTypes()) {

+		for (DataType type : node.getSubscription().getAvailableTypes()) {

 			add(new SetDataSourceAction(node, type));

 		}

 		

diff --git a/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/watch/recording/RecordingFilter.java b/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/watch/recording/RecordingFilter.java
index 39c358ac4d7..1c8e8be9657 100644
--- a/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/watch/recording/RecordingFilter.java
+++ b/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/watch/recording/RecordingFilter.java
@@ -21,7 +21,7 @@ import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.osee.ote.message.Message;
 import org.eclipse.osee.ote.message.commands.RecordCommand.MessageRecordDetails;
 import org.eclipse.osee.ote.message.elements.Element;
-import org.eclipse.osee.ote.message.enums.MemType;
+import org.eclipse.osee.ote.message.enums.DataType;
 import org.eclipse.osee.ote.ui.message.tree.ElementNode;
 import org.eclipse.osee.ote.ui.message.tree.MessageNode;
 import org.eclipse.osee.ote.ui.message.tree.WatchList;
@@ -268,7 +268,7 @@ public class RecordingFilter extends WizardPage {
          }
       }
 
-      public MessageRecordDetails create(String msg, MemType currentMemType) {
+      public MessageRecordDetails create(String msg, DataType currentMemType) {
          return new MessageRecordDetails(msg, currentMemType, headerDump, headers, bodyDump, elements);
       }
    }