svn commit: r659334 - in /mina/branches/buffer/core/src/main/java/org/apache/mina/queue: IoQueueWrapper.java QueueWrapper.java

[tr...@apache.org]

Author: trustin
Date: Thu May 22 17:28:59 2008
New Revision: 659334

URL: http://svn.apache.org/viewvc?rev=659334&view=rev
Log:
* Changed IoQueueWrapper to extend QueueWrapper
* Fixed JavaDoc error in QueueWrapper

Modified:
    mina/branches/buffer/core/src/main/java/org/apache/mina/queue/IoQueueWrapper.java
    mina/branches/buffer/core/src/main/java/org/apache/mina/queue/QueueWrapper.java

Modified: mina/branches/buffer/core/src/main/java/org/apache/mina/queue/IoQueueWrapper.java
URL: http://svn.apache.org/viewvc/mina/branches/buffer/core/src/main/java/org/apache/mina/queue/IoQueueWrapper.java?rev=659334&r1=659333&r2=659334&view=diff
==============================================================================
--- mina/branches/buffer/core/src/main/java/org/apache/mina/queue/IoQueueWrapper.java (original)
+++ mina/branches/buffer/core/src/main/java/org/apache/mina/queue/IoQueueWrapper.java Thu May 22 17:28:59 2008
@@ -19,8 +19,6 @@
  */
 package org.apache.mina.queue;
 
-import java.util.Collection;
-import java.util.Iterator;
 
 /**
  * A skeletal decorator which wraps an existing {@link IoQueue} instance.
@@ -28,112 +26,20 @@
  * @author The Apache Directory Project (mina-dev@directory.apache.org)
  * @version $Rev$, $Date$
  */
-public class IoQueueWrapper<E> implements IoQueue<E> {
-
-    protected final IoQueue<E> q;
+public class IoQueueWrapper<E> extends QueueWrapper<E> {
 
     /**
      * Creates a new instance.
      */
-    public IoQueueWrapper(IoQueue<E> q) {
-        if (q == null) {
-            throw new NullPointerException("queue");
-        }
-        this.q = q;
-    }
-
-    public boolean add(E e) {
-        return q.add(e);
-    }
-
-    public E element() {
-        return q.element();
-    }
-
-    public boolean offer(E e) {
-        return q.offer(e);
-    }
-
-    public E peek() {
-        return q.peek();
-    }
-
-    public E poll() {
-        return q.poll();
-    }
-
-    public E remove() {
-        return q.remove();
-    }
-
-    public boolean addAll(Collection<? extends E> c) {
-        return q.addAll(c);
-    }
-
-    public void clear() {
-        q.clear();
-    }
-
-    public boolean contains(Object o) {
-        return q.contains(o);
-    }
-
-    public boolean containsAll(Collection<?> c) {
-        return q.containsAll(c);
-    }
-
-    public boolean isEmpty() {
-        return q.isEmpty();
-    }
-
-    public Iterator<E> iterator() {
-        return q.iterator();
-    }
-
-    public boolean remove(Object o) {
-        return q.remove(o);
-    }
-
-    public boolean removeAll(Collection<?> c) {
-        return q.removeAll(c);
-    }
-
-    public boolean retainAll(Collection<?> c) {
-        return q.retainAll(c);
-    }
-
-    public int size() {
-        return q.size();
-    }
-
-    public Object[] toArray() {
-        return q.toArray();
-    }
-
-    public <T> T[] toArray(T[] a) {
-        return q.toArray(a);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return q.equals(obj);
-    }
-
-    @Override
-    public int hashCode() {
-        return q.hashCode();
-    }
-
-    @Override
-    public String toString() {
-        return q.toString();
+    public IoQueueWrapper(IoQueue<E> queue) {
+        super(queue);
     }
 
     public void addListener(IoQueueListener<? super E> listener) {
-        q.addListener(listener);
+        ((IoQueue<E>) q).addListener(listener);
     }
 
     public void removeListener(IoQueueListener<? super E> listener) {
-        q.removeListener(listener);
+        ((IoQueue<E>) q).removeListener(listener);
     }
 }
\ No newline at end of file

Modified: mina/branches/buffer/core/src/main/java/org/apache/mina/queue/QueueWrapper.java
URL: http://svn.apache.org/viewvc/mina/branches/buffer/core/src/main/java/org/apache/mina/queue/QueueWrapper.java?rev=659334&r1=659333&r2=659334&view=diff
==============================================================================
--- mina/branches/buffer/core/src/main/java/org/apache/mina/queue/QueueWrapper.java (original)
+++ mina/branches/buffer/core/src/main/java/org/apache/mina/queue/QueueWrapper.java Thu May 22 17:28:59 2008
@@ -24,7 +24,7 @@
 import java.util.Queue;
 
 /**
- * A skeletal decorator which wraps an existing {@link IoQueue} instance.
+ * A skeletal decorator which wraps an existing {@link Queue} instance.
  *
  * @author The Apache Directory Project (mina-dev@directory.apache.org)
  * @version $Rev$, $Date$