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.55 by jsr166, Thu May 2 06:02:17 2013 UTC vs.
Revision 1.70 by jsr166, Sat Sep 19 19:53:11 2015 UTC

#	Line 4 | Line 4
4		*/
5
6		package java.util;
7	+
8		import java.io.Serializable;
9		import java.util.function.Consumer;
9	–	import java.util.stream.Stream;
10
11		/**
12		* Resizable-array implementation of the {@link Deque} interface.  Array
#	Line 53 | Line 53 | import java.util.stream.Stream;
53		*
54		* @author  Josh Bloch and Doug Lea
55		* @since   1.6
56	<	* @param <E> the type of elements held in this collection
56	>	* @param <E> the type of elements held in this deque
57		*/
58		public class ArrayDeque<E> extends AbstractCollection<E>
59		implements Deque<E>, Cloneable, Serializable
#	Line 109 | Line 109 | public class ArrayDeque<E> extends Abstr
109		initialCapacity |= (initialCapacity >>> 16);
110		initialCapacity++;
111
112	<	if (initialCapacity < 0)   // Too many elements, must back off
113	<	initialCapacity >>>= 1;// Good luck allocating 2 ^ 30 elements
112	>	if (initialCapacity < 0)    // Too many elements, must back off
113	>	initialCapacity >>>= 1; // Good luck allocating 2^30 elements
114		}
115		elements = new Object[initialCapacity];
116		}
#	Line 247 | Line 247 | public class ArrayDeque<E> extends Abstr
247		}
248
249		public E pollFirst() {
250	<	int h = head;
250	>	final Object[] elements = this.elements;
251	>	final int h = head;
252		@SuppressWarnings("unchecked")
253		E result = (E) elements[h];
254		// Element is null if deque empty
255	<	if (result == null)
256	<	return null;
257	<	elements[h] = null;     // Must null out slot
258	<	head = (h + 1) & (elements.length - 1);
255	>	if (result != null) {
256	>	elements[h] = null; // Must null out slot
257	>	head = (h + 1) & (elements.length - 1);
258	>	}
259		return result;
260		}
261
262		public E pollLast() {
263	<	int t = (tail - 1) & (elements.length - 1);
263	>	final Object[] elements = this.elements;
264	>	final int t = (tail - 1) & (elements.length - 1);
265		@SuppressWarnings("unchecked")
266		E result = (E) elements[t];
267	<	if (result == null)
268	<	return null;
269	<	elements[t] = null;
270	<	tail = t;
267	>	if (result != null) {
268	>	elements[t] = null;
269	>	tail = t;
270	>	}
271		return result;
272		}
273
#	Line 315 | Line 317 | public class ArrayDeque<E> extends Abstr
317		* @return {@code true} if the deque contained the specified element
318		*/
319		public boolean removeFirstOccurrence(Object o) {
320	<	if (o == null)
321	<	return false;
322	<	int mask = elements.length - 1;
323	<	int i = head;
324	<	Object x;
325	<	while ( (x = elements[i]) != null) {
326	<	if (o.equals(x)) {
327	<	delete(i);
326	<	return true;
320	>	if (o != null) {
321	>	int mask = elements.length - 1;
322	>	int i = head;
323	>	for (Object x; (x = elements[i]) != null; i = (i + 1) & mask) {
324	>	if (o.equals(x)) {
325	>	delete(i);
326	>	return true;
327	>	}
328		}
328	–	i = (i + 1) & mask;
329		}
330		return false;
331		}
#	Line 343 | Line 343 | public class ArrayDeque<E> extends Abstr
343		* @return {@code true} if the deque contained the specified element
344		*/
345		public boolean removeLastOccurrence(Object o) {
346	<	if (o == null)
347	<	return false;
348	<	int mask = elements.length - 1;
349	<	int i = (tail - 1) & mask;
350	<	Object x;
351	<	while ( (x = elements[i]) != null) {
352	<	if (o.equals(x)) {
353	<	delete(i);
354	<	return true;
346	>	if (o != null) {
347	>	int mask = elements.length - 1;
348	>	int i = (tail - 1) & mask;
349	>	for (Object x; (x = elements[i]) != null; i = (i - 1) & mask) {
350	>	if (o.equals(x)) {
351	>	delete(i);
352	>	return true;
353	>	}
354		}
356	–	i = (i - 1) & mask;
355		}
356		return false;
357		}
#	Line 610 | Line 608 | public class ArrayDeque<E> extends Abstr
608		}
609		lastRet = -1;
610		}
611	+
612	+	public void forEachRemaining(Consumer<? super E> action) {
613	+	Objects.requireNonNull(action);
614	+	Object[] a = elements;
615	+	int m = a.length - 1, f = fence, i = cursor;
616	+	cursor = f;
617	+	while (i != f) {
618	+	@SuppressWarnings("unchecked") E e = (E)a[i];
619	+	i = (i + 1) & m;
620	+	if (e == null)
621	+	throw new ConcurrentModificationException();
622	+	action.accept(e);
623	+	}
624	+	}
625		}
626
627		/**
#	Line 658 | Line 670 | public class ArrayDeque<E> extends Abstr
670		* @return {@code true} if this deque contains the specified element
671		*/
672		public boolean contains(Object o) {
673	<	if (o == null)
674	<	return false;
675	<	int mask = elements.length - 1;
676	<	int i = head;
677	<	Object x;
678	<	while ( (x = elements[i]) != null) {
679	<	if (o.equals(x))
668	<	return true;
669	<	i = (i + 1) & mask;
673	>	if (o != null) {
674	>	int mask = elements.length - 1;
675	>	int i = head;
676	>	for (Object x; (x = elements[i]) != null; i = (i + 1) & mask) {
677	>	if (o.equals(x))
678	>	return true;
679	>	}
680		}
681		return false;
682		}
#	Line 752 | Line 762 | public class ArrayDeque<E> extends Abstr
762		* The following code can be used to dump the deque into a newly
763		* allocated array of {@code String}:
764		*
765	<	*  <pre> {@code String[] y = x.toArray(new String[0]);}</pre>
765	>	* <pre> {@code String[] y = x.toArray(new String[0]);}</pre>
766		*
767		* Note that {@code toArray(new Object[0])} is identical in function to
768		* {@code toArray()}.
#	Line 810 | Line 820 | public class ArrayDeque<E> extends Abstr
820		/**
821		* Saves this deque to a stream (that is, serializes it).
822		*
823	+	* @param s the stream
824	+	* @throws java.io.IOException if an I/O error occurs
825		* @serialData The current size ({@code int}) of the deque,
826		* followed by all of its elements (each an object reference) in
827		* first-to-last order.
#	Line 829 | Line 841 | public class ArrayDeque<E> extends Abstr
841
842		/**
843		* Reconstitutes this deque from a stream (that is, deserializes it).
844	+	* @param s the stream
845	+	* @throws ClassNotFoundException if the class of a serialized object
846	+	*         could not be found
847	+	* @throws java.io.IOException if an I/O error occurs
848		*/
849		private void readObject(java.io.ObjectInputStream s)
850		throws java.io.IOException, ClassNotFoundException {
#	Line 845 | Line 861 | public class ArrayDeque<E> extends Abstr
861		elements[i] = s.readObject();
862		}
863
864	+	/**
865	+	* Creates a <em><a href="Spliterator.html#binding">late-binding</a></em>
866	+	* and <em>fail-fast</em> {@link Spliterator} over the elements in this
867	+	* deque.
868	+	*
869	+	* <p>The {@code Spliterator} reports {@link Spliterator#SIZED},
870	+	* {@link Spliterator#SUBSIZED}, {@link Spliterator#ORDERED}, and
871	+	* {@link Spliterator#NONNULL}.  Overriding implementations should document
872	+	* the reporting of additional characteristic values.
873	+	*
874	+	* @return a {@code Spliterator} over the elements in this deque
875	+	* @since 1.8
876	+	*/
877		public Spliterator<E> spliterator() {
878	<	return new DeqSpliterator<E>(this, -1, -1);
878	>	return new DeqSpliterator<>(this, -1, -1);
879		}
880
881		static final class DeqSpliterator<E> implements Spliterator<E> {
#	Line 901 | Line 930 | public class ArrayDeque<E> extends Abstr
930		throw new NullPointerException();
931		Object[] a = deq.elements;
932		int m = a.length - 1, f = getFence(), i = index;
933	<	if (i != fence) {
933	>	if (i != f) {
934		@SuppressWarnings("unchecked") E e = (E)a[i];
935		index = (i + 1) & m;
936		if (e == null)

Diff Legend

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