--- jsr166/src/main/java/util/PriorityQueue.java 2013/02/26 17:28:00 1.93 +++ jsr166/src/main/java/util/PriorityQueue.java 2013/05/02 06:02:17 1.96 @@ -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. @@ -783,18 +782,10 @@ public class PriorityQueue extends Ab heapify(); } - final Spliterator spliterator() { + public Spliterator spliterator() { return new PriorityQueueSpliterator(this, 0, -1, 0); } - public Stream stream() { - return Streams.stream(spliterator()); - } - - public Stream parallelStream() { - return Streams.parallelStream(spliterator()); - } - /** * This is very similar to ArrayList Spliterator, except for extra * null checks. @@ -823,7 +814,7 @@ public class PriorityQueue extends Ab return hi; } - public PriorityQueueSpliterator trySplit() { + public Spliterator trySplit() { int hi = getFence(), lo = index, mid = (lo + hi) >>> 1; return (lo >= mid) ? null : new PriorityQueueSpliterator(pq, lo, index = mid, @@ -831,7 +822,7 @@ public class PriorityQueue extends Ab } @SuppressWarnings("unchecked") - public void forEach(Consumer action) { + public void forEachRemaining(Consumer action) { int i, hi, mc; // hoist accesses and checks from loop PriorityQueue q; Object[] a; if (action == null)