ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/main/java/util/PriorityQueue.java
(Generate patch)

Comparing jsr166/src/main/java/util/PriorityQueue.java (file contents):
Revision 1.92 by jsr166, Mon Feb 18 03:15:10 2013 UTC vs.
Revision 1.94 by dl, Wed Mar 13 12:38:56 2013 UTC

# Line 783 | Line 783 | public class PriorityQueue<E> extends Ab
783          heapify();
784      }
785  
786 <    final Spliterator<E> spliterator() {
786 >    public Spliterator<E> spliterator() {
787          return new PriorityQueueSpliterator<E>(this, 0, -1, 0);
788      }
789  
790 <    public Stream<E> stream() {
791 <        return Streams.stream(spliterator());
792 <    }
793 <
794 <    public Stream<E> parallelStream() {
795 <        return Streams.parallelStream(spliterator());
796 <    }
797 <
790 >    /**
791 >     * This is very similar to ArrayList Spliterator, except for extra
792 >     * null checks.
793 >     */
794      static final class PriorityQueueSpliterator<E> implements Spliterator<E> {
799        /*
800         * This is very similar to ArrayList Spliterator, except for
801         * extra null checks.
802         */
795          private final PriorityQueue<E> pq;
796          private int index;            // current index, modified on advance/split
797          private int fence;            // -1 until first use
# Line 823 | Line 815 | public class PriorityQueue<E> extends Ab
815              return hi;
816          }
817  
818 <        public PriorityQueueSpliterator<E> trySplit() {
818 >        public Spliterator<E> trySplit() {
819              int hi = getFence(), lo = index, mid = (lo + hi) >>> 1;
820              return (lo >= mid) ? null :
821                  new PriorityQueueSpliterator<E>(pq, lo, index = mid,

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines