[cp-patches] [generics] Patch: FYI: Queue

[Tom Tromey]

This adds the new Queue interface and updates List to implement it.

Tom

Index: ChangeLog
from  Tom Tromey  <address@hidden>
        * java/util/AbstractQueue.java: New file.
        * java/util/LinkedList.java (element): New method.
        (offer): Likewise.
        (peek): Likewise.
        (poll): Likewise.
        (remove): Likewise.
        (LinkedList): Implement Queue.
        * java/util/Queue.java: New file.

Index: java/util/AbstractQueue.java
===================================================================
RCS file: java/util/AbstractQueue.java
diff -N java/util/AbstractQueue.java
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ java/util/AbstractQueue.java 7 Aug 2004 20:30:50 -0000
@@ -0,0 +1,86 @@
+/* AbstractQueue.java -- Implementation of some Queue methods
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package java.util;
+
+/**
+ * @since 1.5
+ */
+public class AbstractQueue<T> extends AbstractCollection<T> implements Queue<T>
+{
+  protected AbstractQueue()
+  {
+  }
+
+  public boolean add(T value)
+  {
+    if (offer(value))
+      return true;
+    throw new IllegalStateException();
+  }
+
+  public boolean addAll(Collection<? extends T> c)
+  {
+    if (c == this)
+      throw new IllegalArgumentException();
+    for (T val : c)
+      add(val);
+  }
+
+  public void clear()
+  {
+    while (poll() != null)
+      ;
+  }
+
+  public t element()
+  {
+    T result = peek();
+    if (result == null)
+      throw new NoSuchElementException();
+    return result;
+  }
+
+  public T remove()
+  {
+    T result = poll();
+    if (result == null)
+      throw new NoSuchElementException();
+    return result;
+  }
+}
Index: java/util/LinkedList.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/LinkedList.java,v
retrieving revision 1.23.2.1
diff -u -r1.23.2.1 LinkedList.java
--- java/util/LinkedList.java 5 Aug 2004 21:09:36 -0000 1.23.2.1
+++ java/util/LinkedList.java 7 Aug 2004 20:30:50 -0000
@@ -72,7 +72,7 @@
  * @status missing javadoc, but complete to 1.4
  */
 public class LinkedList<T> extends AbstractSequentialList<T>
-  implements List<T>, Cloneable, Serializable
+  implements List<T>, Queue<T>, Cloneable, Serializable
 {
   /**
    * Compatible with JDK 1.2.
@@ -708,6 +708,50 @@
   }
 
   /**
+   * @since 1.5
+   */
+  public boolean offer(T value)
+  {
+    return add(value);
+  }
+
+  /**
+   * @since 1.5
+   */
+  public T element()
+  {
+    return getFirst();
+  }
+
+  /**
+   * @since 1.5
+   */
+  public T peek()
+  {
+    if (size == 0)
+      return null;
+    return getFirst();
+  }
+
+  /**
+   * @since 1.5
+   */
+  public T poll()
+  {
+    if (size == 0)
+      return null;
+    return removeFirst();
+  }
+
+  /**
+   * @since 1.5
+   */
+  public T remove()
+  {
+    return removeFirst();
+  }
+
+  /**
    * Serializes this object to the given stream.
    *
    * @param s the stream to write to
Index: java/util/Queue.java
===================================================================
RCS file: java/util/Queue.java
diff -N java/util/Queue.java
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ java/util/Queue.java 7 Aug 2004 20:30:50 -0000
@@ -0,0 +1,51 @@
+/* Queue.java -- Interface that represents a queue
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package java.util;
+
+/**
+ * @since 1.5
+ */
+public interface Queue<T> extends Collection<T>
+{
+  T element();
+  boolean offer(T value);
+  T peek();
+  T poll();
+  T remove();
+}