ViewVC Help

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

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

Comparing jsr166/src/main/java/util/ArrayDeque.java (file contents):
Revision 1.51 by jsr166, Wed Feb 20 12:39:06 2013 UTC vs.
Revision 1.55 by jsr166, Thu May 2 06:02:17 2013 UTC

#	Line 7 | Line 7 | package java.util;
7		import java.io.Serializable;
8		import java.util.function.Consumer;
9		import java.util.stream.Stream;
10	–	import java.util.stream.Streams;
10
11		/**
12		* Resizable-array implementation of the {@link Deque} interface.  Array
#	Line 613 | Line 612 | public class ArrayDeque<E> extends Abstr
612		}
613		}
614
615	+	/**
616	+	* This class is nearly a mirror-image of DeqIterator, using tail
617	+	* instead of head for initial cursor, and head instead of tail
618	+	* for fence.
619	+	*/
620		private class DescendingIterator implements Iterator<E> {
617	–	/*
618	–	* This class is nearly a mirror-image of DeqIterator, using
619	–	* tail instead of head for initial cursor, and head instead of
620	–	* tail for fence.
621	–	*/
621		private int cursor = tail;
622		private int fence = head;
623		private int lastRet = -1;
#	Line 846 | Line 845 | public class ArrayDeque<E> extends Abstr
845		elements[i] = s.readObject();
846		}
847
848	<	Spliterator<E> spliterator() {
848	>	public Spliterator<E> spliterator() {
849		return new DeqSpliterator<E>(this, -1, -1);
850		}
851
853	–	public Stream<E> stream() {
854	–	return Streams.stream(spliterator());
855	–	}
856	–
857	–	public Stream<E> parallelStream() {
858	–	return Streams.parallelStream(spliterator());
859	–	}
860	–
852		static final class DeqSpliterator<E> implements Spliterator<E> {
853		private final ArrayDeque<E> deq;
854		private int fence;  // -1 until first use
#	Line 879 | Line 870 | public class ArrayDeque<E> extends Abstr
870		return t;
871		}
872
873	<	public DeqSpliterator<E> trySplit() {
873	>	public Spliterator<E> trySplit() {
874		int t = getFence(), h = index, n = deq.elements.length;
875		if (h != t && ((h + 1) & (n - 1)) != t) {
876		if (h > t)
#	Line 890 | Line 881 | public class ArrayDeque<E> extends Abstr
881		return null;
882		}
883
884	<	public void forEach(Consumer<? super E> consumer) {
884	>	public void forEachRemaining(Consumer<? super E> consumer) {
885		if (consumer == null)
886		throw new NullPointerException();
887		Object[] a = deq.elements;

Diff Legend

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