--- jsr166/src/main/java/util/PriorityQueue.java	2013/02/26 17:28:00	1.93
+++ jsr166/src/main/java/util/PriorityQueue.java	2013/07/18 18:21:22	1.97
@@ -26,7 +26,6 @@
 package java.util;
 import java.util.function.Consumer;
 import java.util.stream.Stream;
-import java.util.stream.Streams;
 
 /**
  * An unbounded priority {@linkplain Queue queue} based on a priority heap.
@@ -744,6 +743,7 @@ public class PriorityQueue<E> extends Ab
      *             emitted (int), followed by all of its elements
      *             (each an {@code Object}) in the proper order.
      * @param s the stream
+     * @throws java.io.IOException if an I/O error occurs
      */
     private void writeObject(java.io.ObjectOutputStream s)
         throws java.io.IOException {
@@ -763,6 +763,9 @@ public class PriorityQueue<E> extends Ab
      * (that is, deserializes it).
      *
      * @param s the stream
+     * @throws ClassNotFoundException if the class of a serialized object
+     *         could not be found
+     * @throws java.io.IOException if an I/O error occurs
      */
     private void readObject(java.io.ObjectInputStream s)
         throws java.io.IOException, ClassNotFoundException {
@@ -783,18 +786,10 @@ public class PriorityQueue<E> extends Ab
         heapify();
     }
 
-    final Spliterator<E> spliterator() {
+    public Spliterator<E> spliterator() {
         return new PriorityQueueSpliterator<E>(this, 0, -1, 0);
     }
 
-    public Stream<E> stream() {
-        return Streams.stream(spliterator());
-    }
-
-    public Stream<E> parallelStream() {
-        return Streams.parallelStream(spliterator());
-    }
-
     /**
      * This is very similar to ArrayList Spliterator, except for extra
      * null checks.
@@ -823,7 +818,7 @@ public class PriorityQueue<E> extends Ab
             return hi;
         }
 
-        public PriorityQueueSpliterator<E> trySplit() {
+        public Spliterator<E> trySplit() {
             int hi = getFence(), lo = index, mid = (lo + hi) >>> 1;
             return (lo >= mid) ? null :
                 new PriorityQueueSpliterator<E>(pq, lo, index = mid,
@@ -831,7 +826,7 @@ public class PriorityQueue<E> extends Ab
         }
 
         @SuppressWarnings("unchecked")
-        public void forEach(Consumer<? super E> action) {
+        public void forEachRemaining(Consumer<? super E> action) {
             int i, hi, mc; // hoist accesses and checks from loop
             PriorityQueue<E> q; Object[] a;
             if (action == null)