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.60 by jsr166, Tue Dec 2 05:48:28 2014 UTC vs.
Revision 1.65 by jsr166, Sat Feb 28 20:35:47 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 251 | Line 251 | public class ArrayDeque<E> extends Abstr
251		@SuppressWarnings("unchecked")
252		E result = (E) elements[h];
253		// Element is null if deque empty
254	<	if (result == null)
255	<	return null;
256	<	elements[h] = null;     // Must null out slot
257	<	head = (h + 1) & (elements.length - 1);
254	>	if (result != null) {
255	>	elements[h] = null; // Must null out slot
256	>	head = (h + 1) & (elements.length - 1);
257	>	}
258		return result;
259		}
260
#	Line 262 | Line 262 | public class ArrayDeque<E> extends Abstr
262		int t = (tail - 1) & (elements.length - 1);
263		@SuppressWarnings("unchecked")
264		E result = (E) elements[t];
265	<	if (result == null)
266	<	return null;
267	<	elements[t] = null;
268	<	tail = t;
265	>	if (result != null) {
266	>	elements[t] = null;
267	>	tail = t;
268	>	}
269		return result;
270		}
271
#	Line 746 | Line 746 | public class ArrayDeque<E> extends Abstr
746		* The following code can be used to dump the deque into a newly
747		* allocated array of {@code String}:
748		*
749	<	*  <pre> {@code String[] y = x.toArray(new String[0]);}</pre>
749	>	* <pre> {@code String[] y = x.toArray(new String[0]);}</pre>
750		*
751		* Note that {@code toArray(new Object[0])} is identical in function to
752		* {@code toArray()}.
#	Line 901 | Line 901 | public class ArrayDeque<E> extends Abstr
901		throw new NullPointerException();
902		Object[] a = deq.elements;
903		int m = a.length - 1, f = getFence(), i = index;
904	<	if (i != fence) {
904	>	if (i != f) {
905		@SuppressWarnings("unchecked") E e = (E)a[i];
906		index = (i + 1) & m;
907		if (e == null)

Diff Legend

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