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.120 by jsr166, Sun Nov 20 15:49:25 2016 UTC vs.
Revision 1.123 by jsr166, Sat Nov 26 14:16:18 2016 UTC

#	Line 710 | Line 710 | public class ArrayDeque<E> extends Abstr
710		throw new NoSuchElementException();
711		final Object[] es = elements;
712		E e = nonNullElementAt(es, cursor);
713	<	lastRet = cursor;
714	<	cursor = inc(cursor, es.length);
713	>	cursor = inc(lastRet = cursor, es.length);
714		remaining--;
715		return e;
716		}
#	Line 759 | Line 758 | public class ArrayDeque<E> extends Abstr
758		throw new NoSuchElementException();
759		final Object[] es = elements;
760		E e = nonNullElementAt(es, cursor);
761	<	lastRet = cursor;
763	<	cursor = dec(cursor, es.length);
761	>	cursor = dec(lastRet = cursor, es.length);
762		remaining--;
763		return e;
764		}
#	Line 864 | Line 862 | public class ArrayDeque<E> extends Abstr
862		}
863
864		public boolean tryAdvance(Consumer<? super E> action) {
865	<	if (action == null)
868	<	throw new NullPointerException();
869	<	final int t, i;
870	<	if ((t = getFence()) == (i = cursor))
871	<	return false;
865	>	Objects.requireNonNull(action);
866		final Object[] es = elements;
867	+	if (fence < 0) { fence = tail; cursor = head; } // late-binding
868	+	final int i;
869	+	if ((i = cursor) == fence)
870	+	return false;
871	+	E e = nonNullElementAt(es, i);
872		cursor = inc(i, es.length);
873	<	action.accept(nonNullElementAt(es, i));
873	>	action.accept(e);
874		return true;
875		}
876

Diff Legend

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