--- jsr166/src/main/java/util/PriorityQueue.java	2003/09/15 12:02:23	1.42
+++ jsr166/src/main/java/util/PriorityQueue.java	2004/06/02 23:45:46	1.50
@@ -1,7 +1,7 @@
 /*
  * %W% %E%
  *
- * Copyright 2003 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
  * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
  */
 
@@ -15,7 +15,7 @@ package java.util;
  * {@link java.util.Comparator}, depending on which constructor is
  * used. A priority queue does not permit <tt>null</tt> elements.
  * A priority queue relying on natural ordering also does not
- * permit insertion of non-comparable objects (doing so results
+ * permit insertion of non-comparable objects (doing so may result
  * in <tt>ClassCastException</tt>). 
  *
  * <p>The <em>head</em> of this queue is the <em>least</em> element
@@ -32,8 +32,10 @@ package java.util;
  * grows automatically.  The details of the growth policy are not
  * specified.
  *
- * <p>This class implements all of the <em>optional</em> methods of
- * the {@link Collection} and {@link Iterator} interfaces.  The
+ * <p>This class and its iterator implement all of the
+ * <em>optional</em> methods of the {@link Collection} and {@link
+ * Iterator} interfaces. 
+ * The
  * Iterator provided in method {@link #iterator()} is <em>not</em>
  * guaranteed to traverse the elements of the PriorityQueue in any
  * particular order. If you need ordered traversal, consider using
@@ -59,9 +61,10 @@ package java.util;
  * @since 1.5
  * @version %I%, %G%
  * @author Josh Bloch
+ * @param <E> the type of elements held in this collection
  */
 public class PriorityQueue<E> extends AbstractQueue<E>
-    implements Queue<E>, java.io.Serializable {
+    implements java.io.Serializable {
 
     private static final long serialVersionUID = -7720805057305804111L;
 
@@ -198,8 +201,7 @@ public class PriorityQueue<E> extends Ab
     public PriorityQueue(Collection<? extends E> c) {
         initializeArray(c);
         if (c instanceof SortedSet) {
-            // @fixme double-cast workaround for compiler
-            SortedSet<? extends E> s = (SortedSet<? extends E>) (SortedSet)c;
+            SortedSet<? extends E> s = (SortedSet<? extends E>)c;
             comparator = (Comparator<? super E>)s.comparator();
             fillFromSorted(s);
         } else if (c instanceof PriorityQueue) {
@@ -325,6 +327,10 @@ public class PriorityQueue<E> extends Ab
         return offer(o);
     }
 
+    /**
+     * Removes a single instance of the specified element from this
+     * queue, if it is present.
+     */
     public boolean remove(Object o) {
         if (o == null)
             return false;
@@ -456,7 +462,8 @@ public class PriorityQueue<E> extends Ab
     }
 
     /**
-     * Remove all elements from the priority queue.
+     * Removes all elements from the priority queue.
+     * The queue will be empty after this call returns.
      */
     public void clear() {
         modCount++;