ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/main/java/util/PriorityQueue.java

Comparing jsr166/src/main/java/util/PriorityQueue.java (file contents):
Revision 1.89 by dl, Sun Feb 17 23:36:16 2013 UTC vs.
Revision 1.93 by jsr166, Tue Feb 26 17:28:00 2013 UTC

#	Line 795 | Line 795 | public class PriorityQueue<E> extends Ab
795		return Streams.parallelStream(spliterator());
796		}
797
798	+	/**
799	+	* This is very similar to ArrayList Spliterator, except for extra
800	+	* null checks.
801	+	*/
802		static final class PriorityQueueSpliterator<E> implements Spliterator<E> {
799	–	/*
800	–	* This is very similar to ArrayList Spliterator, except for
801	–	* extra null checks.
802	–	*/
803		private final PriorityQueue<E> pq;
804		private int index;            // current index, modified on advance/split
805		private int fence;            // -1 until first use
806		private int expectedModCount; // initialized when fence set
807
808	<	/** Create new spliterator covering the given  range */
808	>	/** Creates new spliterator covering the given range */
809		PriorityQueueSpliterator(PriorityQueue<E> pq, int origin, int fence,
810		int expectedModCount) {
811		this.pq = pq;
#	Line 822 | Line 822 | public class PriorityQueue<E> extends Ab
822		}
823		return hi;
824		}
825	<
825	>
826		public PriorityQueueSpliterator<E> trySplit() {
827		int hi = getFence(), lo = index, mid = (lo + hi) >>> 1;
828		return (lo >= mid) ? null :
829	<	new PriorityQueueSpliterator<E>(pq, lo, index = mid,
829	>	new PriorityQueueSpliterator<E>(pq, lo, index = mid,
830		expectedModCount);
831		}
832
#	Line 875 | Line 875 | public class PriorityQueue<E> extends Ab
875		return false;
876		}
877
878	<	public long estimateSize() {
879	<	return (long) (getFence() - index);
878	>	public long estimateSize() {
879	>	return (long) (getFence() - index);
880		}
881
882		public int characteristics() {

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines