[jboss-cvs] JBoss Messaging SVN: r4421 - in trunk: src/main/org/jboss/messaging/core/list/impl and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: jmesnil
Date: 2008-06-10 10:11:52 -0400 (Tue, 10 Jun 2008)
New Revision: 4421

Modified:
   trunk/src/main/org/jboss/messaging/core/list/PriorityHeadInsertableQueue.java
   trunk/src/main/org/jboss/messaging/core/list/PriorityLinkedList.java
   trunk/src/main/org/jboss/messaging/core/list/impl/PriorityHeadInsertableQueueImpl.java
   trunk/tests/src/org/jboss/messaging/tests/unit/core/list/impl/PriorityHeadInsertableQueueTest.java
Log:
refactoring + unit test for PriorityHeadInsertableQueue
interfaces PriorityLinkedList & PriorityHeadInsertableQueue extends Iterable<T>

Modified: trunk/src/main/org/jboss/messaging/core/list/PriorityHeadInsertableQueue.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/list/PriorityHeadInsertableQueue.java	2008-06-10 13:19:40 UTC (rev 4420)
+++ trunk/src/main/org/jboss/messaging/core/list/PriorityHeadInsertableQueue.java	2008-06-10 14:11:52 UTC (rev 4421)
@@ -34,7 +34,7 @@
  *
  * $Id: PrioritizedDeque.java 1174 2006-08-02 14:14:32Z timfox $
  */
-public interface PriorityHeadInsertableQueue<T>
+public interface PriorityHeadInsertableQueue<T> extends Iterable<T>
 {
    void offerFirst(T t, int priority);
    

Modified: trunk/src/main/org/jboss/messaging/core/list/PriorityLinkedList.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/list/PriorityLinkedList.java	2008-06-10 13:19:40 UTC (rev 4420)
+++ trunk/src/main/org/jboss/messaging/core/list/PriorityLinkedList.java	2008-06-10 14:11:52 UTC (rev 4421)
@@ -34,7 +34,7 @@
  *
  * $Id: PrioritizedDeque.java 1174 2006-08-02 14:14:32Z timfox $
  */
-public interface PriorityLinkedList<T>
+public interface PriorityLinkedList<T> extends Iterable<T>
 {
    void addFirst(T t, int priority);
    

Modified: trunk/src/main/org/jboss/messaging/core/list/impl/PriorityHeadInsertableQueueImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/list/impl/PriorityHeadInsertableQueueImpl.java	2008-06-10 13:19:40 UTC (rev 4420)
+++ trunk/src/main/org/jboss/messaging/core/list/impl/PriorityHeadInsertableQueueImpl.java	2008-06-10 14:11:52 UTC (rev 4421)
@@ -168,7 +168,7 @@
       return new PriorityHeadInsertableQueueImplIterator();
    }
       
-   private class PriorityHeadInsertableQueueImplIterator implements ListIterator<T>
+   private class PriorityHeadInsertableQueueImplIterator implements Iterator<T>
    { 
       private int index;
       
@@ -181,11 +181,6 @@
          currentIter = queues[index].iterator();
       }
 
-      public void add(final Object obj)
-      {
-         throw new UnsupportedOperationException();
-      }
-
       public boolean hasNext()
       {
          if (currentIter.hasNext())
@@ -207,11 +202,6 @@
          return currentIter.hasNext();      
       }
       
-      public boolean hasPrevious()
-      {
-         throw new UnsupportedOperationException();
-      }
-
       public T next()
       {
          if (!hasNext())
@@ -221,31 +211,11 @@
          return currentIter.next();
       }
 
-      public int nextIndex()
-      {
-         throw new UnsupportedOperationException();
-      }
-
-      public T previous()
-      {
-         throw new UnsupportedOperationException();
-      }
-
-      public int previousIndex()
-      {
-         throw new UnsupportedOperationException();
-      }
-
       public void remove()
       {
          currentIter.remove();      
          
          size.decrementAndGet();
       }
-
-      public void set(final Object obj)
-      {
-         throw new UnsupportedOperationException();
-      }
    }   
 }

Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/list/impl/PriorityHeadInsertableQueueTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/list/impl/PriorityHeadInsertableQueueTest.java	2008-06-10 13:19:40 UTC (rev 4420)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/list/impl/PriorityHeadInsertableQueueTest.java	2008-06-10 14:11:52 UTC (rev 4421)
@@ -602,6 +602,19 @@
       assertTrue(queue.getAll().isEmpty());
    }
    
+   public void testIsEmpty() throws Exception
+   {
+      assertTrue(queue.isEmpty());
+
+      queue.offerLast(a, 0);
+
+      assertFalse(queue.isEmpty());
+
+      Wibble w = queue.poll();
+      assertEquals(a, w);
+      assertTrue(queue.isEmpty());
+   }
+
    class Wibble
    {
       String s;