--- jsr166/src/main/java/util/PriorityQueue.java 2013/02/17 23:36:16 1.89 +++ jsr166/src/main/java/util/PriorityQueue.java 2013/02/26 17:28:00 1.93 @@ -795,17 +795,17 @@ public class PriorityQueue extends Ab 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 - /** Create 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; @@ -822,11 +822,11 @@ public class PriorityQueue extends Ab } return hi; } - + public PriorityQueueSpliterator trySplit() { int hi = getFence(), lo = index, mid = (lo + hi) >>> 1; return (lo >= mid) ? null : - new PriorityQueueSpliterator(pq, lo, index = mid, + new PriorityQueueSpliterator(pq, lo, index = mid, expectedModCount); } @@ -875,8 +875,8 @@ public class PriorityQueue extends Ab return false; } - public long estimateSize() { - return (long) (getFence() - index); + public long estimateSize() { + return (long) (getFence() - index); } public int characteristics() {