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.93 by jsr166, Tue Feb 26 17:28:00 2013 UTC vs.
Revision 1.97 by jsr166, Thu Jul 18 18:21:22 2013 UTC

#	Line 26 | Line 26
26		package java.util;
27		import java.util.function.Consumer;
28		import java.util.stream.Stream;
29	–	import java.util.stream.Streams;
29
30		/**
31		* An unbounded priority {@linkplain Queue queue} based on a priority heap.
#	Line 744 | Line 743 | public class PriorityQueue<E> extends Ab
743		*             emitted (int), followed by all of its elements
744		*             (each an {@code Object}) in the proper order.
745		* @param s the stream
746	+	* @throws java.io.IOException if an I/O error occurs
747		*/
748		private void writeObject(java.io.ObjectOutputStream s)
749		throws java.io.IOException {
#	Line 763 | Line 763 | public class PriorityQueue<E> extends Ab
763		* (that is, deserializes it).
764		*
765		* @param s the stream
766	+	* @throws ClassNotFoundException if the class of a serialized object
767	+	*         could not be found
768	+	* @throws java.io.IOException if an I/O error occurs
769		*/
770		private void readObject(java.io.ObjectInputStream s)
771		throws java.io.IOException, ClassNotFoundException {
#	Line 783 | Line 786 | public class PriorityQueue<E> extends Ab
786		heapify();
787		}
788
789	<	final Spliterator<E> spliterator() {
789	>	public Spliterator<E> spliterator() {
790		return new PriorityQueueSpliterator<E>(this, 0, -1, 0);
791		}
792
790	–	public Stream<E> stream() {
791	–	return Streams.stream(spliterator());
792	–	}
793	–
794	–	public Stream<E> parallelStream() {
795	–	return Streams.parallelStream(spliterator());
796	–	}
797	–
793		/**
794		* This is very similar to ArrayList Spliterator, except for extra
795		* null checks.
#	Line 823 | Line 818 | public class PriorityQueue<E> extends Ab
818		return hi;
819		}
820
821	<	public PriorityQueueSpliterator<E> trySplit() {
821	>	public Spliterator<E> trySplit() {
822		int hi = getFence(), lo = index, mid = (lo + hi) >>> 1;
823		return (lo >= mid) ? null :
824		new PriorityQueueSpliterator<E>(pq, lo, index = mid,
#	Line 831 | Line 826 | public class PriorityQueue<E> extends Ab
826		}
827
828		@SuppressWarnings("unchecked")
829	<	public void forEach(Consumer<? super E> action) {
829	>	public void forEachRemaining(Consumer<? super E> action) {
830		int i, hi, mc; // hoist accesses and checks from loop
831		PriorityQueue<E> q; Object[] a;
832		if (action == null)

Diff Legend

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