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.6 by dl, Tue Mar 22 16:48:32 2005 UTC vs.
Revision 1.109 by jsr166, Sat Nov 5 16:21:06 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	+	* VMs excel at optimizing simple array loops where indices are
65	+	* incrementing or decrementing over a valid slice, e.g.
66	+	*
67	+	* for (int i = start; i < end; i++) ... elements[i]
68	+	*
69	+	* Because in a circular array, elements are in general stored in
70	+	* two disjoint such slices, we help the VM by writing unusual
71	+	* nested loops for all traversals over the elements.
72	+	*/
73	+
74		/**
75		* The array in which the elements of the deque are stored.
76	<	* The capacity of the deque is the length of this array, which is
77	<	* 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.
76	>	* We guarantee that all array cells not holding deque elements
77	>	* are always null.
78		*/
79	<	private transient E[] elements;
79	>	transient Object[] elements;
80
81		/**
82		* The index of the element at the head of the deque (which is the
83		* element that would be removed by remove() or pop()); or an
84	<	* arbitrary number equal to tail if the deque is empty.
84	>	* arbitrary number 0 <= head < elements.length equal to tail if
85	>	* the deque is empty.
86		*/
87	<	private transient int head;
87	>	transient int head;
88
89		/**
90		* The index at which the next element would be added to the tail
91		* of the deque (via addLast(E), add(E), or push(E)).
92		*/
93	<	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.
82	<	*/
83	<	private static final int MIN_INITIAL_CAPACITY = 8;
84	<
85	<	// ******  Array allocation and resizing utilities ******
93	>	transient int tail;
94
95		/**
96	<	* Allocate empty array to hold the given number of elements.
97	<	*
98	<	* @param numElements  the number of elements to hold.
99	<	*/
100	<	private void allocateElements(int numElements) {
101	<	int initialCapacity = MIN_INITIAL_CAPACITY;
102	<	// Find the best power of two to hold elements.
103	<	// Tests "<=" because arrays aren't kept full.
104	<	if (numElements >= initialCapacity) {
105	<	initialCapacity = numElements;
106	<	initialCapacity |= (initialCapacity >>>  1);
107	<	initialCapacity |= (initialCapacity >>>  2);
108	<	initialCapacity |= (initialCapacity >>>  4);
109	<	initialCapacity |= (initialCapacity >>>  8);
110	<	initialCapacity |= (initialCapacity >>> 16);
111	<	initialCapacity++;
96	>	* The maximum size of array to allocate.
97	>	* Some VMs reserve some header words in an array.
98	>	* Attempts to allocate larger arrays may result in
99	>	* OutOfMemoryError: Requested array size exceeds VM limit
100	>	*/
101	>	private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
102	>
103	>	/**
104	>	* Increases the capacity of this deque by at least the given amount.
105	>	*
106	>	* @param needed the required minimum extra capacity; must be positive
107	>	*/
108	>	private void grow(int needed) {
109	>	// overflow-conscious code
110	>	final int oldCapacity = elements.length;
111	>	int newCapacity;
112	>	// Double capacity if small; else grow by 50%
113	>	int jump = (oldCapacity < 64) ? (oldCapacity + 2) : (oldCapacity >> 1);
114	>	if (jump < needed
115	>	|| (newCapacity = (oldCapacity + jump)) - MAX_ARRAY_SIZE > 0)
116	>	newCapacity = newCapacity(needed, jump);
117	>	elements = Arrays.copyOf(elements, newCapacity);
118	>	// Exceptionally, here tail == head needs to be disambiguated
119	>	if (tail < head || (tail == head && elements[head] != null)) {
120	>	// wrap around; slide first leg forward to end of array
121	>	int newSpace = newCapacity - oldCapacity;
122	>	System.arraycopy(elements, head,
123	>	elements, head + newSpace,
124	>	oldCapacity - head);
125	>	Arrays.fill(elements, head, head + newSpace, null);
126	>	head += newSpace;
127	>	}
128	>	// checkInvariants();
129	>	}
130
131	<	if (initialCapacity < 0)   // Too many elements, must back off
132	<	initialCapacity >>>= 1;// Good luck allocating 2 ^ 30 elements
131	>	/** Capacity calculation for edge conditions, especially overflow. */
132	>	private int newCapacity(int needed, int jump) {
133	>	final int oldCapacity = elements.length, minCapacity;
134	>	if ((minCapacity = oldCapacity + needed) - MAX_ARRAY_SIZE > 0) {
135	>	if (minCapacity < 0)
136	>	throw new IllegalStateException("Sorry, deque too big");
137	>	return Integer.MAX_VALUE;
138		}
139	<	elements = (E[]) new Object[initialCapacity];
139	>	if (needed > jump)
140	>	return minCapacity;
141	>	return (oldCapacity + jump - MAX_ARRAY_SIZE < 0)
142	>	? oldCapacity + jump
143	>	: MAX_ARRAY_SIZE;
144		}
145
146		/**
147	<	* Double the capacity of this deque.  Call only when full, i.e.,
148	<	* when head and tail have wrapped around to become equal.
147	>	* Increases the internal storage of this collection, if necessary,
148	>	* to ensure that it can hold at least the given number of elements.
149	>	*
150	>	* @param minCapacity the desired minimum capacity
151	>	* @since TBD
152		*/
153	<	private void doubleCapacity() {
154	<	assert head == tail;
155	<	int p = head;
156	<	int n = elements.length;
157	<	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;
153	>	/* public */ void ensureCapacity(int minCapacity) {
154	>	int needed;
155	>	if ((needed = (minCapacity + 1 - elements.length)) > 0)
156	>	grow(needed);
157	>	// checkInvariants();
158		}
159
160		/**
161	<	* 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.
161	>	* Minimizes the internal storage of this collection.
162		*
163	<	* @return its argument
163	>	* @since TBD
164		*/
165	<	private <T> T[] copyElements(T[] a) {
166	<	if (head < tail) {
167	<	System.arraycopy(elements, head, a, 0, size());
168	<	} else if (head > tail) {
169	<	int headPortionLen = elements.length - head;
170	<	System.arraycopy(elements, head, a, 0, headPortionLen);
144	<	System.arraycopy(elements, 0, a, headPortionLen, tail);
165	>	/* public */ void trimToSize() {
166	>	int size;
167	>	if ((size = size()) + 1 < elements.length) {
168	>	elements = toArray(new Object[size + 1]);
169	>	head = 0;
170	>	tail = size;
171		}
172	<	return a;
172	>	// checkInvariants();
173		}
174
175		/**
#	Line 151 | Line 177 | public class ArrayDeque<E> extends Abstr
177		* sufficient to hold 16 elements.
178		*/
179		public ArrayDeque() {
180	<	elements = (E[]) new Object[16];
180	>	elements = new Object[16];
181		}
182
183		/**
184		* Constructs an empty array deque with an initial capacity
185		* sufficient to hold the specified number of elements.
186		*
187	<	* @param numElements  lower bound on initial capacity of the deque
187	>	* @param numElements lower bound on initial capacity of the deque
188		*/
189		public ArrayDeque(int numElements) {
190	<	allocateElements(numElements);
190	>	elements = new Object[Math.max(1, numElements + 1)];
191		}
192
193		/**
#	Line 175 | Line 201 | public class ArrayDeque<E> extends Abstr
201		* @throws NullPointerException if the specified collection is null
202		*/
203		public ArrayDeque(Collection<? extends E> c) {
204	<	allocateElements(c.size());
204	>	elements = new Object[c.size() + 1];
205		addAll(c);
206		}
207
208	+	/**
209	+	* Increments i, mod modulus.
210	+	* Precondition and postcondition: 0 <= i < modulus.
211	+	*/
212	+	static final int inc(int i, int modulus) {
213	+	if (++i >= modulus) i = 0;
214	+	return i;
215	+	}
216	+
217	+	/**
218	+	* Decrements i, mod modulus.
219	+	* Precondition and postcondition: 0 <= i < modulus.
220	+	*/
221	+	static final int dec(int i, int modulus) {
222	+	if (--i < 0) i = modulus - 1;
223	+	return i;
224	+	}
225	+
226	+	/**
227	+	* Adds i and j, mod modulus.
228	+	* Precondition and postcondition: 0 <= i < modulus, 0 <= j <= modulus.
229	+	*/
230	+	static final int add(int i, int j, int modulus) {
231	+	if ((i += j) - modulus >= 0) i -= modulus;
232	+	return i;
233	+	}
234	+
235	+	/**
236	+	* Subtracts j from i, mod modulus.
237	+	* Index i must be logically ahead of j.
238	+	* Returns the "circular distance" from j to i.
239	+	* Precondition and postcondition: 0 <= i < modulus, 0 <= j < modulus.
240	+	*/
241	+	static final int sub(int i, int j, int modulus) {
242	+	if ((i -= j) < 0) i += modulus;
243	+	return i;
244	+	}
245	+
246	+	/**
247	+	* Returns element at array index i.
248	+	* This is a slight abuse of generics, accepted by javac.
249	+	*/
250	+	@SuppressWarnings("unchecked")
251	+	static final <E> E elementAt(Object[] es, int i) {
252	+	return (E) es[i];
253	+	}
254	+
255	+	/**
256	+	* A version of elementAt that checks for null elements.
257	+	* This check doesn't catch all possible comodifications,
258	+	* but does catch ones that corrupt traversal.
259	+	*/
260	+	static final <E> E nonNullElementAt(Object[] es, int i) {
261	+	@SuppressWarnings("unchecked") E e = (E) es[i];
262	+	if (e == null)
263	+	throw new ConcurrentModificationException();
264	+	return e;
265	+	}
266	+
267		// The main insertion and extraction methods are addFirst,
268		// addLast, pollFirst, pollLast. The other methods are defined in
269		// terms of these.
#	Line 186 | Line 271 | public class ArrayDeque<E> extends Abstr
271		/**
272		* Inserts the specified element at the front of this deque.
273		*
274	<	* @param e the element to insert
275	<	* @throws NullPointerException if <tt>e</tt> is null
274	>	* @param e the element to add
275	>	* @throws NullPointerException if the specified element is null
276		*/
277		public void addFirst(E e) {
278		if (e == null)
279		throw new NullPointerException();
280	<	elements[head = (head - 1) & (elements.length - 1)] = e;
280	>	final Object[] es = elements;
281	>	es[head = dec(head, es.length)] = e;
282		if (head == tail)
283	<	doubleCapacity();
283	>	grow(1);
284	>	// checkInvariants();
285		}
286
287		/**
288		* Inserts the specified element at the end of this deque.
202	–	* This method is equivalent to {@link Collection#add} and
203	–	* {@link #push}.
289		*
290	<	* @param e the element to insert
291	<	* @throws NullPointerException if <tt>e</tt> is null
290	>	* <p>This method is equivalent to {@link #add}.
291	>	*
292	>	* @param e the element to add
293	>	* @throws NullPointerException if the specified element is null
294		*/
295		public void addLast(E e) {
296		if (e == null)
297		throw new NullPointerException();
298	<	elements[tail] = e;
299	<	if ( (tail = (tail + 1) & (elements.length - 1)) == head)
300	<	doubleCapacity();
301	<	}
302	<
216	<	/**
217	<	* Retrieves and removes the first element of this deque, or
218	<	* <tt>null</tt> if this deque is empty.
219	<	*
220	<	* @return the first element of this deque, or <tt>null</tt> if
221	<	*     this deque is empty
222	<	*/
223	<	public E pollFirst() {
224	<	int h = head;
225	<	E result = elements[h]; // Element is null if deque empty
226	<	if (result == null)
227	<	return null;
228	<	elements[h] = null;     // Must null out slot
229	<	head = (h + 1) & (elements.length - 1);
230	<	return result;
298	>	final Object[] es = elements;
299	>	es[tail] = e;
300	>	if (head == (tail = inc(tail, es.length)))
301	>	grow(1);
302	>	// checkInvariants();
303		}
304
305		/**
306	<	* Retrieves and removes the last element of this deque, or
307	<	* <tt>null</tt> if this deque is empty.
308	<	*
309	<	* @return the last element of this deque, or <tt>null</tt> if
310	<	*     this deque is empty
311	<	*/
312	<	public E pollLast() {
313	<	int t = (tail - 1) & (elements.length - 1);
314	<	E result = elements[t];
315	<	if (result == null)
316	<	return null;
317	<	elements[t] = null;
318	<	tail = t;
319	<	return result;
306	>	* Adds all of the elements in the specified collection at the end
307	>	* of this deque, as if by calling {@link #addLast} on each one,
308	>	* in the order that they are returned by the collection's
309	>	* iterator.
310	>	*
311	>	* @param c the elements to be inserted into this deque
312	>	* @return {@code true} if this deque changed as a result of the call
313	>	* @throws NullPointerException if the specified collection or any
314	>	*         of its elements are null
315	>	*/
316	>	public boolean addAll(Collection<? extends E> c) {
317	>	final int s = size(), needed;
318	>	if ((needed = s + c.size() - elements.length + 1) > 0)
319	>	grow(needed);
320	>	c.forEach((e) -> addLast(e));
321	>	// checkInvariants();
322	>	return size() > s;
323		}
324
325		/**
326		* Inserts the specified element at the front of this deque.
327		*
328	<	* @param e the element to insert
329	<	* @return <tt>true</tt> (as per the spec for {@link Deque#offerFirst})
330	<	* @throws NullPointerException if <tt>e</tt> is null
328	>	* @param e the element to add
329	>	* @return {@code true} (as specified by {@link Deque#offerFirst})
330	>	* @throws NullPointerException if the specified element is null
331		*/
332		public boolean offerFirst(E e) {
333		addFirst(e);
#	Line 262 | Line 337 | public class ArrayDeque<E> extends Abstr
337		/**
338		* Inserts the specified element at the end of this deque.
339		*
340	<	* @param e the element to insert
341	<	* @return <tt>true</tt> (as per the spec for {@link Deque#offerLast})
342	<	* @throws NullPointerException if <tt>e</tt> is null
340	>	* @param e the element to add
341	>	* @return {@code true} (as specified by {@link Deque#offerLast})
342	>	* @throws NullPointerException if the specified element is null
343		*/
344		public boolean offerLast(E e) {
345		addLast(e);
#	Line 272 | Line 347 | public class ArrayDeque<E> extends Abstr
347		}
348
349		/**
350	<	* 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
350	>	* @throws NoSuchElementException {@inheritDoc}
351		*/
352		public E removeFirst() {
353	<	E x = pollFirst();
354	<	if (x == null)
353	>	E e = pollFirst();
354	>	if (e == null)
355		throw new NoSuchElementException();
356	<	return x;
356	>	// checkInvariants();
357	>	return e;
358		}
359
360		/**
361	<	* 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
361	>	* @throws NoSuchElementException {@inheritDoc}
362		*/
363		public E removeLast() {
364	<	E x = pollLast();
365	<	if (x == null)
364	>	E e = pollLast();
365	>	if (e == null)
366		throw new NoSuchElementException();
367	<	return x;
367	>	// checkInvariants();
368	>	return e;
369		}
370
371	<	/**
372	<	* Retrieves, but does not remove, the first element of this deque,
373	<	* returning <tt>null</tt> if this deque is empty.
374	<	*
375	<	* @return the first element of this deque, or <tt>null</tt> if
376	<	*     this deque is empty
377	<	*/
378	<	public E peekFirst() {
379	<	return elements[head]; // elements[head] is null if deque empty
371	>	public E pollFirst() {
372	>	final Object[] es;
373	>	final int h;
374	>	E e = elementAt(es = elements, h = head);
375	>	if (e != null) {
376	>	es[h] = null;
377	>	head = inc(h, es.length);
378	>	}
379	>	// checkInvariants();
380	>	return e;
381		}
382
383	<	/**
384	<	* Retrieves, but does not remove, the last element of this deque,
385	<	* returning <tt>null</tt> if this deque is empty.
386	<	*
387	<	* @return the last element of this deque, or <tt>null</tt> if this deque
388	<	*     is empty
389	<	*/
390	<	public E peekLast() {
323	<	return elements[(tail - 1) & (elements.length - 1)];
383	>	public E pollLast() {
384	>	final Object[] es;
385	>	final int t;
386	>	E e = elementAt(es = elements, t = dec(tail, es.length));
387	>	if (e != null)
388	>	es[tail = t] = null;
389	>	// checkInvariants();
390	>	return e;
391		}
392
393		/**
394	<	* 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
394	>	* @throws NoSuchElementException {@inheritDoc}
395		*/
396		public E getFirst() {
397	<	E x = elements[head];
398	<	if (x == null)
397	>	E e = elementAt(elements, head);
398	>	if (e == null)
399		throw new NoSuchElementException();
400	<	return x;
400	>	// checkInvariants();
401	>	return e;
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)
408	>	final Object[] es = elements;
409	>	E e = elementAt(es, dec(tail, es.length));
410	>	if (e == null)
411		throw new NoSuchElementException();
412	<	return x;
412	>	// checkInvariants();
413	>	return e;
414	>	}
415	>
416	>	public E peekFirst() {
417	>	// checkInvariants();
418	>	return elementAt(elements, head);
419	>	}
420	>
421	>	public E peekLast() {
422	>	// checkInvariants();
423	>	final Object[] es;
424	>	return elementAt(es = elements, dec(tail, es.length));
425		}
426
427		/**
428		* Removes the first occurrence of the specified element in this
429	<	* deque (when traversing the deque from head to tail).  More
430	<	* formally, removes the first element e such that (o==null ?
431	<	* e==null : o.equals(e)). If the deque does not contain the
432	<	* element, it is unchanged.
429	>	* deque (when traversing the deque from head to tail).
430	>	* If the deque does not contain the element, it is unchanged.
431	>	* More formally, removes the first element {@code e} such that
432	>	* {@code o.equals(e)} (if such an element exists).
433	>	* Returns {@code true} if this deque contained the specified element
434	>	* (or equivalently, if this deque changed as a result of the call).
435		*
436		* @param o element to be removed from this deque, if present
437	<	* @return <tt>true</tt> if the deque contained the specified element
437	>	* @return {@code true} if the deque contained the specified element
438		*/
439		public boolean removeFirstOccurrence(Object o) {
440	<	if (o == null)
441	<	return false;
442	<	int mask = elements.length - 1;
443	<	int i = head;
444	<	E x;
445	<	while ( (x = elements[i]) != null) {
446	<	if (o.equals(x)) {
447	<	delete(i);
448	<	return true;
440	>	if (o != null) {
441	>	final Object[] es = elements;
442	>	for (int i = head, end = tail, to = (i <= end) ? end : es.length;
443	>	; i = 0, to = end) {
444	>	for (; i < to; i++)
445	>	if (o.equals(es[i])) {
446	>	delete(i);
447	>	return true;
448	>	}
449	>	if (to == end) break;
450		}
377	–	i = (i + 1) & mask;
451		}
452		return false;
453		}
454
455		/**
456		* Removes the last occurrence of the specified element in this
457	<	* deque (when traversing the deque from head to tail). More
458	<	* formally, removes the last element e such that (o==null ?
459	<	* e==null : o.equals(e)). If the deque
460	<	* does not contain the element, it is unchanged.
457	>	* deque (when traversing the deque from head to tail).
458	>	* If the deque does not contain the element, it is unchanged.
459	>	* More formally, removes the last element {@code e} such that
460	>	* {@code o.equals(e)} (if such an element exists).
461	>	* Returns {@code true} if this deque contained the specified element
462	>	* (or equivalently, if this deque changed as a result of the call).
463		*
464		* @param o element to be removed from this deque, if present
465	<	* @return <tt>true</tt> if the deque contained the specified element
465	>	* @return {@code true} if the deque contained the specified element
466		*/
467		public boolean removeLastOccurrence(Object o) {
468	<	if (o == null)
469	<	return false;
470	<	int mask = elements.length - 1;
471	<	int i = (tail - 1) & mask;
472	<	E x;
473	<	while ( (x = elements[i]) != null) {
474	<	if (o.equals(x)) {
475	<	delete(i);
476	<	return true;
468	>	if (o != null) {
469	>	final Object[] es = elements;
470	>	for (int i = tail, end = head, to = (i >= end) ? end : 0;
471	>	; i = es.length, to = end) {
472	>	while (--i >= to)
473	>	if (o.equals(es[i])) {
474	>	delete(i);
475	>	return true;
476	>	}
477	>	if (to == end) break;
478		}
403	–	i = (i - 1) & mask;
479		}
480		return false;
481		}
#	Line 410 | Line 485 | public class ArrayDeque<E> extends Abstr
485		/**
486		* Inserts the specified element at the end of this deque.
487		*
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 at the end of this deque.
425	–	*
488		* <p>This method is equivalent to {@link #addLast}.
489		*
490	<	* @param e the element to insert
491	<	* @return <tt>true</tt> (as per the spec for {@link Collection#add})
492	<	* @throws NullPointerException if <tt>e</tt> is null
490	>	* @param e the element to add
491	>	* @return {@code true} (as specified by {@link Collection#add})
492	>	* @throws NullPointerException if the specified element is null
493		*/
494		public boolean add(E e) {
495		addLast(e);
#	Line 435 | Line 497 | public class ArrayDeque<E> extends Abstr
497		}
498
499		/**
500	<	* 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.
500	>	* Inserts the specified element at the end of this deque.
501		*
502	<	* <p>This method is equivalent to {@link #pollFirst}.
502	>	* <p>This method is equivalent to {@link #offerLast}.
503		*
504	<	* @return the first element of this deque, or <tt>null</tt> if
505	<	*     this deque is empty
504	>	* @param e the element to add
505	>	* @return {@code true} (as specified by {@link Queue#offer})
506	>	* @throws NullPointerException if the specified element is null
507		*/
508	<	public E poll() {
509	<	return pollFirst();
508	>	public boolean offer(E e) {
509	>	return offerLast(e);
510		}
511
512		/**
513		* Retrieves and removes the head of the queue represented by this deque.
514	<	* This method differs from the <tt>poll</tt> method in that it throws an
514	>	*
515	>	* This method differs from {@link #poll poll} only in that it throws an
516		* exception if this deque is empty.
517		*
518		* <p>This method is equivalent to {@link #removeFirst}.
519		*
520		* @return the head of the queue represented by this deque
521	<	* @throws NoSuchElementException if this deque is empty
521	>	* @throws NoSuchElementException {@inheritDoc}
522		*/
523		public E remove() {
524		return removeFirst();
525		}
526
527		/**
528	<	* Retrieves, but does not remove, the head of the queue represented by
529	<	* this deque, returning <tt>null</tt> if this deque is empty.
528	>	* Retrieves and removes the head of the queue represented by this deque
529	>	* (in other words, the first element of this deque), or returns
530	>	* {@code null} if this deque is empty.
531		*
532	<	* <p>This method is equivalent to {@link #peekFirst}
532	>	* <p>This method is equivalent to {@link #pollFirst}.
533		*
534		* @return the head of the queue represented by this deque, or
535	<	*     <tt>null</tt> if this deque is empty
535	>	*         {@code null} if this deque is empty
536		*/
537	<	public E peek() {
538	<	return peekFirst();
537	>	public E poll() {
538	>	return pollFirst();
539		}
540
541		/**
542		* Retrieves, but does not remove, the head of the queue represented by
543	<	* this deque.  This method differs from the <tt>peek</tt> method only in
543	>	* this deque.  This method differs from {@link #peek peek} only in
544		* that it throws an exception if this deque is empty.
545		*
546	<	* <p>This method is equivalent to {@link #getFirst}
546	>	* <p>This method is equivalent to {@link #getFirst}.
547		*
548		* @return the head of the queue represented by this deque
549	<	* @throws NoSuchElementException if this deque is empty
549	>	* @throws NoSuchElementException {@inheritDoc}
550		*/
551		public E element() {
552		return getFirst();
553		}
554
555	+	/**
556	+	* Retrieves, but does not remove, the head of the queue represented by
557	+	* this deque, or returns {@code null} if this deque is empty.
558	+	*
559	+	* <p>This method is equivalent to {@link #peekFirst}.
560	+	*
561	+	* @return the head of the queue represented by this deque, or
562	+	*         {@code null} if this deque is empty
563	+	*/
564	+	public E peek() {
565	+	return peekFirst();
566	+	}
567	+
568		// *** Stack methods ***
569
570		/**
#	Line 499 | Line 574 | public class ArrayDeque<E> extends Abstr
574		* <p>This method is equivalent to {@link #addFirst}.
575		*
576		* @param e the element to push
577	<	* @throws NullPointerException if <tt>e</tt> is null
577	>	* @throws NullPointerException if the specified element is null
578		*/
579		public void push(E e) {
580		addFirst(e);
#	Line 512 | Line 587 | public class ArrayDeque<E> extends Abstr
587		* <p>This method is equivalent to {@link #removeFirst()}.
588		*
589		* @return the element at the front of this deque (which is the top
590	<	*     of the stack represented by this deque)
591	<	* @throws NoSuchElementException if this deque is empty
590	>	*         of the stack represented by this deque)
591	>	* @throws NoSuchElementException {@inheritDoc}
592		*/
593		public E pop() {
594		return removeFirst();
595		}
596
597		/**
598	<	* Remove the element at the specified position in the elements array,
599	<	* adjusting head, tail, and size as necessary.  This can result in
600	<	* motion of elements backwards or forwards in the array.
598	>	* Removes the element at the specified position in the elements array.
599	>	* This can result in forward or backwards motion of array elements.
600	>	* We optimize for least element motion.
601		*
602		* <p>This method is called delete rather than remove to emphasize
603	<	* that its semantics differ from those of List.remove(int).
603	>	* that its semantics differ from those of {@link List#remove(int)}.
604		*
605	<	* @return true if elements moved backwards
605	>	* @return true if elements near tail moved backwards
606		*/
607	<	private boolean delete(int i) {
608	<	// Case 1: Deque doesn't wrap
609	<	// Case 2: Deque does wrap and removed element is in the head portion
610	<	if ((head < tail || tail == 0) || i >= head) {
611	<	System.arraycopy(elements, head, elements, head + 1, i - head);
612	<	elements[head] = null;
613	<	head = (head + 1) & (elements.length - 1);
607	>	boolean delete(int i) {
608	>	// checkInvariants();
609	>	final Object[] es = elements;
610	>	final int capacity = es.length;
611	>	final int h = head;
612	>	// number of elements before to-be-deleted elt
613	>	final int front = sub(i, h, capacity);
614	>	final int back = size() - front - 1; // number of elements after
615	>	if (front < back) {
616	>	// move front elements forwards
617	>	if (h <= i) {
618	>	System.arraycopy(es, h, es, h + 1, front);
619	>	} else { // Wrap around
620	>	System.arraycopy(es, 0, es, 1, i);
621	>	es[0] = es[capacity - 1];
622	>	System.arraycopy(es, h, es, h + 1, front - (i + 1));
623	>	}
624	>	es[h] = null;
625	>	head = inc(h, capacity);
626	>	// checkInvariants();
627		return false;
628	+	} else {
629	+	// move back elements backwards
630	+	tail = dec(tail, capacity);
631	+	if (i <= tail) {
632	+	System.arraycopy(es, i + 1, es, i, back);
633	+	} else { // Wrap around
634	+	int firstLeg = capacity - (i + 1);
635	+	System.arraycopy(es, i + 1, es, i, firstLeg);
636	+	es[capacity - 1] = es[0];
637	+	System.arraycopy(es, 1, es, 0, back - firstLeg - 1);
638	+	}
639	+	es[tail] = null;
640	+	// checkInvariants();
641	+	return true;
642		}
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;
643		}
644
645		// *** Collection Methods ***
#	Line 554 | Line 650 | public class ArrayDeque<E> extends Abstr
650		* @return the number of elements in this deque
651		*/
652		public int size() {
653	<	return (tail - head) & (elements.length - 1);
653	>	return sub(tail, head, elements.length);
654		}
655
656		/**
657	<	* Returns <tt>true</tt> if this collection contains no elements.<p>
657	>	* Returns {@code true} if this deque contains no elements.
658		*
659	<	* @return <tt>true</tt> if this collection contains no elements.
659	>	* @return {@code true} if this deque contains no elements
660		*/
661		public boolean isEmpty() {
662		return head == tail;
#	Line 572 | Line 668 | public class ArrayDeque<E> extends Abstr
668		* order that elements would be dequeued (via successive calls to
669		* {@link #remove} or popped (via successive calls to {@link #pop}).
670		*
671	<	* @return an <tt>Iterator</tt> over the elements in this deque
671	>	* @return an iterator over the elements in this deque
672		*/
673		public Iterator<E> iterator() {
674		return new DeqIterator();
675		}
676
677	+	public Iterator<E> descendingIterator() {
678	+	return new DescendingIterator();
679	+	}
680	+
681		private class DeqIterator implements Iterator<E> {
682	<	/**
683	<	* Index of element to be returned by subsequent call to next.
584	<	*/
585	<	private int cursor = head;
682	>	/** Index of element to be returned by subsequent call to next. */
683	>	int cursor;
684
685	<	/**
686	<	* Tail recorded at construction (also in remove), to stop
589	<	* iterator and also to check for comodification.
590	<	*/
591	<	private int fence = tail;
685	>	/** Number of elements yet to be returned. */
686	>	int remaining = size();
687
688		/**
689		* Index of element returned by most recent call to next.
690		* Reset to -1 if element is deleted by a call to remove.
691		*/
692	<	private int lastRet = -1;
692	>	int lastRet = -1;
693
694	<	public boolean hasNext() {
695	<	return cursor != fence;
694	>	DeqIterator() { cursor = head; }
695	>
696	>	public final boolean hasNext() {
697	>	return remaining > 0;
698		}
699
700		public E next() {
701	<	E result;
605	<	if (cursor == fence)
701	>	if (remaining <= 0)
702		throw new NoSuchElementException();
703	<	// This check doesn't catch all possible comodifications,
704	<	// but does catch the ones that corrupt traversal
609	<	if (tail != fence || (result = elements[cursor]) == null)
610	<	throw new ConcurrentModificationException();
703	>	final Object[] es = elements;
704	>	E e = nonNullElementAt(es, cursor);
705		lastRet = cursor;
706	<	cursor = (cursor + 1) & (elements.length - 1);
707	<	return result;
706	>	cursor = inc(cursor, es.length);
707	>	remaining--;
708	>	return e;
709		}
710
711	<	public void remove() {
711	>	void postDelete(boolean leftShifted) {
712	>	if (leftShifted)
713	>	cursor = dec(cursor, elements.length);
714	>	}
715	>
716	>	public final void remove() {
717		if (lastRet < 0)
718		throw new IllegalStateException();
719	<	if (delete(lastRet))
620	<	cursor--;
719	>	postDelete(delete(lastRet));
720		lastRet = -1;
721	<	fence = tail;
721	>	}
722	>
723	>	public void forEachRemaining(Consumer<? super E> action) {
724	>	Objects.requireNonNull(action);
725	>	int r;
726	>	if ((r = remaining) <= 0)
727	>	return;
728	>	remaining = 0;
729	>	final Object[] es = elements;
730	>	if (es[cursor] == null || sub(tail, cursor, es.length) != r)
731	>	throw new ConcurrentModificationException();
732	>	for (int i = cursor, end = tail, to = (i <= end) ? end : es.length;
733	>	; i = 0, to = end) {
734	>	for (; i < to; i++)
735	>	action.accept(elementAt(es, i));
736	>	if (to == end) {
737	>	if (end != tail)
738	>	throw new ConcurrentModificationException();
739	>	lastRet = dec(end, es.length);
740	>	break;
741	>	}
742	>	}
743	>	}
744	>	}
745	>
746	>	private class DescendingIterator extends DeqIterator {
747	>	DescendingIterator() { cursor = dec(tail, elements.length); }
748	>
749	>	public final E next() {
750	>	if (remaining <= 0)
751	>	throw new NoSuchElementException();
752	>	final Object[] es = elements;
753	>	E e = nonNullElementAt(es, cursor);
754	>	lastRet = cursor;
755	>	cursor = dec(cursor, es.length);
756	>	remaining--;
757	>	return e;
758	>	}
759	>
760	>	void postDelete(boolean leftShifted) {
761	>	if (!leftShifted)
762	>	cursor = inc(cursor, elements.length);
763	>	}
764	>
765	>	public final void forEachRemaining(Consumer<? super E> action) {
766	>	Objects.requireNonNull(action);
767	>	int r;
768	>	if ((r = remaining) <= 0)
769	>	return;
770	>	remaining = 0;
771	>	final Object[] es = elements;
772	>	if (es[cursor] == null || sub(cursor, head, es.length) + 1 != r)
773	>	throw new ConcurrentModificationException();
774	>	for (int i = cursor, end = head, to = (i >= end) ? end : 0;
775	>	; i = es.length - 1, to = end) {
776	>	for (; i >= to; i--)
777	>	action.accept(elementAt(es, i));
778	>	if (to == end) {
779	>	if (end != head)
780	>	throw new ConcurrentModificationException();
781	>	lastRet = head;
782	>	break;
783	>	}
784	>	}
785		}
786		}
787
788		/**
789	<	* Returns <tt>true</tt> if this deque contains the specified
790	<	* element.  More formally, returns <tt>true</tt> if and only if this
791	<	* deque contains at least one element <tt>e</tt> such that
792	<	* <tt>e.equals(o)</tt>.
789	>	* Creates a <em><a href="Spliterator.html#binding">late-binding</a></em>
790	>	* and <em>fail-fast</em> {@link Spliterator} over the elements in this
791	>	* deque.
792	>	*
793	>	* <p>The {@code Spliterator} reports {@link Spliterator#SIZED},
794	>	* {@link Spliterator#SUBSIZED}, {@link Spliterator#ORDERED}, and
795	>	* {@link Spliterator#NONNULL}.  Overriding implementations should document
796	>	* the reporting of additional characteristic values.
797	>	*
798	>	* @return a {@code Spliterator} over the elements in this deque
799	>	* @since 1.8
800	>	*/
801	>	public Spliterator<E> spliterator() {
802	>	return new DeqSpliterator();
803	>	}
804	>
805	>	final class DeqSpliterator implements Spliterator<E> {
806	>	private int fence;      // -1 until first use
807	>	private int cursor;     // current index, modified on traverse/split
808	>
809	>	/** Constructs late-binding spliterator over all elements. */
810	>	DeqSpliterator() {
811	>	this.fence = -1;
812	>	}
813	>
814	>	/** Constructs spliterator over the given range. */
815	>	DeqSpliterator(int origin, int fence) {
816	>	this.cursor = origin;
817	>	this.fence = fence;
818	>	}
819	>
820	>	/** Ensures late-binding initialization; then returns fence. */
821	>	private int getFence() { // force initialization
822	>	int t;
823	>	if ((t = fence) < 0) {
824	>	t = fence = tail;
825	>	cursor = head;
826	>	}
827	>	return t;
828	>	}
829	>
830	>	public DeqSpliterator trySplit() {
831	>	final Object[] es = elements;
832	>	final int i, n;
833	>	return ((n = sub(getFence(), i = cursor, es.length) >> 1) <= 0)
834	>	? null
835	>	: new DeqSpliterator(i, cursor = add(i, n, es.length));
836	>	}
837	>
838	>	public void forEachRemaining(Consumer<? super E> action) {
839	>	if (action == null)
840	>	throw new NullPointerException();
841	>	final int end = getFence(), cursor = this.cursor;
842	>	final Object[] es = elements;
843	>	if (cursor != end) {
844	>	this.cursor = end;
845	>	// null check at both ends of range is sufficient
846	>	if (es[cursor] == null || es[dec(end, es.length)] == null)
847	>	throw new ConcurrentModificationException();
848	>	for (int i = cursor, to = (i <= end) ? end : es.length;
849	>	; i = 0, to = end) {
850	>	for (; i < to; i++)
851	>	action.accept(elementAt(es, i));
852	>	if (to == end) break;
853	>	}
854	>	}
855	>	}
856	>
857	>	public boolean tryAdvance(Consumer<? super E> action) {
858	>	if (action == null)
859	>	throw new NullPointerException();
860	>	int t, i;
861	>	if ((t = fence) < 0) t = getFence();
862	>	if (t == (i = cursor))
863	>	return false;
864	>	final Object[] es;
865	>	action.accept(nonNullElementAt(es = elements, i));
866	>	cursor = inc(i, es.length);
867	>	return true;
868	>	}
869	>
870	>	public long estimateSize() {
871	>	return sub(getFence(), cursor, elements.length);
872	>	}
873	>
874	>	public int characteristics() {
875	>	return Spliterator.NONNULL
876	>	| Spliterator.ORDERED
877	>	| Spliterator.SIZED
878	>	| Spliterator.SUBSIZED;
879	>	}
880	>	}
881	>
882	>	public void forEach(Consumer<? super E> action) {
883	>	Objects.requireNonNull(action);
884	>	final Object[] es = elements;
885	>	for (int i = head, end = tail, to = (i <= end) ? end : es.length;
886	>	; i = 0, to = end) {
887	>	for (; i < to; i++)
888	>	action.accept(elementAt(es, i));
889	>	if (to == end) {
890	>	if (end != tail) throw new ConcurrentModificationException();
891	>	break;
892	>	}
893	>	}
894	>	// checkInvariants();
895	>	}
896	>
897	>	/**
898	>	* Replaces each element of this deque with the result of applying the
899	>	* operator to that element, as specified by {@link List#replaceAll}.
900	>	*
901	>	* @param operator the operator to apply to each element
902	>	* @since TBD
903	>	*/
904	>	/* public */ void replaceAll(UnaryOperator<E> operator) {
905	>	Objects.requireNonNull(operator);
906	>	final Object[] es = elements;
907	>	for (int i = head, end = tail, to = (i <= end) ? end : es.length;
908	>	; i = 0, to = end) {
909	>	for (; i < to; i++)
910	>	es[i] = operator.apply(elementAt(es, i));
911	>	if (to == end) {
912	>	if (end != tail) throw new ConcurrentModificationException();
913	>	break;
914	>	}
915	>	}
916	>	// checkInvariants();
917	>	}
918	>
919	>	/**
920	>	* @throws NullPointerException {@inheritDoc}
921	>	*/
922	>	public boolean removeIf(Predicate<? super E> filter) {
923	>	Objects.requireNonNull(filter);
924	>	return bulkRemove(filter);
925	>	}
926	>
927	>	/**
928	>	* @throws NullPointerException {@inheritDoc}
929	>	*/
930	>	public boolean removeAll(Collection<?> c) {
931	>	Objects.requireNonNull(c);
932	>	return bulkRemove(e -> c.contains(e));
933	>	}
934	>
935	>	/**
936	>	* @throws NullPointerException {@inheritDoc}
937	>	*/
938	>	public boolean retainAll(Collection<?> c) {
939	>	Objects.requireNonNull(c);
940	>	return bulkRemove(e -> !c.contains(e));
941	>	}
942	>
943	>	/** Implementation of bulk remove methods. */
944	>	private boolean bulkRemove(Predicate<? super E> filter) {
945	>	// checkInvariants();
946	>	final Object[] es = elements;
947	>	// Optimize for initial run of survivors
948	>	for (int i = head, end = tail, to = (i <= end) ? end : es.length;
949	>	; i = 0, to = end) {
950	>	for (; i < to; i++)
951	>	if (filter.test(elementAt(es, i)))
952	>	return bulkRemoveModified(filter, i, to);
953	>	if (to == end) {
954	>	if (end != tail) throw new ConcurrentModificationException();
955	>	break;
956	>	}
957	>	}
958	>	return false;
959	>	}
960	>
961	>	/**
962	>	* Helper for bulkRemove, in case of at least one deletion.
963	>	* @param i valid index of first element to be deleted
964	>	*/
965	>	private boolean bulkRemoveModified(
966	>	Predicate<? super E> filter, int i, int to) {
967	>	final Object[] es = elements;
968	>	final int capacity = es.length;
969	>	// a two-finger algorithm, with hare i reading, tortoise j writing
970	>	int j = i++;
971	>	final int end = tail;
972	>	try {
973	>	for (;; j = 0) {    // j rejoins i on second leg
974	>	E e;
975	>	// In this loop, i and j are on the same leg, with i > j
976	>	for (; i < to; i++)
977	>	if (!filter.test(e = elementAt(es, i)))
978	>	es[j++] = e;
979	>	if (to == end) break;
980	>	// In this loop, j is on the first leg, i on the second
981	>	for (i = 0, to = end; i < to && j < capacity; i++)
982	>	if (!filter.test(e = elementAt(es, i)))
983	>	es[j++] = e;
984	>	if (i >= to) {
985	>	if (j == capacity) j = 0; // "corner" case
986	>	break;
987	>	}
988	>	}
989	>	return true;
990	>	} catch (Throwable ex) {
991	>	// copy remaining elements
992	>	for (; i != end; i = inc(i, capacity), j = inc(j, capacity))
993	>	es[j] = es[i];
994	>	throw ex;
995	>	} finally {
996	>	if (end != tail) throw new ConcurrentModificationException();
997	>	circularClear(es, tail = j, end);
998	>	// checkInvariants();
999	>	}
1000	>	}
1001	>
1002	>	/**
1003	>	* Returns {@code true} if this deque contains the specified element.
1004	>	* More formally, returns {@code true} if and only if this deque contains
1005	>	* at least one element {@code e} such that {@code o.equals(e)}.
1006		*
1007		* @param o object to be checked for containment in this deque
1008	<	* @return <tt>true</tt> if this deque contains the specified element
1008	>	* @return {@code true} if this deque contains the specified element
1009		*/
1010		public boolean contains(Object o) {
1011	<	if (o == null)
1012	<	return false;
1013	<	int mask = elements.length - 1;
1014	<	int i = head;
1015	<	E x;
1016	<	while ( (x = elements[i]) != null) {
1017	<	if (o.equals(x))
1018	<	return true;
1019	<	i = (i + 1) & mask;
1011	>	if (o != null) {
1012	>	final Object[] es = elements;
1013	>	for (int i = head, end = tail, to = (i <= end) ? end : es.length;
1014	>	; i = 0, to = end) {
1015	>	for (; i < to; i++)
1016	>	if (o.equals(es[i]))
1017	>	return true;
1018	>	if (to == end) break;
1019	>	}
1020		}
1021		return false;
1022		}
1023
1024		/**
1025		* Removes a single instance of the specified element from this deque.
1026	<	* This method is equivalent to {@link #removeFirstOccurrence}.
1026	>	* If the deque does not contain the element, it is unchanged.
1027	>	* More formally, removes the first element {@code e} such that
1028	>	* {@code o.equals(e)} (if such an element exists).
1029	>	* Returns {@code true} if this deque contained the specified element
1030	>	* (or equivalently, if this deque changed as a result of the call).
1031	>	*
1032	>	* <p>This method is equivalent to {@link #removeFirstOccurrence(Object)}.
1033		*
1034	<	* @param e element to be removed from this deque, if present
1035	<	* @return <tt>true</tt> if this deque contained the specified element
1034	>	* @param o element to be removed from this deque, if present
1035	>	* @return {@code true} if this deque contained the specified element
1036		*/
1037	<	public boolean remove(Object e) {
1038	<	return removeFirstOccurrence(e);
1037	>	public boolean remove(Object o) {
1038	>	return removeFirstOccurrence(o);
1039		}
1040
1041		/**
1042		* Removes all of the elements from this deque.
1043	+	* The deque will be empty after this call returns.
1044		*/
1045		public void clear() {
1046	<	int h = head;
1047	<	int t = tail;
1048	<	if (h != t) { // clear all cells
1049	<	head = tail = 0;
1050	<	int i = h;
1051	<	int mask = elements.length - 1;
1052	<	do {
1053	<	elements[i] = null;
1054	<	i = (i + 1) & mask;
1055	<	} while(i != t);
1046	>	circularClear(elements, head, tail);
1047	>	head = tail = 0;
1048	>	// checkInvariants();
1049	>	}
1050	>
1051	>	/**
1052	>	* Nulls out slots starting at array index i, upto index end.
1053	>	*/
1054	>	private static void circularClear(Object[] es, int i, int end) {
1055	>	for (int to = (i <= end) ? end : es.length;
1056	>	; i = 0, to = end) {
1057	>	Arrays.fill(es, i, to, null);
1058	>	if (to == end) break;
1059		}
1060		}
1061
1062		/**
1063		* Returns an array containing all of the elements in this deque
1064	<	* in the correct order.
1064	>	* in proper sequence (from first to last element).
1065	>	*
1066	>	* <p>The returned array will be "safe" in that no references to it are
1067	>	* maintained by this deque.  (In other words, this method must allocate
1068	>	* a new array).  The caller is thus free to modify the returned array.
1069	>	*
1070	>	* <p>This method acts as bridge between array-based and collection-based
1071	>	* APIs.
1072		*
1073		* @return an array containing all of the elements in this deque
682	–	*         in the correct order
1074		*/
1075		public Object[] toArray() {
1076	<	return copyElements(new Object[size()]);
1076	>	return toArray(Object[].class);
1077	>	}
1078	>
1079	>	private <T> T[] toArray(Class<T[]> klazz) {
1080	>	final Object[] es = elements;
1081	>	final T[] a;
1082	>	final int size = size(), head = this.head, end;
1083	>	final int len = Math.min(size, es.length - head);
1084	>	if ((end = head + size) >= 0) {
1085	>	a = Arrays.copyOfRange(es, head, end, klazz);
1086	>	} else {
1087	>	// integer overflow!
1088	>	a = Arrays.copyOfRange(es, 0, size, klazz);
1089	>	System.arraycopy(es, head, a, 0, len);
1090	>	}
1091	>	if (tail < head)
1092	>	System.arraycopy(es, 0, a, len, tail);
1093	>	return a;
1094		}
1095
1096		/**
1097	<	* Returns an array containing all of the elements in this deque in the
1098	<	* correct order; the runtime type of the returned array is that of the
1099	<	* specified array.  If the deque fits in the specified array, it is
1100	<	* returned therein.  Otherwise, a new array is allocated with the runtime
1101	<	* type of the specified array and the size of this deque.
1097	>	* Returns an array containing all of the elements in this deque in
1098	>	* proper sequence (from first to last element); the runtime type of the
1099	>	* returned array is that of the specified array.  If the deque fits in
1100	>	* the specified array, it is returned therein.  Otherwise, a new array
1101	>	* is allocated with the runtime type of the specified array and the
1102	>	* size of this deque.
1103	>	*
1104	>	* <p>If this deque fits in the specified array with room to spare
1105	>	* (i.e., the array has more elements than this deque), the element in
1106	>	* the array immediately following the end of the deque is set to
1107	>	* {@code null}.
1108	>	*
1109	>	* <p>Like the {@link #toArray()} method, this method acts as bridge between
1110	>	* array-based and collection-based APIs.  Further, this method allows
1111	>	* precise control over the runtime type of the output array, and may,
1112	>	* under certain circumstances, be used to save allocation costs.
1113	>	*
1114	>	* <p>Suppose {@code x} is a deque known to contain only strings.
1115	>	* The following code can be used to dump the deque into a newly
1116	>	* allocated array of {@code String}:
1117		*
1118	<	* <p>If the deque fits in the specified array with room to spare (i.e.,
1119	<	* the array has more elements than the deque), the element in the array
1120	<	* immediately following the end of the collection is set to <tt>null</tt>.
1118	>	* <pre> {@code String[] y = x.toArray(new String[0]);}</pre>
1119	>	*
1120	>	* Note that {@code toArray(new Object[0])} is identical in function to
1121	>	* {@code toArray()}.
1122		*
1123		* @param a the array into which the elements of the deque are to
1124	<	*          be stored, if it is big enough; otherwise, a new array of the
1125	<	*          same runtime type is allocated for this purpose
1126	<	* @return an array containing the elements of the deque
1127	<	* @throws ArrayStoreException if the runtime type of a is not a supertype
1128	<	*         of the runtime type of every element in this deque
1124	>	*          be stored, if it is big enough; otherwise, a new array of the
1125	>	*          same runtime type is allocated for this purpose
1126	>	* @return an array containing all of the elements in this deque
1127	>	* @throws ArrayStoreException if the runtime type of the specified array
1128	>	*         is not a supertype of the runtime type of every element in
1129	>	*         this deque
1130	>	* @throws NullPointerException if the specified array is null
1131		*/
1132	+	@SuppressWarnings("unchecked")
1133		public <T> T[] toArray(T[] a) {
1134	<	int size = size();
1135	<	if (a.length < size)
1136	<	a = (T[])java.lang.reflect.Array.newInstance(
1137	<	a.getClass().getComponentType(), size);
1138	<	copyElements(a);
1139	<	if (a.length > size)
1134	>	final int size;
1135	>	if ((size = size()) > a.length)
1136	>	return toArray((Class<T[]>) a.getClass());
1137	>	final Object[] es = elements;
1138	>	for (int i = head, j = 0, len = Math.min(size, es.length - i);
1139	>	; i = 0, len = tail) {
1140	>	System.arraycopy(es, i, a, j, len);
1141	>	if ((j += len) == size) break;
1142	>	}
1143	>	if (size < a.length)
1144		a[size] = null;
1145		return a;
1146		}
#	Line 723 | Line 1154 | public class ArrayDeque<E> extends Abstr
1154		*/
1155		public ArrayDeque<E> clone() {
1156		try {
1157	+	@SuppressWarnings("unchecked")
1158		ArrayDeque<E> result = (ArrayDeque<E>) super.clone();
1159	<	// 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);
1159	>	result.elements = Arrays.copyOf(elements, elements.length);
1160		return result;
731	–
1161		} catch (CloneNotSupportedException e) {
1162		throw new AssertionError();
1163		}
1164		}
1165
737	–	/**
738	–	* Appease the serialization gods.
739	–	*/
1166		private static final long serialVersionUID = 2340985798034038923L;
1167
1168		/**
1169	<	* Serialize this deque.
1169	>	* Saves this deque to a stream (that is, serializes it).
1170		*
1171	<	* @serialData The current size (<tt>int</tt>) of the deque,
1171	>	* @param s the stream
1172	>	* @throws java.io.IOException if an I/O error occurs
1173	>	* @serialData The current size ({@code int}) of the deque,
1174		* followed by all of its elements (each an object reference) in
1175		* first-to-last order.
1176		*/
1177	<	private void writeObject(ObjectOutputStream s) throws IOException {
1177	>	private void writeObject(java.io.ObjectOutputStream s)
1178	>	throws java.io.IOException {
1179		s.defaultWriteObject();
1180
1181		// Write out size
1182	<	int size = size();
754	<	s.writeInt(size);
1182	>	s.writeInt(size());
1183
1184		// Write out elements in order.
1185	<	int i = head;
1186	<	int mask = elements.length - 1;
1187	<	for (int j = 0; j < size; j++) {
1188	<	s.writeObject(elements[i]);
1189	<	i = (i + 1) & mask;
1185	>	final Object[] es = elements;
1186	>	for (int i = head, end = tail, to = (i <= end) ? end : es.length;
1187	>	; i = 0, to = end) {
1188	>	for (; i < to; i++)
1189	>	s.writeObject(es[i]);
1190	>	if (to == end) break;
1191		}
1192		}
1193
1194		/**
1195	<	* Deserialize this deque.
1195	>	* Reconstitutes this deque from a stream (that is, deserializes it).
1196	>	* @param s the stream
1197	>	* @throws ClassNotFoundException if the class of a serialized object
1198	>	*         could not be found
1199	>	* @throws java.io.IOException if an I/O error occurs
1200		*/
1201	<	private void readObject(ObjectInputStream s)
1202	<	throws IOException, ClassNotFoundException {
1201	>	private void readObject(java.io.ObjectInputStream s)
1202	>	throws java.io.IOException, ClassNotFoundException {
1203		s.defaultReadObject();
1204
1205		// Read in size and allocate array
1206		int size = s.readInt();
1207	<	allocateElements(size);
1208	<	head = 0;
776	<	tail = size;
1207	>	elements = new Object[size + 1];
1208	>	this.tail = size;
1209
1210		// Read in all elements in the proper order.
1211		for (int i = 0; i < size; i++)
1212	<	elements[i] = (E)s.readObject();
1212	>	elements[i] = s.readObject();
1213	>	}
1214
1215	+	/** debugging */
1216	+	void checkInvariants() {
1217	+	try {
1218	+	int capacity = elements.length;
1219	+	// assert head >= 0 && head < capacity;
1220	+	// assert tail >= 0 && tail < capacity;
1221	+	// assert capacity > 0;
1222	+	// assert size() < capacity;
1223	+	// assert head == tail || elements[head] != null;
1224	+	// assert elements[tail] == null;
1225	+	// assert head == tail || elements[dec(tail, capacity)] != null;
1226	+	} catch (Throwable t) {
1227	+	System.err.printf("head=%d tail=%d capacity=%d%n",
1228	+	head, tail, elements.length);
1229	+	System.err.printf("elements=%s%n",
1230	+	Arrays.toString(elements));
1231	+	throw t;
1232	+	}
1233		}
1234	+
1235		}

Diff Legend

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