Renamed some of the interfaces classes in org.eclipse.ecf.core.util for consistency with I* conventions

18 files changed, 53 insertions, 53 deletions

diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/GenericSharedObject.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/GenericSharedObject.java
index 2ddbef2bc..47ec825e8 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/GenericSharedObject.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/GenericSharedObject.java
@@ -34,7 +34,7 @@ import org.eclipse.ecf.core.events.RemoteSharedObjectEvent;
 import org.eclipse.ecf.core.identity.ID;
 import org.eclipse.ecf.core.identity.IDFactory;
 import org.eclipse.ecf.core.util.Event;
-import org.eclipse.ecf.core.util.QueueEnqueue;
+import org.eclipse.ecf.core.util.IQueueEnqueue;
 import org.eclipse.ecf.core.util.QueueException;
 import org.eclipse.ecf.example.collab.Trace;
 
@@ -435,7 +435,7 @@ public void handleEvent(Event event) {
     protected void sendSelf(SharedObjectMsg msg) {
         ISharedObjectContext context = getContext();
         if (context == null) return;
-        QueueEnqueue queue = context.getQueue();
+        IQueueEnqueue queue = context.getQueue();
         try {
             queue.enqueue(new RemoteSharedObjectMsgEvent(getID(), getContext()
                     .getLocalContainerID(), msg));
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/QueueEnqueueImpl.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/QueueEnqueueImpl.java
index 3c3f248ee..9968f5c5f 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/QueueEnqueueImpl.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/QueueEnqueueImpl.java
@@ -15,13 +15,13 @@
  */
 package org.eclipse.ecf.provider.generic;
 
-import org.eclipse.ecf.core.util.EnqueuePredicate;
+import org.eclipse.ecf.core.util.IEnqueuePredicate;
 import org.eclipse.ecf.core.util.Event;
-import org.eclipse.ecf.core.util.QueueEnqueue;
+import org.eclipse.ecf.core.util.IQueueEnqueue;
 import org.eclipse.ecf.core.util.QueueException;
 import org.eclipse.ecf.core.util.SimpleQueueImpl;
 
-public class QueueEnqueueImpl implements QueueEnqueue {
+public class QueueEnqueueImpl implements IQueueEnqueue {
     SimpleQueueImpl queue = null;
 
     public QueueEnqueueImpl(SimpleQueueImpl impl) {
@@ -32,7 +32,7 @@ public class QueueEnqueueImpl implements QueueEnqueue {
     /*
      * (non-Javadoc)
      * 
-     * @see org.eclipse.ecf.core.util.QueueEnqueue#enqueue(org.eclipse.ecf.core.util.Event)
+     * @see org.eclipse.ecf.core.util.IQueueEnqueue#enqueue(org.eclipse.ecf.core.util.Event)
      */
     public void enqueue(Event element) throws QueueException {
         queue.enqueue(element);
@@ -41,7 +41,7 @@ public class QueueEnqueueImpl implements QueueEnqueue {
     /*
      * (non-Javadoc)
      * 
-     * @see org.eclipse.ecf.core.util.QueueEnqueue#enqueue(org.eclipse.ecf.core.util.Event[])
+     * @see org.eclipse.ecf.core.util.IQueueEnqueue#enqueue(org.eclipse.ecf.core.util.Event[])
      */
     public void enqueue(Event[] elements) throws QueueException {
         if (elements != null) {
@@ -54,7 +54,7 @@ public class QueueEnqueueImpl implements QueueEnqueue {
     /*
      * (non-Javadoc)
      * 
-     * @see org.eclipse.ecf.core.util.QueueEnqueue#enqueue_prepare(org.eclipse.ecf.core.util.Event[])
+     * @see org.eclipse.ecf.core.util.IQueueEnqueue#enqueue_prepare(org.eclipse.ecf.core.util.Event[])
      */
     public Object enqueue_prepare(Event[] elements) throws QueueException {
         return elements;
@@ -63,7 +63,7 @@ public class QueueEnqueueImpl implements QueueEnqueue {
     /*
      * (non-Javadoc)
      * 
-     * @see org.eclipse.ecf.core.util.QueueEnqueue#enqueue_commit(java.lang.Object)
+     * @see org.eclipse.ecf.core.util.IQueueEnqueue#enqueue_commit(java.lang.Object)
      */
     public void enqueue_commit(Object enqueue_key) {
         if (enqueue_key instanceof Event[]) {
@@ -80,7 +80,7 @@ public class QueueEnqueueImpl implements QueueEnqueue {
     /*
      * (non-Javadoc)
      * 
-     * @see org.eclipse.ecf.core.util.QueueEnqueue#enqueue_abort(java.lang.Object)
+     * @see org.eclipse.ecf.core.util.IQueueEnqueue#enqueue_abort(java.lang.Object)
      */
     public void enqueue_abort(Object enqueue_key) {
         // Do nothing
@@ -89,7 +89,7 @@ public class QueueEnqueueImpl implements QueueEnqueue {
     /*
      * (non-Javadoc)
      * 
-     * @see org.eclipse.ecf.core.util.QueueEnqueue#enqueue_lossy(org.eclipse.ecf.core.util.Event)
+     * @see org.eclipse.ecf.core.util.IQueueEnqueue#enqueue_lossy(org.eclipse.ecf.core.util.Event)
      */
     public boolean enqueue_lossy(Event element) {
         queue.enqueue(element);
@@ -99,9 +99,9 @@ public class QueueEnqueueImpl implements QueueEnqueue {
     /*
      * (non-Javadoc)
      * 
-     * @see org.eclipse.ecf.core.util.QueueEnqueue#setEnqueuePredicate(org.eclipse.ecf.core.util.EnqueuePredicate)
+     * @see org.eclipse.ecf.core.util.IQueueEnqueue#setEnqueuePredicate(org.eclipse.ecf.core.util.IEnqueuePredicate)
      */
-    public void setEnqueuePredicate(EnqueuePredicate pred) {
+    public void setEnqueuePredicate(IEnqueuePredicate pred) {
         // This queue does not support enqueue predicate
         // So we do nothing
     }
@@ -109,9 +109,9 @@ public class QueueEnqueueImpl implements QueueEnqueue {
     /*
      * (non-Javadoc)
      * 
-     * @see org.eclipse.ecf.core.util.QueueEnqueue#getEnqueuePredicate()
+     * @see org.eclipse.ecf.core.util.IQueueEnqueue#getEnqueuePredicate()
      */
-    public EnqueuePredicate getEnqueuePredicate() {
+    public IEnqueuePredicate getEnqueuePredicate() {
         // We don't support enqueue predicate, so return null;
         return null;
     }
@@ -119,7 +119,7 @@ public class QueueEnqueueImpl implements QueueEnqueue {
     /*
      * (non-Javadoc)
      * 
-     * @see org.eclipse.ecf.core.util.QueueEnqueue#size()
+     * @see org.eclipse.ecf.core.util.IQueueEnqueue#size()
      */
     public int size() {
         return queue.size();
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConfig.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConfig.java
index 3c78243d0..1e49e790c 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConfig.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConfig.java
@@ -19,7 +19,7 @@ import java.util.Map;
 import org.eclipse.ecf.core.ISharedObjectConfig;
 import org.eclipse.ecf.core.ISharedObjectContext;
 import org.eclipse.ecf.core.identity.ID;
-import org.eclipse.ecf.core.util.QueueEnqueue;
+import org.eclipse.ecf.core.util.IQueueEnqueue;
 
 public class SOConfig implements ISharedObjectConfig {
     protected SOContainer container = null;
@@ -39,7 +39,7 @@ public class SOConfig implements ISharedObjectConfig {
         this.container = cont;
     }
 
-    protected void makeActive(QueueEnqueue queue) {
+    protected void makeActive(IQueueEnqueue queue) {
         isActive = true;
         if (container.getID().equals(homeContainerID)) {
             this.context = container.makeNewSharedObjectContext(this,queue);
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConnector.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConnector.java
index 8362483dc..79bac1040 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConnector.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConnector.java
@@ -21,7 +21,7 @@ import org.eclipse.ecf.core.ISharedObjectConnector;
 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.QueueEnqueue;
+import org.eclipse.ecf.core.util.IQueueEnqueue;
 import org.eclipse.ecf.core.util.QueueException;
 import org.eclipse.ecf.provider.generic.events.SharedObjectCallEvent;
 
@@ -29,7 +29,7 @@ public class SOConnector implements ISharedObjectConnector {
     ID sender;
     Hashtable receiverQueues = null;
 
-    public SOConnector(ID sender, ID[] recv, QueueEnqueue[] queues) {
+    public SOConnector(ID sender, ID[] recv, IQueueEnqueue[] queues) {
         super();
         this.receiverQueues = new Hashtable();
         for (int i = 0; i < recv.length; i++) {
@@ -39,14 +39,14 @@ public class SOConnector implements ISharedObjectConnector {
 
     protected void fireEvent(ISharedObjectEvent event) throws QueueException {
         for (Enumeration e = receiverQueues.elements(); e.hasMoreElements();) {
-            QueueEnqueue queue = (QueueEnqueue) e.nextElement();
+            IQueueEnqueue queue = (IQueueEnqueue) e.nextElement();
             queue.enqueue(event);
         }
     }
 
     protected void fireEvents(ISharedObjectEvent[] event) throws QueueException {
         for (Enumeration e = receiverQueues.elements(); e.hasMoreElements();) {
-            QueueEnqueue queue = (QueueEnqueue) e.nextElement();
+            IQueueEnqueue queue = (IQueueEnqueue) e.nextElement();
             if (queue != null) {
                 queue.enqueue(event);
             }
@@ -58,7 +58,7 @@ public class SOConnector implements ISharedObjectConnector {
         AsynchResult[] results = new AsynchResult[receiverQueues.size()];
         int i = 0;
         for (Enumeration e = receiverQueues.elements(); e.hasMoreElements();) {
-            QueueEnqueue queue = (QueueEnqueue) e.nextElement();
+            IQueueEnqueue queue = (IQueueEnqueue) e.nextElement();
             results[i] = new AsynchResult();
             queue.enqueue(new SharedObjectCallEvent(event
                     .getSenderSharedObjectID(), event, results[i]));
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java
index 2d05d0fc1..4ce76e32f 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java
@@ -44,7 +44,7 @@ import org.eclipse.ecf.core.events.SharedObjectContainerDepartedEvent;
 import org.eclipse.ecf.core.events.SharedObjectContainerDisposeEvent;
 import org.eclipse.ecf.core.identity.ID;
 import org.eclipse.ecf.core.util.Event;
-import org.eclipse.ecf.core.util.QueueEnqueue;
+import org.eclipse.ecf.core.util.IQueueEnqueue;
 import org.eclipse.ecf.provider.Trace;
 import org.eclipse.ecf.provider.generic.gmm.Member;
 
@@ -838,13 +838,13 @@ public abstract class SOContainer implements ISharedObjectContainer {
 	}
 
 	protected SOContext makeNewSharedObjectContext(SOConfig config,
-			QueueEnqueue queue) {
+			IQueueEnqueue queue) {
 		return new SOContext(config.getSharedObjectID(), config
 				.getHomeContainerID(), this, config.getProperties(), queue);
 	}
 
 	protected SOContext makeNewRemoteSharedObjectContext(SOConfig config,
-			QueueEnqueue queue) {
+			IQueueEnqueue queue) {
 		return new SOContext(config.getSharedObjectID(), config
 				.getHomeContainerID(), this, config.getProperties(), queue);
 	}
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContext.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContext.java
index 9af211983..994ed7855 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContext.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContext.java
@@ -23,7 +23,7 @@ import org.eclipse.ecf.core.ISharedObjectManager;
 import org.eclipse.ecf.core.SharedObjectContainerJoinException;
 import org.eclipse.ecf.core.SharedObjectDescription;
 import org.eclipse.ecf.core.identity.ID;
-import org.eclipse.ecf.core.util.QueueEnqueue;
+import org.eclipse.ecf.core.util.IQueueEnqueue;
 import org.eclipse.ecf.provider.Trace;
 
 public class SOContext implements ISharedObjectContext {
@@ -33,10 +33,10 @@ public class SOContext implements ISharedObjectContext {
     protected ID homeContainerID;
     protected boolean isActive;
     protected Map properties;
-    protected QueueEnqueue queue;
+    protected IQueueEnqueue queue;
 
     public SOContext(ID objID, ID homeID, SOContainer cont, Map props,
-            QueueEnqueue queue) {
+            IQueueEnqueue queue) {
         super();
         this.sharedObjectID = objID;
         this.homeContainerID = homeID;
@@ -97,7 +97,7 @@ public class SOContext implements ISharedObjectContext {
      * 
      * @see org.eclipse.ecf.core.ISharedObjectContext#getQueue()
      */
-    public synchronized QueueEnqueue getQueue() {
+    public synchronized IQueueEnqueue getQueue() {
         if (isInactive()) {
             return null;
         }
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOManager.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOManager.java
index 81b218eb6..6bdb2c946 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOManager.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOManager.java
@@ -40,7 +40,7 @@ import org.eclipse.ecf.core.events.SharedObjectManagerDisconnectEvent;
 import org.eclipse.ecf.core.events.SharedObjectManagerRemoveEvent;
 import org.eclipse.ecf.core.identity.ID;
 import org.eclipse.ecf.core.util.AbstractFactory;
-import org.eclipse.ecf.core.util.QueueEnqueue;
+import org.eclipse.ecf.core.util.IQueueEnqueue;
 import org.eclipse.ecf.provider.Trace;
 
 /**
@@ -267,7 +267,7 @@ public class SOManager implements ISharedObjectManager {
 			if (wrap == null)
 				throw new SharedObjectConnectException("sender object "
 						+ sharedObjectFrom.getName() + " not found");
-			QueueEnqueue[] queues = new QueueEnqueue[sharedObjectsTo.length];
+			IQueueEnqueue[] queues = new IQueueEnqueue[sharedObjectsTo.length];
 			for (int i = 0; i < sharedObjectsTo.length; i++) {
 				SOWrapper w = container
 						.getSharedObjectWrapper(sharedObjectsTo[i]);
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 86d5327da..a5bcf9020 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
@@ -12,7 +12,7 @@ package org.eclipse.ecf.core;
 import java.io.IOException;
 
 import org.eclipse.ecf.core.identity.ID;
-import org.eclipse.ecf.core.util.QueueEnqueue;
+import org.eclipse.ecf.core.util.IQueueEnqueue;
 
 /**
  * Context reference provided to all ISharedObjects upon initialization.  Implementers of
@@ -40,16 +40,16 @@ public interface ISharedObjectContext {
      */
     public ISharedObjectManager getSharedObjectManager();
     /**
-     * Get the QueueEnqueue instance associated with this ISharedObject. If the
+     * Get the IQueueEnqueue instance associated with this ISharedObject. If the
      * given container provides a queue for this ISharedObject, this method will
-     * return a QueueEnqueue reference to the appropriate queue.
+     * return a IQueueEnqueue reference to the appropriate queue.
      * 
-     * @return QueueEnqueue instance if an active queue is associated with this
+     * @return IQueueEnqueue instance if an active queue is associated with this
      *         ISharedObject. If no active queue is associated with the
      *         ISharedObject, returns null.
      *  
      */
-    public QueueEnqueue getQueue();
+    public IQueueEnqueue getQueue();
 
     /**
      * (non-Javadoc)
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/AsynchResult.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/AsynchResult.java
index a93cb9bac..76bf15ee0 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/AsynchResult.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/AsynchResult.java
@@ -18,7 +18,7 @@ public class AsynchResult {
 
     public AsynchResult() {
     }
-    public Runnable setter(final Callable function) {
+    public Runnable setter(final ICallable function) {
         return new Runnable() {
             public void run() {
                 try {
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/Callable.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ICallable.java
index a74b87fec..286817f37 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/Callable.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ICallable.java
@@ -9,7 +9,7 @@
 
 package org.eclipse.ecf.core.util;
 
-public interface Callable {
+public interface ICallable {
     /** Perform some action that returns a result or throws an exception * */
     Object call() throws Throwable;
 }
\ No newline at end of file
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/EnqueuePredicate.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/IEnqueuePredicate.java
index a271ffa16..62191ada2 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/EnqueuePredicate.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/IEnqueuePredicate.java
@@ -9,6 +9,6 @@
 
 package org.eclipse.ecf.core.util;
 
-public interface EnqueuePredicate {
+public interface IEnqueuePredicate {
     boolean accept(Event element);
 }
\ No newline at end of file
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/EventProcessor.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/IEventProcessor.java
index 43976300c..116329ece 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/EventProcessor.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/IEventProcessor.java
@@ -9,6 +9,6 @@
 
 package org.eclipse.ecf.core.util;
 
-public interface EventProcessor {
-    public Object processEvent(Event e) throws Exception;
+public interface IEventProcessor {
+    public Object processEvent(Event e);
 }
\ No newline at end of file
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/Queue.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/IQueue.java
index d263aca27..30fc7fe26 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/Queue.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/IQueue.java
@@ -9,6 +9,6 @@
 
 package org.eclipse.ecf.core.util;
 
-public interface Queue extends QueueDequeue, QueueEnqueue {
+public interface IQueue extends IQueueDequeue, IQueueEnqueue {
 
 }
\ No newline at end of file
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/QueueDequeue.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/IQueueDequeue.java
index fece9c311..118181e01 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/QueueDequeue.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/IQueueDequeue.java
@@ -9,7 +9,7 @@
 
 package org.eclipse.ecf.core.util;
 
-public interface QueueDequeue {
+public interface IQueueDequeue {
     /*
      * Dequeue a single event. Returns null if no Events available for dequeue
      * @return Event the Event dequeued. Null if queue is empty.
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/QueueEnqueue.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/IQueueEnqueue.java
index 68ad13419..6393ad623 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/QueueEnqueue.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/IQueueEnqueue.java
@@ -9,7 +9,7 @@
 
 package org.eclipse.ecf.core.util;
 
-public interface QueueEnqueue {
+public interface IQueueEnqueue {
     void enqueue(Event element) throws QueueException;
     void enqueue(Event[] elements) throws QueueException;
 
@@ -20,9 +20,9 @@ public interface QueueEnqueue {
 
     boolean enqueue_lossy(Event element);
 
-    void setEnqueuePredicate(EnqueuePredicate pred);
+    void setEnqueuePredicate(IEnqueuePredicate pred);
 
-    EnqueuePredicate getEnqueuePredicate();
+    IEnqueuePredicate getEnqueuePredicate();
 
     int size();
 
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/SimpleQueue.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ISimpleQueue.java
index 15c67c6d0..e6f45b406 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/SimpleQueue.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ISimpleQueue.java
@@ -9,7 +9,7 @@
 
 package org.eclipse.ecf.core.util;
 
-public interface SimpleQueue {
+public interface ISimpleQueue {
 
     public boolean enqueue(Object obj);
     public Object dequeue();
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/QueueException.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/QueueException.java
index 8ce5a2039..77c280f7a 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/QueueException.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/QueueException.java
@@ -9,15 +9,15 @@
 
 package org.eclipse.ecf.core.util;
 
-public class QueueException extends Exception {
+public class QueueException extends ECFException {
 
-    Queue theQueue = null;
+    IQueue theQueue = null;
 
     public QueueException() {
         super();
     }
 
-    public QueueException(Queue queue) {
+    public QueueException(IQueue queue) {
         theQueue = queue;
     }
     public QueueException(String message) {
@@ -29,7 +29,7 @@ public class QueueException extends Exception {
     public QueueException(Throwable cause) {
         super(cause);
     }
-    public Queue getQueue() {
+    public IQueue getQueue() {
         return theQueue;
     }
 }
\ No newline at end of file
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/SimpleQueueImpl.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/SimpleQueueImpl.java
index 34d2e831c..46a5b8fa7 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/SimpleQueueImpl.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/SimpleQueueImpl.java
@@ -13,7 +13,7 @@ import java.util.List;
 import java.util.LinkedList;
 
 
-public class SimpleQueueImpl implements SimpleQueue {
+public class SimpleQueueImpl implements ISimpleQueue {
     List list;
     boolean stopped;