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.5 by dl, Tue Mar 22 01:29:00 2005 UTC vs.
Revision 1.81 by jsr166, Sat Oct 22 18:16:56 2016 UTC

#	Line 1 | Line 1
1		/*
2		* Written by Josh Bloch of Google Inc. and released to the public domain,
3	<	* as explained at http://creativecommons.org/licenses/publicdomain.
3	>	* as explained at http://creativecommons.org/publicdomain/zero/1.0/.
4		*/
5
6		package java.util;
7	<	import java.io.*;
7	>
8	>	import java.io.Serializable;
9	>	import java.util.function.Consumer;
10	>	import java.util.function.Predicate;
11	>	import java.util.function.UnaryOperator;
12
13		/**
14		* Resizable-array implementation of the {@link Deque} interface.  Array
#	Line 15 | Line 19 | import java.io.*;
19		* {@link Stack} when used as a stack, and faster than {@link LinkedList}
20		* when used as a queue.
21		*
22	<	* <p>Most <tt>ArrayDeque</tt> operations run in amortized constant time.
23	<	* Exceptions include {@link #remove(Object) remove}, {@link
24	<	* #removeFirstOccurrence removeFirstOccurrence}, {@link #removeLastOccurrence
25	<	* removeLastOccurrence}, {@link #contains contains }, {@link #iterator
26	<	* iterator.remove()}, and the bulk operations, all of which run in linear
27	<	* time.
22	>	* <p>Most {@code ArrayDeque} operations run in amortized constant time.
23	>	* Exceptions include
24	>	* {@link #remove(Object) remove},
25	>	* {@link #removeFirstOccurrence removeFirstOccurrence},
26	>	* {@link #removeLastOccurrence removeLastOccurrence},
27	>	* {@link #contains contains},
28	>	* {@link #iterator iterator.remove()},
29	>	* and the bulk operations, all of which run in linear time.
30		*
31	<	* <p>The iterators returned by this class's <tt>iterator</tt> method are
32	<	* <i>fail-fast</i>: If the deque is modified at any time after the iterator
33	<	* is created, in any way except through the iterator's own remove method, the
34	<	* iterator will generally throw a {@link ConcurrentModificationException}.
35	<	* Thus, in the face of concurrent modification, the iterator fails quickly
36	<	* and cleanly, rather than risking arbitrary, non-deterministic behavior at
37	<	* an undetermined time in the future.
31	>	* <p>The iterators returned by this class's {@link #iterator() iterator}
32	>	* method are <em>fail-fast</em>: If the deque is modified at any time after
33	>	* the iterator is created, in any way except through the iterator's own
34	>	* {@code remove} method, the iterator will generally throw a {@link
35	>	* ConcurrentModificationException}.  Thus, in the face of concurrent
36	>	* modification, the iterator fails quickly and cleanly, rather than risking
37	>	* arbitrary, non-deterministic behavior at an undetermined time in the
38	>	* future.
39		*
40		* <p>Note that the fail-fast behavior of an iterator cannot be guaranteed
41		* as it is, generally speaking, impossible to make any hard guarantees in the
42		* presence of unsynchronized concurrent modification.  Fail-fast iterators
43	<	* throw <tt>ConcurrentModificationException</tt> on a best-effort basis.
43	>	* throw {@code ConcurrentModificationException} on a best-effort basis.
44		* Therefore, it would be wrong to write a program that depended on this
45		* exception for its correctness: <i>the fail-fast behavior of iterators
46		* should be used only to detect bugs.</i>
47		*
48		* <p>This class and its iterator implement all of the
49	<	* optional methods of the {@link Collection} and {@link
50	<	* Iterator} interfaces.  This class is a member of the <a
51	<	* href="{@docRoot}/../guide/collections/index.html"> Java Collections
52	<	* Framework</a>.
49	>	* <em>optional</em> methods of the {@link Collection} and {@link
50	>	* Iterator} interfaces.
51	>	*
52	>	* <p>This class is a member of the
53	>	* <a href="{@docRoot}/../technotes/guides/collections/index.html">
54	>	* Java Collections Framework</a>.
55		*
56		* @author  Josh Bloch and Doug Lea
57	+	* @param <E> the type of elements held in this deque
58		* @since   1.6
49	–	* @param <E> the type of elements held in this collection
59		*/
60		public class ArrayDeque<E> extends AbstractCollection<E>
61		implements Deque<E>, Cloneable, Serializable
62		{
63		/**
64		* The array in which the elements of the deque are stored.
65	<	* The capacity of the deque is the length of this array, which is
66	<	* always a power of two. The array is never allowed to become
58	<	* full, except transiently within an addX method where it is
59	<	* resized (see doubleCapacity) immediately upon becoming full,
60	<	* thus avoiding head and tail wrapping around to equal each
61	<	* other.  We also guarantee that all array cells not holding
62	<	* deque elements are always null.
65	>	* We guarantee that all array cells not holding deque elements
66	>	* are always null.
67		*/
68	<	private transient E[] elements;
68	>	transient Object[] elements;
69
70		/**
71		* The index of the element at the head of the deque (which is the
72		* element that would be removed by remove() or pop()); or an
73	<	* arbitrary number equal to tail if the deque is empty.
70	<	*/
71	<	private transient int head;
72	<
73	<	/**
74	<	* The index at which the next element would be added to the tail
75	<	* of the deque (via addLast(E), add(E), or push(E)).
76	<	*/
77	<	private transient int tail;
78	<
79	<	/**
80	<	* The minimum capacity that we'll use for a newly created deque.
81	<	* Must be a power of 2.
73	>	* arbitrary number 0 <= head < elements.length if the deque is empty.
74		*/
75	<	private static final int MIN_INITIAL_CAPACITY = 8;
75	>	transient int head;
76
77	<	// ******  Array allocation and resizing utilities ******
77	>	/** Number of elements in this collection. */
78	>	transient int size;
79
80		/**
81	<	* Allocate empty array to hold the given number of elements.
82	<	*
83	<	* @param numElements  the number of elements to hold.
84	<	*/
85	<	private void allocateElements(int numElements) {
86	<	int initialCapacity = MIN_INITIAL_CAPACITY;
87	<	// Find the best power of two to hold elements.
88	<	// Tests "<=" because arrays aren't kept full.
89	<	if (numElements >= initialCapacity) {
90	<	initialCapacity = numElements;
91	<	initialCapacity |= (initialCapacity >>>  1);
92	<	initialCapacity |= (initialCapacity >>>  2);
93	<	initialCapacity |= (initialCapacity >>>  4);
94	<	initialCapacity |= (initialCapacity >>>  8);
95	<	initialCapacity |= (initialCapacity >>> 16);
96	<	initialCapacity++;
81	>	* The maximum size of array to allocate.
82	>	* Some VMs reserve some header words in an array.
83	>	* Attempts to allocate larger arrays may result in
84	>	* OutOfMemoryError: Requested array size exceeds VM limit
85	>	*/
86	>	private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
87	>
88	>	/**
89	>	* Increases the capacity of this deque by at least the given amount.
90	>	*
91	>	* @param needed the required minimum extra capacity; must be positive
92	>	*/
93	>	private void grow(int needed) {
94	>	// overflow-conscious code
95	>	// checkInvariants();
96	>	int oldCapacity = elements.length;
97	>	int newCapacity;
98	>	// Double size if small; else grow by 50%
99	>	int jump = (oldCapacity < 64) ? (oldCapacity + 2) : (oldCapacity >> 1);
100	>	if (jump < needed
101	>	|| (newCapacity = (oldCapacity + jump)) - MAX_ARRAY_SIZE > 0)
102	>	newCapacity = newCapacity(needed, jump);
103	>	elements = Arrays.copyOf(elements, newCapacity);
104	>	if (oldCapacity - head < size) {
105	>	// wrap around; slide first leg forward to end of array
106	>	int newSpace = newCapacity - oldCapacity;
107	>	System.arraycopy(elements, head,
108	>	elements, head + newSpace,
109	>	oldCapacity - head);
110	>	Arrays.fill(elements, head, head + newSpace, null);
111	>	head += newSpace;
112	>	}
113	>	// checkInvariants();
114	>	}
115
116	<	if (initialCapacity < 0)   // Too many elements, must back off
117	<	initialCapacity >>>= 1;// Good luck allocating 2 ^ 30 elements
116	>	/** Capacity calculation for edge conditions, especially overflow. */
117	>	private int newCapacity(int needed, int jump) {
118	>	int oldCapacity = elements.length;
119	>	int minCapacity;
120	>	if ((minCapacity = oldCapacity + needed) - MAX_ARRAY_SIZE > 0) {
121	>	if (minCapacity < 0)
122	>	throw new IllegalStateException("Sorry, deque too big");
123	>	return Integer.MAX_VALUE;
124		}
125	<	elements = (E[]) new Object[initialCapacity];
125	>	if (needed > jump)
126	>	return minCapacity;
127	>	return (oldCapacity + jump - MAX_ARRAY_SIZE < 0)
128	>	? oldCapacity + jump
129	>	: MAX_ARRAY_SIZE;
130		}
131
132		/**
133	<	* Double the capacity of this deque.  Call only when full, i.e.,
134	<	* when head and tail have wrapped around to become equal.
133	>	* Increases the internal storage of this collection, if necessary,
134	>	* to ensure that it can hold at least the given number of elements.
135	>	*
136	>	* @param minCapacity the desired minimum capacity
137	>	* @since TBD
138		*/
139	<	private void doubleCapacity() {
140	<	assert head == tail;
141	<	int p = head;
142	<	int n = elements.length;
119	<	int r = n - p; // number of elements to the right of p
120	<	int newCapacity = n << 1;
121	<	if (newCapacity < 0)
122	<	throw new IllegalStateException("Sorry, deque too big");
123	<	Object[] a = new Object[newCapacity];
124	<	System.arraycopy(elements, p, a, 0, r);
125	<	System.arraycopy(elements, 0, a, r, p);
126	<	elements = (E[])a;
127	<	head = 0;
128	<	tail = n;
139	>	/* public */ void ensureCapacity(int minCapacity) {
140	>	if (minCapacity > elements.length)
141	>	grow(minCapacity - elements.length);
142	>	// checkInvariants();
143		}
144
145		/**
146	<	* Copy the elements from our element array into the specified array,
133	<	* in order (from first to last element in the deque).  It is assumed
134	<	* that the array is large enough to hold all elements in the deque.
146	>	* Minimizes the internal storage of this collection.
147		*
148	<	* @return its argument
148	>	* @since TBD
149		*/
150	<	private <T> T[] copyElements(T[] a) {
151	<	if (head < tail) {
152	<	System.arraycopy(elements, head, a, 0, size());
153	<	} else if (head > tail) {
142	<	int headPortionLen = elements.length - head;
143	<	System.arraycopy(elements, head, a, 0, headPortionLen);
144	<	System.arraycopy(elements, 0, a, headPortionLen, tail);
150	>	/* public */ void trimToSize() {
151	>	if (size < elements.length) {
152	>	elements = toArray();
153	>	head = 0;
154		}
155	<	return a;
155	>	// checkInvariants();
156		}
157
158		/**
#	Line 151 | Line 160 | public class ArrayDeque<E> extends Abstr
160		* sufficient to hold 16 elements.
161		*/
162		public ArrayDeque() {
163	<	elements = (E[]) new Object[16];
163	>	elements = new Object[16];
164		}
165
166		/**
167		* Constructs an empty array deque with an initial capacity
168		* sufficient to hold the specified number of elements.
169		*
170	<	* @param numElements  lower bound on initial capacity of the deque
170	>	* @param numElements lower bound on initial capacity of the deque
171		*/
172		public ArrayDeque(int numElements) {
173	<	allocateElements(numElements);
173	>	elements = new Object[numElements];
174		}
175
176		/**
#	Line 175 | Line 184 | public class ArrayDeque<E> extends Abstr
184		* @throws NullPointerException if the specified collection is null
185		*/
186		public ArrayDeque(Collection<? extends E> c) {
187	<	allocateElements(c.size());
188	<	addAll(c);
187	>	Object[] elements = c.toArray();
188	>	// defend against c.toArray (incorrectly) not returning Object[]
189	>	// (see e.g. https://bugs.openjdk.java.net/browse/JDK-6260652)
190	>	if (elements.getClass() != Object[].class)
191	>	elements = Arrays.copyOf(elements, size, Object[].class);
192	>	for (Object obj : elements)
193	>	Objects.requireNonNull(obj);
194	>	size = elements.length;
195	>	this.elements = elements;
196		}
197
198	<	// The main insertion and extraction methods are addFirst,
199	<	// addLast, pollFirst, pollLast. The other methods are defined in
200	<	// terms of these.
198	>	/**
199	>	* Increments i, mod modulus.
200	>	* Precondition and postcondition: 0 <= i < modulus.
201	>	*/
202	>	static final int inc(int i, int modulus) {
203	>	if (++i == modulus) i = 0;
204	>	return i;
205	>	}
206
207		/**
208	<	* Inserts the specified element at the front of this deque.
209	<	*
189	<	* @param e the element to insert
190	<	* @throws NullPointerException if <tt>e</tt> is null
208	>	* Decrements i, mod modulus.
209	>	* Precondition and postcondition: 0 <= i < modulus.
210		*/
211	<	public void addFirst(E e) {
212	<	if (e == null)
213	<	throw new NullPointerException();
195	<	elements[head = (head - 1) & (elements.length - 1)] = e;
196	<	if (head == tail)
197	<	doubleCapacity();
211	>	static final int dec(int i, int modulus) {
212	>	if (--i < 0) i += modulus;
213	>	return i;
214		}
215
216		/**
217	<	* Inserts the specified element to the end of this deque.
218	<	* This method is equivalent to {@link Collection#add} and
203	<	* {@link #push}.
204	<	*
205	<	* @param e the element to insert
206	<	* @throws NullPointerException if <tt>e</tt> is null
217	>	* Adds i and j, mod modulus.
218	>	* Precondition and postcondition: 0 <= i < modulus, 0 <= j <= modulus.
219		*/
220	<	public void addLast(E e) {
220	>	static final int add(int i, int j, int modulus) {
221	>	if ((i += j) - modulus >= 0) i -= modulus;
222	>	return i;
223	>	}
224	>
225	>	/**
226	>	* Returns the array index of the last element.
227	>	* May return invalid index -1 if there are no elements.
228	>	*/
229	>	final int tail() {
230	>	return add(head, size - 1, elements.length);
231	>	}
232	>
233	>	/**
234	>	* Returns element at array index i.
235	>	*/
236	>	@SuppressWarnings("unchecked")
237	>	final E elementAt(int i) {
238	>	return (E) elements[i];
239	>	}
240	>
241	>	/**
242	>	* A version of elementAt that checks for null elements.
243	>	* This check doesn't catch all possible comodifications,
244	>	* but does catch ones that corrupt traversal.
245	>	*/
246	>	E checkedElementAt(Object[] elements, int i) {
247	>	@SuppressWarnings("unchecked") E e = (E) elements[i];
248		if (e == null)
249	<	throw new NullPointerException();
250	<	elements[tail] = e;
212	<	if ( (tail = (tail + 1) & (elements.length - 1)) == head)
213	<	doubleCapacity();
249	>	throw new ConcurrentModificationException();
250	>	return e;
251		}
252
253	+	// The main insertion and extraction methods are addFirst,
254	+	// addLast, pollFirst, pollLast. The other methods are defined in
255	+	// terms of these.
256	+
257		/**
258	<	* Retrieves and removes the first element of this deque, or
218	<	* <tt>null</tt> if this deque is empty.
258	>	* Inserts the specified element at the front of this deque.
259		*
260	<	* @return the first element of this deque, or <tt>null</tt> if
261	<	*     this deque is empty
260	>	* @param e the element to add
261	>	* @throws NullPointerException if the specified element is null
262		*/
263	<	public E pollFirst() {
264	<	int h = head;
265	<	E result = elements[h]; // Element is null if deque empty
266	<	if (result == null)
267	<	return null;
268	<	elements[h] = null;     // Must null out slot
269	<	head = (h + 1) & (elements.length - 1);
270	<	return result;
263	>	public void addFirst(E e) {
264	>	// checkInvariants();
265	>	Objects.requireNonNull(e);
266	>	Object[] elements;
267	>	int capacity, s = size;
268	>	while (s == (capacity = (elements = this.elements).length))
269	>	grow(1);
270	>	elements[head = dec(head, capacity)] = e;
271	>	size = s + 1;
272		}
273
274		/**
275	<	* Retrieves and removes the last element of this deque, or
276	<	* <tt>null</tt> if this deque is empty.
275	>	* Inserts the specified element at the end of this deque.
276	>	*
277	>	* <p>This method is equivalent to {@link #add}.
278		*
279	<	* @return the last element of this deque, or <tt>null</tt> if
280	<	*     this deque is empty
279	>	* @param e the element to add
280	>	* @throws NullPointerException if the specified element is null
281		*/
282	<	public E pollLast() {
283	<	int t = (tail - 1) & (elements.length - 1);
284	<	E result = elements[t];
285	<	if (result == null)
286	<	return null;
287	<	elements[t] = null;
288	<	tail = t;
289	<	return result;
282	>	public void addLast(E e) {
283	>	// checkInvariants();
284	>	Objects.requireNonNull(e);
285	>	Object[] elements;
286	>	int capacity, s = size;
287	>	while (s == (capacity = (elements = this.elements).length))
288	>	grow(1);
289	>	elements[add(head, s, capacity)] = e;
290	>	size = s + 1;
291	>	}
292	>
293	>	/**
294	>	* Adds all of the elements in the specified collection at the end
295	>	* of this deque, as if by calling {@link #addLast} on each one,
296	>	* in the order that they are returned by the collection's
297	>	* iterator.
298	>	*
299	>	* @param c the elements to be inserted into this deque
300	>	* @return {@code true} if this deque changed as a result of the call
301	>	* @throws NullPointerException if the specified collection or any
302	>	*         of its elements are null
303	>	*/
304	>	@Override
305	>	public boolean addAll(Collection<? extends E> c) {
306	>	// checkInvariants();
307	>	Object[] a, elements;
308	>	int newcomers, capacity, s = size;
309	>	if ((newcomers = (a = c.toArray()).length) == 0)
310	>	return false;
311	>	while ((capacity = (elements = this.elements).length) - s < newcomers)
312	>	grow(newcomers - (capacity - s));
313	>	int i = add(head, s, capacity);
314	>	for (Object x : a) {
315	>	Objects.requireNonNull(x);
316	>	elements[i] = x;
317	>	i = inc(i, capacity);
318	>	size++;
319	>	}
320	>	return true;
321		}
322
323		/**
324		* Inserts the specified element at the front of this deque.
325		*
326	<	* @param e the element to insert
327	<	* @return <tt>true</tt> (as per the spec for {@link Deque#offerFirst})
328	<	* @throws NullPointerException if <tt>e</tt> is null
326	>	* @param e the element to add
327	>	* @return {@code true} (as specified by {@link Deque#offerFirst})
328	>	* @throws NullPointerException if the specified element is null
329		*/
330		public boolean offerFirst(E e) {
331		addFirst(e);
#	Line 260 | Line 333 | public class ArrayDeque<E> extends Abstr
333		}
334
335		/**
336	<	* Inserts the specified element to the end of this deque.
336	>	* Inserts the specified element at the end of this deque.
337		*
338	<	* @param e the element to insert
339	<	* @return <tt>true</tt> (as per the spec for {@link Deque#offerLast})
340	<	* @throws NullPointerException if <tt>e</tt> is null
338	>	* @param e the element to add
339	>	* @return {@code true} (as specified by {@link Deque#offerLast})
340	>	* @throws NullPointerException if the specified element is null
341		*/
342		public boolean offerLast(E e) {
343		addLast(e);
#	Line 272 | Line 345 | public class ArrayDeque<E> extends Abstr
345		}
346
347		/**
348	<	* Retrieves and removes the first element of this deque.  This method
276	<	* differs from the <tt>pollFirst</tt> method in that it throws an
277	<	* exception if this deque is empty.
278	<	*
279	<	* @return the first element of this deque
280	<	* @throws NoSuchElementException if this deque is empty
348	>	* @throws NoSuchElementException {@inheritDoc}
349		*/
350		public E removeFirst() {
351	+	// checkInvariants();
352		E x = pollFirst();
353		if (x == null)
354		throw new NoSuchElementException();
#	Line 287 | Line 356 | public class ArrayDeque<E> extends Abstr
356		}
357
358		/**
359	<	* Retrieves and removes the last element of this deque.  This method
291	<	* differs from the <tt>pollLast</tt> method in that it throws an
292	<	* exception if this deque is empty.
293	<	*
294	<	* @return the last element of this deque
295	<	* @throws NoSuchElementException if this deque is empty
359	>	* @throws NoSuchElementException {@inheritDoc}
360		*/
361		public E removeLast() {
362	+	// checkInvariants();
363		E x = pollLast();
364		if (x == null)
365		throw new NoSuchElementException();
366		return x;
367		}
368
369	<	/**
370	<	* Retrieves, but does not remove, the first element of this deque,
371	<	* returning <tt>null</tt> if this deque is empty.
372	<	*
373	<	* @return the first element of this deque, or <tt>null</tt> if
374	<	*     this deque is empty
375	<	*/
376	<	public E peekFirst() {
377	<	return elements[head]; // elements[head] is null if deque empty
369	>	public E pollFirst() {
370	>	// checkInvariants();
371	>	final int s, h;
372	>	if ((s = size) == 0)
373	>	return null;
374	>	final Object[] elements = this.elements;
375	>	@SuppressWarnings("unchecked") E e = (E) elements[h = head];
376	>	elements[h] = null;
377	>	head = inc(h, elements.length);
378	>	size = s - 1;
379	>	return e;
380		}
381
382	<	/**
383	<	* Retrieves, but does not remove, the last element of this deque,
384	<	* returning <tt>null</tt> if this deque is empty.
385	<	*
386	<	* @return the last element of this deque, or <tt>null</tt> if this deque
387	<	*     is empty
388	<	*/
389	<	public E peekLast() {
390	<	return elements[(tail - 1) & (elements.length - 1)];
382	>	public E pollLast() {
383	>	// checkInvariants();
384	>	final int s, tail;
385	>	if ((s = size) == 0)
386	>	return null;
387	>	final Object[] elements = this.elements;
388	>	@SuppressWarnings("unchecked")
389	>	E e = (E) elements[tail = add(head, s - 1, elements.length)];
390	>	elements[tail] = null;
391	>	size = s - 1;
392	>	return e;
393		}
394
395		/**
396	<	* Retrieves, but does not remove, the first element of this
328	<	* deque.  This method differs from the <tt>peekFirst</tt> method only
329	<	* in that it throws an exception if this deque is empty.
330	<	*
331	<	* @return the first element of this deque
332	<	* @throws NoSuchElementException if this deque is empty
396	>	* @throws NoSuchElementException {@inheritDoc}
397		*/
398		public E getFirst() {
399	<	E x = elements[head];
400	<	if (x == null)
401	<	throw new NoSuchElementException();
338	<	return x;
399	>	// checkInvariants();
400	>	if (size == 0) throw new NoSuchElementException();
401	>	return elementAt(head);
402		}
403
404		/**
405	<	* Retrieves, but does not remove, the last element of this
343	<	* deque.  This method differs from the <tt>peekLast</tt> method only
344	<	* in that it throws an exception if this deque is empty.
345	<	*
346	<	* @return the last element of this deque
347	<	* @throws NoSuchElementException if this deque is empty
405	>	* @throws NoSuchElementException {@inheritDoc}
406		*/
407		public E getLast() {
408	<	E x = elements[(tail - 1) & (elements.length - 1)];
409	<	if (x == null)
410	<	throw new NoSuchElementException();
411	<	return x;
408	>	// checkInvariants();
409	>	if (size == 0) throw new NoSuchElementException();
410	>	return elementAt(tail());
411	>	}
412	>
413	>	public E peekFirst() {
414	>	// checkInvariants();
415	>	return (size == 0) ? null : elementAt(head);
416	>	}
417	>
418	>	public E peekLast() {
419	>	// checkInvariants();
420	>	return (size == 0) ? null : elementAt(tail());
421		}
422
423		/**
424		* Removes the first occurrence of the specified element in this
425	<	* deque (when traversing the deque from head to tail).  More
426	<	* formally, removes the first element e such that (o==null ?
427	<	* e==null : o.equals(e)). If the deque does not contain the
428	<	* element, it is unchanged.
425	>	* deque (when traversing the deque from head to tail).
426	>	* If the deque does not contain the element, it is unchanged.
427	>	* More formally, removes the first element {@code e} such that
428	>	* {@code o.equals(e)} (if such an element exists).
429	>	* Returns {@code true} if this deque contained the specified element
430	>	* (or equivalently, if this deque changed as a result of the call).
431		*
432		* @param o element to be removed from this deque, if present
433	<	* @return <tt>true</tt> if the deque contained the specified element
433	>	* @return {@code true} if the deque contained the specified element
434		*/
435		public boolean removeFirstOccurrence(Object o) {
436	<	if (o == null)
437	<	return false;
438	<	int mask = elements.length - 1;
439	<	int i = head;
440	<	E x;
441	<	while ( (x = elements[i]) != null) {
442	<	if (o.equals(x)) {
443	<	delete(i);
444	<	return true;
436	>	// checkInvariants();
437	>	if (o != null) {
438	>	final Object[] elements = this.elements;
439	>	final int capacity = elements.length;
440	>	for (int k = size, i = head; --k >= 0; i = inc(i, capacity)) {
441	>	if (o.equals(elements[i])) {
442	>	delete(i);
443	>	return true;
444	>	}
445		}
377	–	i = (i + 1) & mask;
446		}
447		return false;
448		}
449
450		/**
451		* Removes the last occurrence of the specified element in this
452	<	* deque (when traversing the deque from head to tail). More
453	<	* formally, removes the last element e such that (o==null ?
454	<	* e==null : o.equals(e)). If the deque
455	<	* does not contain the element, it is unchanged.
452	>	* deque (when traversing the deque from head to tail).
453	>	* If the deque does not contain the element, it is unchanged.
454	>	* More formally, removes the last element {@code e} such that
455	>	* {@code o.equals(e)} (if such an element exists).
456	>	* Returns {@code true} if this deque contained the specified element
457	>	* (or equivalently, if this deque changed as a result of the call).
458		*
459		* @param o element to be removed from this deque, if present
460	<	* @return <tt>true</tt> if the deque contained the specified element
460	>	* @return {@code true} if the deque contained the specified element
461		*/
462		public boolean removeLastOccurrence(Object o) {
463	<	if (o == null)
464	<	return false;
465	<	int mask = elements.length - 1;
466	<	int i = (tail - 1) & mask;
467	<	E x;
468	<	while ( (x = elements[i]) != null) {
469	<	if (o.equals(x)) {
470	<	delete(i);
471	<	return true;
463	>	if (o != null) {
464	>	final Object[] elements = this.elements;
465	>	final int capacity = elements.length;
466	>	for (int k = size, i = add(head, k - 1, capacity);
467	>	--k >= 0; i = dec(i, capacity)) {
468	>	if (o.equals(elements[i])) {
469	>	delete(i);
470	>	return true;
471	>	}
472		}
403	–	i = (i - 1) & mask;
473		}
474		return false;
475		}
#	Line 408 | Line 477 | public class ArrayDeque<E> extends Abstr
477		// *** Queue methods ***
478
479		/**
480	<	* Inserts the specified element to the end of this deque.
412	<	*
413	<	* <p>This method is equivalent to {@link #offerLast}.
414	<	*
415	<	* @param e the element to insert
416	<	* @return <tt>true</tt> (as per the spec for {@link Queue#offer})
417	<	* @throws NullPointerException if <tt>e</tt> is null
418	<	*/
419	<	public boolean offer(E e) {
420	<	return offerLast(e);
421	<	}
422	<
423	<	/**
424	<	* Inserts the specified element to the end of this deque.
480	>	* Inserts the specified element at the end of this deque.
481		*
482		* <p>This method is equivalent to {@link #addLast}.
483		*
484	<	* @param e the element to insert
485	<	* @return <tt>true</tt> (as per the spec for {@link Collection#add})
486	<	* @throws NullPointerException if <tt>e</tt> is null
484	>	* @param e the element to add
485	>	* @return {@code true} (as specified by {@link Collection#add})
486	>	* @throws NullPointerException if the specified element is null
487		*/
488		public boolean add(E e) {
489		addLast(e);
#	Line 435 | Line 491 | public class ArrayDeque<E> extends Abstr
491		}
492
493		/**
494	<	* Retrieves and removes the head of the queue represented by
439	<	* this deque, or <tt>null</tt> if this deque is empty.  In other words,
440	<	* retrieves and removes the first element of this deque, or <tt>null</tt>
441	<	* if this deque is empty.
494	>	* Inserts the specified element at the end of this deque.
495		*
496	<	* <p>This method is equivalent to {@link #pollFirst}.
496	>	* <p>This method is equivalent to {@link #offerLast}.
497		*
498	<	* @return the first element of this deque, or <tt>null</tt> if
499	<	*     this deque is empty
498	>	* @param e the element to add
499	>	* @return {@code true} (as specified by {@link Queue#offer})
500	>	* @throws NullPointerException if the specified element is null
501		*/
502	<	public E poll() {
503	<	return pollFirst();
502	>	public boolean offer(E e) {
503	>	return offerLast(e);
504		}
505
506		/**
507		* Retrieves and removes the head of the queue represented by this deque.
508	<	* This method differs from the <tt>poll</tt> method in that it throws an
508	>	*
509	>	* This method differs from {@link #poll poll} only in that it throws an
510		* exception if this deque is empty.
511		*
512		* <p>This method is equivalent to {@link #removeFirst}.
513		*
514		* @return the head of the queue represented by this deque
515	<	* @throws NoSuchElementException if this deque is empty
515	>	* @throws NoSuchElementException {@inheritDoc}
516		*/
517		public E remove() {
518		return removeFirst();
519		}
520
521		/**
522	<	* Retrieves, but does not remove, the head of the queue represented by
523	<	* this deque, returning <tt>null</tt> if this deque is empty.
522	>	* Retrieves and removes the head of the queue represented by this deque
523	>	* (in other words, the first element of this deque), or returns
524	>	* {@code null} if this deque is empty.
525		*
526	<	* <p>This method is equivalent to {@link #peekFirst}
526	>	* <p>This method is equivalent to {@link #pollFirst}.
527		*
528		* @return the head of the queue represented by this deque, or
529	<	*     <tt>null</tt> if this deque is empty
529	>	*         {@code null} if this deque is empty
530		*/
531	<	public E peek() {
532	<	return peekFirst();
531	>	public E poll() {
532	>	return pollFirst();
533		}
534
535		/**
536		* Retrieves, but does not remove, the head of the queue represented by
537	<	* this deque.  This method differs from the <tt>peek</tt> method only in
537	>	* this deque.  This method differs from {@link #peek peek} only in
538		* that it throws an exception if this deque is empty.
539		*
540	<	* <p>This method is equivalent to {@link #getFirst}
540	>	* <p>This method is equivalent to {@link #getFirst}.
541		*
542		* @return the head of the queue represented by this deque
543	<	* @throws NoSuchElementException if this deque is empty
543	>	* @throws NoSuchElementException {@inheritDoc}
544		*/
545		public E element() {
546		return getFirst();
547		}
548
549	+	/**
550	+	* Retrieves, but does not remove, the head of the queue represented by
551	+	* this deque, or returns {@code null} if this deque is empty.
552	+	*
553	+	* <p>This method is equivalent to {@link #peekFirst}.
554	+	*
555	+	* @return the head of the queue represented by this deque, or
556	+	*         {@code null} if this deque is empty
557	+	*/
558	+	public E peek() {
559	+	return peekFirst();
560	+	}
561	+
562		// *** Stack methods ***
563
564		/**
#	Line 499 | Line 568 | public class ArrayDeque<E> extends Abstr
568		* <p>This method is equivalent to {@link #addFirst}.
569		*
570		* @param e the element to push
571	<	* @throws NullPointerException if <tt>e</tt> is null
571	>	* @throws NullPointerException if the specified element is null
572		*/
573		public void push(E e) {
574		addFirst(e);
#	Line 512 | Line 581 | public class ArrayDeque<E> extends Abstr
581		* <p>This method is equivalent to {@link #removeFirst()}.
582		*
583		* @return the element at the front of this deque (which is the top
584	<	*     of the stack represented by this deque)
585	<	* @throws NoSuchElementException if this deque is empty
584	>	*         of the stack represented by this deque)
585	>	* @throws NoSuchElementException {@inheritDoc}
586		*/
587		public E pop() {
588		return removeFirst();
589		}
590
591		/**
592	<	* Remove the element at the specified position in the elements array,
593	<	* adjusting head, tail, and size as necessary.  This can result in
594	<	* motion of elements backwards or forwards in the array.
592	>	* Removes the element at the specified position in the elements array.
593	>	* This can result in forward or backwards motion of array elements.
594	>	* We optimize for least element motion.
595		*
596		* <p>This method is called delete rather than remove to emphasize
597	<	* that its semantics differ from those of List.remove(int).
597	>	* that its semantics differ from those of {@link List#remove(int)}.
598		*
599		* @return true if elements moved backwards
600		*/
601	<	private boolean delete(int i) {
602	<	// Case 1: Deque doesn't wrap
603	<	// Case 2: Deque does wrap and removed element is in the head portion
604	<	if ((head < tail || tail == 0) || i >= head) {
605	<	System.arraycopy(elements, head, elements, head + 1, i - head);
606	<	elements[head] = null;
607	<	head = (head + 1) & (elements.length - 1);
601	>	boolean delete(int i) {
602	>	// checkInvariants();
603	>	final Object[] elements = this.elements;
604	>	final int capacity = elements.length;
605	>	final int h = head;
606	>	int front;              // number of elements before to-be-deleted elt
607	>	if ((front = i - h) < 0) front += capacity;
608	>	final int back = size - front - 1; // number of elements after
609	>	if (front < back) {
610	>	// move front elements forwards
611	>	if (h <= i) {
612	>	System.arraycopy(elements, h, elements, h + 1, front);
613	>	} else { // Wrap around
614	>	System.arraycopy(elements, 0, elements, 1, i);
615	>	elements[0] = elements[capacity - 1];
616	>	System.arraycopy(elements, h, elements, h + 1, front - (i + 1));
617	>	}
618	>	elements[h] = null;
619	>	head = inc(h, capacity);
620	>	size--;
621	>	// checkInvariants();
622		return false;
623	+	} else {
624	+	// move back elements backwards
625	+	int tail = tail();
626	+	if (i <= tail) {
627	+	System.arraycopy(elements, i + 1, elements, i, back);
628	+	} else { // Wrap around
629	+	int firstLeg = capacity - (i + 1);
630	+	System.arraycopy(elements, i + 1, elements, i, firstLeg);
631	+	elements[capacity - 1] = elements[0];
632	+	System.arraycopy(elements, 1, elements, 0, back - firstLeg - 1);
633	+	}
634	+	elements[tail] = null;
635	+	size--;
636	+	// checkInvariants();
637	+	return true;
638		}
541	–
542	–	// Case 3: Deque wraps and removed element is in the tail portion
543	–	tail--;
544	–	System.arraycopy(elements, i + 1, elements, i, tail - i);
545	–	elements[tail] = null;
546	–	return true;
639		}
640
641		// *** Collection Methods ***
#	Line 554 | Line 646 | public class ArrayDeque<E> extends Abstr
646		* @return the number of elements in this deque
647		*/
648		public int size() {
649	<	return (tail - head) & (elements.length - 1);
649	>	return size;
650		}
651
652		/**
653	<	* Returns <tt>true</tt> if this collection contains no elements.<p>
653	>	* Returns {@code true} if this deque contains no elements.
654		*
655	<	* @return <tt>true</tt> if this collection contains no elements.
655	>	* @return {@code true} if this deque contains no elements
656		*/
657		public boolean isEmpty() {
658	<	return head == tail;
658	>	return size == 0;
659		}
660
661		/**
#	Line 572 | Line 664 | public class ArrayDeque<E> extends Abstr
664		* order that elements would be dequeued (via successive calls to
665		* {@link #remove} or popped (via successive calls to {@link #pop}).
666		*
667	<	* @return an <tt>Iterator</tt> over the elements in this deque
667	>	* @return an iterator over the elements in this deque
668		*/
669		public Iterator<E> iterator() {
670		return new DeqIterator();
671		}
672
673	+	public Iterator<E> descendingIterator() {
674	+	return new DescendingIterator();
675	+	}
676	+
677		private class DeqIterator implements Iterator<E> {
678	<	/**
679	<	* Index of element to be returned by subsequent call to next.
584	<	*/
585	<	private int cursor = head;
678	>	/** Index of element to be returned by subsequent call to next. */
679	>	int cursor;
680
681	<	/**
682	<	* Tail recorded at construction (also in remove), to stop
589	<	* iterator and also to check for comodification.
590	<	*/
591	<	private int fence = tail;
681	>	/** Number of elements yet to be returned. */
682	>	int remaining = size;
683
684		/**
685		* Index of element returned by most recent call to next.
686		* Reset to -1 if element is deleted by a call to remove.
687		*/
688	<	private int lastRet = -1;
688	>	int lastRet = -1;
689
690	<	public boolean hasNext() {
691	<	return cursor != fence;
690	>	DeqIterator() { cursor = head; }
691	>
692	>	public final boolean hasNext() {
693	>	return remaining > 0;
694		}
695
696		public E next() {
697	<	E result;
605	<	if (cursor == fence)
697	>	if (remaining == 0)
698		throw new NoSuchElementException();
699	<	// This check doesn't catch all possible comodifications,
608	<	// but does catch the ones that corrupt traversal
609	<	if (tail != fence || (result = elements[cursor]) == null)
610	<	throw new ConcurrentModificationException();
699	>	E e = checkedElementAt(elements, cursor);
700		lastRet = cursor;
701	<	cursor = (cursor + 1) & (elements.length - 1);
702	<	return result;
701	>	cursor = inc(cursor, elements.length);
702	>	remaining--;
703	>	return e;
704	>	}
705	>
706	>	void postDelete(boolean leftShifted) {
707	>	if (leftShifted)
708	>	cursor = dec(cursor, elements.length); // undo inc in next
709		}
710
711	<	public void remove() {
711	>	public final void remove() {
712		if (lastRet < 0)
713		throw new IllegalStateException();
714	<	if (delete(lastRet))
620	<	cursor--;
714	>	postDelete(delete(lastRet));
715		lastRet = -1;
716	<	fence = tail;
716	>	}
717	>
718	>	public void forEachRemaining(Consumer<? super E> action) {
719	>	Objects.requireNonNull(action);
720	>	final Object[] elements = ArrayDeque.this.elements;
721	>	final int capacity = elements.length;
722	>	int k = remaining;
723	>	remaining = 0;
724	>	for (int i = cursor; --k >= 0; i = inc(i, capacity))
725	>	action.accept(checkedElementAt(elements, i));
726	>	}
727	>	}
728	>
729	>	private class DescendingIterator extends DeqIterator {
730	>	DescendingIterator() { cursor = tail(); }
731	>
732	>	public final E next() {
733	>	if (remaining == 0)
734	>	throw new NoSuchElementException();
735	>	E e = checkedElementAt(elements, cursor);
736	>	lastRet = cursor;
737	>	cursor = dec(cursor, elements.length);
738	>	remaining--;
739	>	return e;
740	>	}
741	>
742	>	void postDelete(boolean leftShifted) {
743	>	if (!leftShifted)
744	>	cursor = inc(cursor, elements.length); // undo dec in next
745	>	}
746	>
747	>	public final void forEachRemaining(Consumer<? super E> action) {
748	>	Objects.requireNonNull(action);
749	>	final Object[] elements = ArrayDeque.this.elements;
750	>	final int capacity = elements.length;
751	>	int k = remaining;
752	>	remaining = 0;
753	>	for (int i = cursor; --k >= 0; i = dec(i, capacity))
754	>	action.accept(checkedElementAt(elements, i));
755	>	}
756	>	}
757	>
758	>	/**
759	>	* Creates a <em><a href="Spliterator.html#binding">late-binding</a></em>
760	>	* and <em>fail-fast</em> {@link Spliterator} over the elements in this
761	>	* deque.
762	>	*
763	>	* <p>The {@code Spliterator} reports {@link Spliterator#SIZED},
764	>	* {@link Spliterator#SUBSIZED}, {@link Spliterator#ORDERED}, and
765	>	* {@link Spliterator#NONNULL}.  Overriding implementations should document
766	>	* the reporting of additional characteristic values.
767	>	*
768	>	* @return a {@code Spliterator} over the elements in this deque
769	>	* @since 1.8
770	>	*/
771	>	public Spliterator<E> spliterator() {
772	>	return new ArrayDequeSpliterator();
773	>	}
774	>
775	>	final class ArrayDequeSpliterator implements Spliterator<E> {
776	>	private int cursor;
777	>	private int remaining; // -1 until late-binding first use
778	>
779	>	/** Constructs late-binding spliterator over all elements. */
780	>	ArrayDequeSpliterator() {
781	>	this.remaining = -1;
782	>	}
783	>
784	>	/** Constructs spliterator over the given slice. */
785	>	ArrayDequeSpliterator(int cursor, int count) {
786	>	this.cursor = cursor;
787	>	this.remaining = count;
788	>	}
789	>
790	>	/** Ensures late-binding initialization; then returns remaining. */
791	>	private int remaining() {
792	>	if (remaining < 0) {
793	>	cursor = head;
794	>	remaining = size;
795	>	}
796	>	return remaining;
797	>	}
798	>
799	>	public ArrayDequeSpliterator trySplit() {
800	>	final int mid;
801	>	if ((mid = remaining() >> 1) > 0) {
802	>	int oldCursor = cursor;
803	>	cursor = add(cursor, mid, elements.length);
804	>	remaining -= mid;
805	>	return new ArrayDequeSpliterator(oldCursor, mid);
806	>	}
807	>	return null;
808	>	}
809	>
810	>	public void forEachRemaining(Consumer<? super E> action) {
811	>	Objects.requireNonNull(action);
812	>	final Object[] elements = ArrayDeque.this.elements;
813	>	final int capacity = elements.length;
814	>	int k = remaining();
815	>	remaining = 0;
816	>	for (int i = cursor; --k >= 0; i = inc(i, capacity))
817	>	action.accept(checkedElementAt(elements, i));
818	>	}
819	>
820	>	public boolean tryAdvance(Consumer<? super E> action) {
821	>	Objects.requireNonNull(action);
822	>	if (remaining() == 0)
823	>	return false;
824	>	action.accept(checkedElementAt(elements, cursor));
825	>	cursor = inc(cursor, elements.length);
826	>	remaining--;
827	>	return true;
828	>	}
829	>
830	>	public long estimateSize() {
831	>	return remaining();
832	>	}
833	>
834	>	public int characteristics() {
835	>	return Spliterator.NONNULL
836	>	| Spliterator.ORDERED
837	>	| Spliterator.SIZED
838	>	| Spliterator.SUBSIZED;
839	>	}
840	>	}
841	>
842	>	@Override
843	>	public void forEach(Consumer<? super E> action) {
844	>	// checkInvariants();
845	>	Objects.requireNonNull(action);
846	>	final Object[] elements = this.elements;
847	>	final int capacity = elements.length;
848	>	for (int k = size, i = head; --k >= 0; i = inc(i, capacity))
849	>	action.accept(elementAt(i));
850	>	// checkInvariants();
851	>	}
852	>
853	>	/**
854	>	* Replaces each element of this deque with the result of applying the
855	>	* operator to that element, as specified by {@link List#replaceAll}.
856	>	*
857	>	* @param operator the operator to apply to each element
858	>	* @since TBD
859	>	*/
860	>	/* public */ void replaceAll(UnaryOperator<E> operator) {
861	>	Objects.requireNonNull(operator);
862	>	final Object[] elements = this.elements;
863	>	final int capacity = elements.length;
864	>	for (int k = size, i = head; --k >= 0; i = inc(i, capacity))
865	>	elements[i] = operator.apply(elementAt(i));
866	>	// checkInvariants();
867	>	}
868	>
869	>	/**
870	>	* @throws NullPointerException {@inheritDoc}
871	>	*/
872	>	@Override
873	>	public boolean removeIf(Predicate<? super E> filter) {
874	>	Objects.requireNonNull(filter);
875	>	return bulkRemove(filter);
876	>	}
877	>
878	>	/**
879	>	* @throws NullPointerException {@inheritDoc}
880	>	*/
881	>	@Override
882	>	public boolean removeAll(Collection<?> c) {
883	>	Objects.requireNonNull(c);
884	>	return bulkRemove(e -> c.contains(e));
885	>	}
886	>
887	>	/**
888	>	* @throws NullPointerException {@inheritDoc}
889	>	*/
890	>	@Override
891	>	public boolean retainAll(Collection<?> c) {
892	>	Objects.requireNonNull(c);
893	>	return bulkRemove(e -> !c.contains(e));
894	>	}
895	>
896	>	/** Implementation of bulk remove methods. */
897	>	private boolean bulkRemove(Predicate<? super E> filter) {
898	>	// checkInvariants();
899	>	final Object[] elements = this.elements;
900	>	final int capacity = elements.length;
901	>	int i = head, j = i, remaining = size, deleted = 0;
902	>	try {
903	>	for (; remaining > 0; remaining--, i = inc(i, capacity)) {
904	>	@SuppressWarnings("unchecked") E e = (E) elements[i];
905	>	if (filter.test(e))
906	>	deleted++;
907	>	else {
908	>	if (j != i)
909	>	elements[j] = e;
910	>	j = inc(j, capacity);
911	>	}
912	>	}
913	>	return deleted > 0;
914	>	} catch (Throwable ex) {
915	>	if (deleted > 0)
916	>	for (; remaining > 0;
917	>	remaining--, i = inc(i, capacity), j = inc(j, capacity))
918	>	elements[j] = elements[i];
919	>	throw ex;
920	>	} finally {
921	>	size -= deleted;
922	>	for (; --deleted >= 0; j = inc(j, capacity))
923	>	elements[j] = null;
924	>	// checkInvariants();
925		}
926		}
927
928		/**
929	<	* Returns <tt>true</tt> if this deque contains the specified
930	<	* element.  More formally, returns <tt>true</tt> if and only if this
931	<	* deque contains at least one element <tt>e</tt> such that
630	<	* <tt>e.equals(o)</tt>.
929	>	* Returns {@code true} if this deque contains the specified element.
930	>	* More formally, returns {@code true} if and only if this deque contains
931	>	* at least one element {@code e} such that {@code o.equals(e)}.
932		*
933		* @param o object to be checked for containment in this deque
934	<	* @return <tt>true</tt> if this deque contains the specified element
934	>	* @return {@code true} if this deque contains the specified element
935		*/
936		public boolean contains(Object o) {
937	<	if (o == null)
938	<	return false;
939	<	int mask = elements.length - 1;
940	<	int i = head;
941	<	E x;
942	<	while ( (x = elements[i]) != null) {
642	<	if (o.equals(x))
643	<	return true;
644	<	i = (i + 1) & mask;
937	>	if (o != null) {
938	>	final Object[] elements = this.elements;
939	>	final int capacity = elements.length;
940	>	for (int k = size, i = head; --k >= 0; i = inc(i, capacity))
941	>	if (o.equals(elements[i]))
942	>	return true;
943		}
944		return false;
945		}
946
947		/**
948		* Removes a single instance of the specified element from this deque.
949	<	* This method is equivalent to {@link #removeFirstOccurrence}.
949	>	* If the deque does not contain the element, it is unchanged.
950	>	* More formally, removes the first element {@code e} such that
951	>	* {@code o.equals(e)} (if such an element exists).
952	>	* Returns {@code true} if this deque contained the specified element
953	>	* (or equivalently, if this deque changed as a result of the call).
954		*
955	<	* @param e element to be removed from this deque, if present
956	<	* @return <tt>true</tt> if this deque contained the specified element
955	>	* <p>This method is equivalent to {@link #removeFirstOccurrence(Object)}.
956	>	*
957	>	* @param o element to be removed from this deque, if present
958	>	* @return {@code true} if this deque contained the specified element
959		*/
960	<	public boolean remove(Object e) {
961	<	return removeFirstOccurrence(e);
960	>	public boolean remove(Object o) {
961	>	return removeFirstOccurrence(o);
962		}
963
964		/**
965		* Removes all of the elements from this deque.
966	+	* The deque will be empty after this call returns.
967		*/
968		public void clear() {
969	<	int h = head;
970	<	int t = tail;
971	<	if (h != t) { // clear all cells
972	<	head = tail = 0;
973	<	int i = h;
974	<	int mask = elements.length - 1;
975	<	do {
976	<	elements[i] = null;
977	<	i = (i + 1) & mask;
673	<	} while(i != t);
969	>	final Object[] elements = this.elements;
970	>	final int capacity = elements.length;
971	>	final int h = this.head;
972	>	final int s = size;
973	>	if (capacity - h >= s)
974	>	Arrays.fill(elements, h, h + s, null);
975	>	else {
976	>	Arrays.fill(elements, h, capacity, null);
977	>	Arrays.fill(elements, 0, s - capacity + h, null);
978		}
979	+	size = head = 0;
980	+	// checkInvariants();
981		}
982
983		/**
984		* Returns an array containing all of the elements in this deque
985	<	* in the correct order.
985	>	* in proper sequence (from first to last element).
986	>	*
987	>	* <p>The returned array will be "safe" in that no references to it are
988	>	* maintained by this deque.  (In other words, this method must allocate
989	>	* a new array).  The caller is thus free to modify the returned array.
990	>	*
991	>	* <p>This method acts as bridge between array-based and collection-based
992	>	* APIs.
993		*
994		* @return an array containing all of the elements in this deque
682	–	*         in the correct order
995		*/
996		public Object[] toArray() {
997	<	return copyElements(new Object[size()]);
997	>	final int head = this.head;
998	>	final int firstLeg;
999	>	Object[] a = Arrays.copyOfRange(elements, head, head + size);
1000	>	if ((firstLeg = elements.length - head) < size)
1001	>	System.arraycopy(elements, 0, a, firstLeg, size - firstLeg);
1002	>	return a;
1003		}
1004
1005		/**
1006	<	* Returns an array containing all of the elements in this deque in the
1007	<	* correct order; the runtime type of the returned array is that of the
1008	<	* specified array.  If the deque fits in the specified array, it is
1009	<	* returned therein.  Otherwise, a new array is allocated with the runtime
1010	<	* type of the specified array and the size of this deque.
1006	>	* Returns an array containing all of the elements in this deque in
1007	>	* proper sequence (from first to last element); the runtime type of the
1008	>	* returned array is that of the specified array.  If the deque fits in
1009	>	* the specified array, it is returned therein.  Otherwise, a new array
1010	>	* is allocated with the runtime type of the specified array and the
1011	>	* size of this deque.
1012	>	*
1013	>	* <p>If this deque fits in the specified array with room to spare
1014	>	* (i.e., the array has more elements than this deque), the element in
1015	>	* the array immediately following the end of the deque is set to
1016	>	* {@code null}.
1017	>	*
1018	>	* <p>Like the {@link #toArray()} method, this method acts as bridge between
1019	>	* array-based and collection-based APIs.  Further, this method allows
1020	>	* precise control over the runtime type of the output array, and may,
1021	>	* under certain circumstances, be used to save allocation costs.
1022	>	*
1023	>	* <p>Suppose {@code x} is a deque known to contain only strings.
1024	>	* The following code can be used to dump the deque into a newly
1025	>	* allocated array of {@code String}:
1026		*
1027	<	* <p>If the deque fits in the specified array with room to spare (i.e.,
1028	<	* the array has more elements than the deque), the element in the array
1029	<	* immediately following the end of the collection is set to <tt>null</tt>.
1027	>	* <pre> {@code String[] y = x.toArray(new String[0]);}</pre>
1028	>	*
1029	>	* Note that {@code toArray(new Object[0])} is identical in function to
1030	>	* {@code toArray()}.
1031		*
1032		* @param a the array into which the elements of the deque are to
1033	<	*          be stored, if it is big enough; otherwise, a new array of the
1034	<	*          same runtime type is allocated for this purpose
1035	<	* @return an array containing the elements of the deque
1036	<	* @throws ArrayStoreException if the runtime type of a is not a supertype
1037	<	*         of the runtime type of every element in this deque
1033	>	*          be stored, if it is big enough; otherwise, a new array of the
1034	>	*          same runtime type is allocated for this purpose
1035	>	* @return an array containing all of the elements in this deque
1036	>	* @throws ArrayStoreException if the runtime type of the specified array
1037	>	*         is not a supertype of the runtime type of every element in
1038	>	*         this deque
1039	>	* @throws NullPointerException if the specified array is null
1040		*/
1041	+	@SuppressWarnings("unchecked")
1042		public <T> T[] toArray(T[] a) {
1043	<	int size = size();
1044	<	if (a.length < size)
1045	<	a = (T[])java.lang.reflect.Array.newInstance(
1046	<	a.getClass().getComponentType(), size);
1047	<	copyElements(a);
1048	<	if (a.length > size)
1049	<	a[size] = null;
1043	>	final Object[] elements = this.elements;
1044	>	final int head = this.head;
1045	>	final int firstLeg;
1046	>	boolean wrap = (firstLeg = elements.length - head) < size;
1047	>	if (size > a.length) {
1048	>	a = (T[]) Arrays.copyOfRange(elements, head, head + size,
1049	>	a.getClass());
1050	>	} else {
1051	>	System.arraycopy(elements, head, a, 0, wrap ? firstLeg : size);
1052	>	if (size < a.length)
1053	>	a[size] = null;
1054	>	}
1055	>	if (wrap)
1056	>	System.arraycopy(elements, 0, a, firstLeg, size - firstLeg);
1057		return a;
1058		}
1059
#	Line 723 | Line 1066 | public class ArrayDeque<E> extends Abstr
1066		*/
1067		public ArrayDeque<E> clone() {
1068		try {
1069	+	@SuppressWarnings("unchecked")
1070		ArrayDeque<E> result = (ArrayDeque<E>) super.clone();
1071	<	// These two lines are currently faster than cloning the array:
728	<	result.elements = (E[]) new Object[elements.length];
729	<	System.arraycopy(elements, 0, result.elements, 0, elements.length);
1071	>	result.elements = Arrays.copyOf(elements, elements.length);
1072		return result;
731	–
1073		} catch (CloneNotSupportedException e) {
1074		throw new AssertionError();
1075		}
1076		}
1077
737	–	/**
738	–	* Appease the serialization gods.
739	–	*/
1078		private static final long serialVersionUID = 2340985798034038923L;
1079
1080		/**
1081	<	* Serialize this deque.
1081	>	* Saves this deque to a stream (that is, serializes it).
1082		*
1083	<	* @serialData The current size (<tt>int</tt>) of the deque,
1083	>	* @param s the stream
1084	>	* @throws java.io.IOException if an I/O error occurs
1085	>	* @serialData The current size ({@code int}) of the deque,
1086		* followed by all of its elements (each an object reference) in
1087		* first-to-last order.
1088		*/
1089	<	private void writeObject(ObjectOutputStream s) throws IOException {
1089	>	private void writeObject(java.io.ObjectOutputStream s)
1090	>	throws java.io.IOException {
1091		s.defaultWriteObject();
1092
1093		// Write out size
753	–	int size = size();
1094		s.writeInt(size);
1095
1096		// Write out elements in order.
1097	<	int i = head;
1098	<	int mask = elements.length - 1;
1099	<	for (int j = 0; j < size; j++) {
1097	>	final Object[] elements = this.elements;
1098	>	final int capacity = elements.length;
1099	>	for (int k = size, i = head; --k >= 0; i = inc(i, capacity))
1100		s.writeObject(elements[i]);
761	–	i = (i + 1) & mask;
762	–	}
1101		}
1102
1103		/**
1104	<	* Deserialize this deque.
1104	>	* Reconstitutes this deque from a stream (that is, deserializes it).
1105	>	* @param s the stream
1106	>	* @throws ClassNotFoundException if the class of a serialized object
1107	>	*         could not be found
1108	>	* @throws java.io.IOException if an I/O error occurs
1109		*/
1110	<	private void readObject(ObjectInputStream s)
1111	<	throws IOException, ClassNotFoundException {
1110	>	private void readObject(java.io.ObjectInputStream s)
1111	>	throws java.io.IOException, ClassNotFoundException {
1112		s.defaultReadObject();
1113
1114		// Read in size and allocate array
1115	<	int size = s.readInt();
774	<	allocateElements(size);
775	<	head = 0;
776	<	tail = size;
1115	>	elements = new Object[size = s.readInt()];
1116
1117		// Read in all elements in the proper order.
1118		for (int i = 0; i < size; i++)
1119	<	elements[i] = (E)s.readObject();
1119	>	elements[i] = s.readObject();
1120	>	}
1121
1122	+	/** debugging */
1123	+	private void checkInvariants() {
1124	+	try {
1125	+	int capacity = elements.length;
1126	+	assert size >= 0 && size <= capacity;
1127	+	assert head >= 0 && ((capacity == 0 && head == 0 && size == 0)
1128	+	|| head < capacity);
1129	+	assert size == 0
1130	+	|| (elements[head] != null && elements[tail()] != null);
1131	+	assert size == capacity
1132	+	|| (elements[dec(head, capacity)] == null
1133	+	&& elements[inc(tail(), capacity)] == null);
1134	+	} catch (Throwable t) {
1135	+	System.err.printf("head=%d size=%d capacity=%d%n",
1136	+	head, size, elements.length);
1137	+	System.err.printf("elements=%s%n",
1138	+	Arrays.toString(elements));
1139	+	throw t;
1140	+	}
1141		}
1142	+
1143		}

Diff Legend

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