--- jsr166/src/main/java/util/PriorityQueue.java 2013/02/18 03:10:15 1.91 +++ jsr166/src/main/java/util/PriorityQueue.java 2013/03/13 12:38:56 1.94 @@ -783,29 +783,21 @@ 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. + */ static final class PriorityQueueSpliterator implements Spliterator { - /* - * This is very similar to ArrayList Spliterator, except for - * extra null checks. - */ private final PriorityQueue pq; private int index; // current index, modified on advance/split private int fence; // -1 until first use private int expectedModCount; // initialized when fence set - /** Creates new spliterator covering the given range */ + /** Creates new spliterator covering the given range */ PriorityQueueSpliterator(PriorityQueue pq, int origin, int fence, int expectedModCount) { this.pq = pq; @@ -823,7 +815,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,