--- experimental/server/Queue/Queue.java	2001/01/02 01:50:17	1.3
+++ experimental/server/Queue/Queue.java	2001/01/30 02:13:09	1.6
@@ -1,9 +1,10 @@
 //---PACKAGE DECLARATION---
+package uk.ac.ukc.iscream.util;
 
 //---IMPORTS---
 import java.util.LinkedList;
 import java.util.NoSuchElementException;
-//import uk.ac.ukc.iscream.util.*;
+import uk.ac.ukc.iscream.util.*;
 
 /**
  * A Queue class designed to operate in a multi-threaded environment, with
@@ -12,16 +13,16 @@ import java.util.NoSuchElementException;
  * actually contains some elements.
  *
  * @author  $Author: tdb $
- * @version $Id: Queue.java,v 1.3 2001/01/02 01:50:17 tdb Exp $
+ * @version $Id: Queue.java,v 1.6 2001/01/30 02:13:09 tdb Exp $
  */
-class Queue {
+public class Queue {
 
 //---FINAL ATTRIBUTES---
 
     /**
      * The current CVS revision of this class
      */
-    public static final String REVISION = "$Revision: 1.3 $";
+    public static final String REVISION = "$Revision: 1.6 $";
     
 //---STATIC METHODS---
 
@@ -61,6 +62,7 @@ class Queue {
      * This method returns an object from the front of a given queue.
      * It will block until data exists in the queue if required.
      *
+     * @param The queue to retrieve data from.
      * @return The object from the front of the queue.
      * @throws InvalidQueueException if the queue does not exist.
      */
@@ -87,8 +89,36 @@ class Queue {
         }
         return o;
     }
-       
+    
     /**
+     * This method releases a get() method that's currently
+     * waiting on an empty queue. This was designed for
+     * shutdown() type methods that may have problems closing
+     * if the thread of control is waiting on a queue.
+     *
+     * @param queue the queue to release.
+     */
+    public void releaseQueue(int queue) {
+        synchronized(((LinkedList) _lists.get(queue))) {
+                ((LinkedList) _lists.get(queue)).notifyAll();
+        }
+    }
+
+    /**
+     * This method erases the contents of a given queue. This
+     * method should be used with care. It can only empty one
+     * internal queue, not all of them. This must be called
+     * multiple times to empty all queues.
+     *
+     * @param queue the queue to empty.
+     */
+    public void clearQueue(int queue) {
+        synchronized(this) {
+            ((LinkedList) _lists.get(queue)).clear();
+        }
+    }
+    
+    /**
      * This method returns a textual status of the queues. It
      * is merely for observation, and would most likely be used
      * by a larger "monitoring" component. Information returned
@@ -115,6 +145,32 @@ class Queue {
     }
     
     /**
+     * Returns the size of a given queue. A consumer can use
+     * this to see how big their queue is at any given time.
+     * they should use their queue number as the parameter.
+     *
+     * @param queue The queue number to query.
+     * @return the current size of the queue.
+     * @throws InvalidQueueException if the queue does not exist.
+     */
+    public int queueSize(int queue) throws InvalidQueueException {
+        if (queue >= _lists.size() || _lists.get(queue) == null) {
+            throw new InvalidQueueException("Requested queue "+queue+" does not exist");
+        }
+        return ((LinkedList) _lists.get(queue)).size();
+    }
+    
+    /**
+     * Returns the total numer of elements to have passed
+     * through this queue (ie. a counter on the add method).
+     *
+     * @return the element-ometer.
+     */
+    public int elementCount() {
+        return _count;
+    }
+    
+    /**
      * This method assigns a queue to a consumer. The idea behind
      * this is to ensure that only 1 consumer can be associated with
      * a given queue, otherwise the whole "blocking" thing fails
@@ -160,14 +216,14 @@ class Queue {
      * This uses the uk.ac.ukc.iscream.util.FormatName class
      * to format the toString()
      *
-     * @return the name of this class and its CVS revision
+     * @return the name of this class and its CVS revision.
      */
-    /*public String toString() {
+    public String toString() {
         return FormatName.getName(
             _name,
             getClass().getName(),
             REVISION);
-    }*/
+    }
 
 //---PRIVATE METHODS---
 
@@ -195,13 +251,7 @@ class Queue {
      * can be placed here.  This name could also
      * be changed to null for utility classes.
      */
-    //private String _name = <!THIS SHOULD CALL A STATIC NAME IN THE COMPONENT CLASS FOR THIS OBJECT!>;
-
-    /**
-     * This holds a reference to the
-     * system logger that is being used.
-     */
-    //private Logger _logger = ReferenceManager.getInstance().getLogger();
+    private String _name = null;
 
 //---STATIC ATTRIBUTES---