ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/main/java/util/ArrayList.java

Comparing jsr166/src/main/java/util/ArrayList.java (file contents):
Revision 1.31 by jsr166, Tue Sep 21 17:00:45 2010 UTC vs.
Revision 1.36 by jsr166, Mon Oct 31 23:02:42 2016 UTC

#	Line 1 | Line 1
1		/*
2	<	* Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
2	>	* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
3		* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4		*
5		* This code is free software; you can redistribute it and/or modify it
6		* under the terms of the GNU General Public License version 2 only, as
7	<	* published by the Free Software Foundation.  Sun designates this
7	>	* published by the Free Software Foundation.  Oracle designates this
8		* particular file as subject to the "Classpath" exception as provided
9	<	* by Sun in the LICENSE file that accompanied this code.
9	>	* by Oracle in the LICENSE file that accompanied this code.
10		*
11		* This code is distributed in the hope that it will be useful, but WITHOUT
12		* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
#	Line 25 | Line 25
25
26		package java.util;
27
28	+	import java.util.function.Consumer;
29	+	import java.util.function.Predicate;
30	+	import java.util.function.UnaryOperator;
31	+
32		/**
33	<	* Resizable-array implementation of the <tt>List</tt> interface.  Implements
33	>	* Resizable-array implementation of the {@code List} interface.  Implements
34		* all optional list operations, and permits all elements, including
35	<	* <tt>null</tt>.  In addition to implementing the <tt>List</tt> interface,
35	>	* {@code null}.  In addition to implementing the {@code List} interface,
36		* this class provides methods to manipulate the size of the array that is
37		* used internally to store the list.  (This class is roughly equivalent to
38	<	* <tt>Vector</tt>, except that it is unsynchronized.)
38	>	* {@code Vector}, except that it is unsynchronized.)
39		*
40	<	* <p>The <tt>size</tt>, <tt>isEmpty</tt>, <tt>get</tt>, <tt>set</tt>,
41	<	* <tt>iterator</tt>, and <tt>listIterator</tt> operations run in constant
42	<	* time.  The <tt>add</tt> operation runs in <i>amortized constant time</i>,
40	>	* <p>The {@code size}, {@code isEmpty}, {@code get}, {@code set},
41	>	* {@code iterator}, and {@code listIterator} operations run in constant
42	>	* time.  The {@code add} operation runs in <i>amortized constant time</i>,
43		* that is, adding n elements requires O(n) time.  All of the other operations
44		* run in linear time (roughly speaking).  The constant factor is low compared
45	<	* to that for the <tt>LinkedList</tt> implementation.
45	>	* to that for the {@code LinkedList} implementation.
46		*
47	<	* <p>Each <tt>ArrayList</tt> instance has a <i>capacity</i>.  The capacity is
47	>	* <p>Each {@code ArrayList} instance has a <i>capacity</i>.  The capacity is
48		* the size of the array used to store the elements in the list.  It is always
49		* at least as large as the list size.  As elements are added to an ArrayList,
50		* its capacity grows automatically.  The details of the growth policy are not
51		* specified beyond the fact that adding an element has constant amortized
52		* time cost.
53		*
54	<	* <p>An application can increase the capacity of an <tt>ArrayList</tt> instance
55	<	* before adding a large number of elements using the <tt>ensureCapacity</tt>
54	>	* <p>An application can increase the capacity of an {@code ArrayList} instance
55	>	* before adding a large number of elements using the {@code ensureCapacity}
56		* operation.  This may reduce the amount of incremental reallocation.
57		*
58		* <p><strong>Note that this implementation is not synchronized.</strong>
59	<	* If multiple threads access an <tt>ArrayList</tt> instance concurrently,
59	>	* If multiple threads access an {@code ArrayList} instance concurrently,
60		* and at least one of the threads modifies the list structurally, it
61		* <i>must</i> be synchronized externally.  (A structural modification is
62		* any operation that adds or deletes one or more elements, or explicitly
#	Line 66 | Line 70 | package java.util;
70		* unsynchronized access to the list:<pre>
71		*   List list = Collections.synchronizedList(new ArrayList(...));</pre>
72		*
73	<	* <p><a name="fail-fast"/>
73	>	* <p id="fail-fast">
74		* The iterators returned by this class's {@link #iterator() iterator} and
75		* {@link #listIterator(int) listIterator} methods are <em>fail-fast</em>:
76		* if the list is structurally modified at any time after the iterator is
#	Line 90 | Line 94 | package java.util;
94		* <a href="{@docRoot}/../technotes/guides/collections/index.html">
95		* Java Collections Framework</a>.
96		*
97	+	* @param <E> the type of elements in this list
98	+	*
99		* @author  Josh Bloch
100		* @author  Neal Gafter
101		* @see     Collection
#	Line 98 | Line 104 | package java.util;
104		* @see     Vector
105		* @since   1.2
106		*/
101	–
107		public class ArrayList<E> extends AbstractList<E>
108		implements List<E>, RandomAccess, Cloneable, java.io.Serializable
109		{
110		private static final long serialVersionUID = 8683452581122892189L;
111
112		/**
113	+	* Default initial capacity.
114	+	*/
115	+	private static final int DEFAULT_CAPACITY = 10;
116	+
117	+	/**
118	+	* Shared empty array instance used for empty instances.
119	+	*/
120	+	private static final Object[] EMPTY_ELEMENTDATA = {};
121	+
122	+	/**
123	+	* Shared empty array instance used for default sized empty instances. We
124	+	* distinguish this from EMPTY_ELEMENTDATA to know how much to inflate when
125	+	* first element is added.
126	+	*/
127	+	private static final Object[] DEFAULTCAPACITY_EMPTY_ELEMENTDATA = {};
128	+
129	+	/**
130		* The array buffer into which the elements of the ArrayList are stored.
131	<	* The capacity of the ArrayList is the length of this array buffer.
131	>	* The capacity of the ArrayList is the length of this array buffer. Any
132	>	* empty ArrayList with elementData == DEFAULTCAPACITY_EMPTY_ELEMENTDATA
133	>	* will be expanded to DEFAULT_CAPACITY when the first element is added.
134		*/
135	<	private transient Object[] elementData;
135	>	transient Object[] elementData; // non-private to simplify nested class access
136
137		/**
138		* The size of the ArrayList (the number of elements it contains).
#	Line 125 | Line 149 | public class ArrayList<E> extends Abstra
149		*         is negative
150		*/
151		public ArrayList(int initialCapacity) {
152	<	super();
153	<	if (initialCapacity < 0)
152	>	if (initialCapacity > 0) {
153	>	this.elementData = new Object[initialCapacity];
154	>	} else if (initialCapacity == 0) {
155	>	this.elementData = EMPTY_ELEMENTDATA;
156	>	} else {
157		throw new IllegalArgumentException("Illegal Capacity: "+
158		initialCapacity);
159	<	this.elementData = new Object[initialCapacity];
159	>	}
160		}
161
162		/**
163		* Constructs an empty list with an initial capacity of ten.
164		*/
165		public ArrayList() {
166	<	this(10);
166	>	this.elementData = DEFAULTCAPACITY_EMPTY_ELEMENTDATA;
167		}
168
169		/**
#	Line 149 | Line 176 | public class ArrayList<E> extends Abstra
176		*/
177		public ArrayList(Collection<? extends E> c) {
178		elementData = c.toArray();
179	<	size = elementData.length;
180	<	// c.toArray might (incorrectly) not return Object[] (see 6260652)
181	<	if (elementData.getClass() != Object[].class)
182	<	elementData = Arrays.copyOf(elementData, size, Object[].class);
179	>	if ((size = elementData.length) != 0) {
180	>	// defend against c.toArray (incorrectly) not returning Object[]
181	>	// (see e.g. https://bugs.openjdk.java.net/browse/JDK-6260652)
182	>	if (elementData.getClass() != Object[].class)
183	>	elementData = Arrays.copyOf(elementData, size, Object[].class);
184	>	} else {
185	>	// replace with empty array.
186	>	this.elementData = EMPTY_ELEMENTDATA;
187	>	}
188		}
189
190		/**
191	<	* Trims the capacity of this <tt>ArrayList</tt> instance to be the
191	>	* Trims the capacity of this {@code ArrayList} instance to be the
192		* list's current size.  An application can use this operation to minimize
193	<	* the storage of an <tt>ArrayList</tt> instance.
193	>	* the storage of an {@code ArrayList} instance.
194		*/
195		public void trimToSize() {
196		modCount++;
197	<	int oldCapacity = elementData.length;
198	<	if (size < oldCapacity) {
199	<	elementData = Arrays.copyOf(elementData, size);
197	>	if (size < elementData.length) {
198	>	elementData = (size == 0)
199	>	? EMPTY_ELEMENTDATA
200	>	: Arrays.copyOf(elementData, size);
201		}
202		}
203
204		/**
205	<	* Increases the capacity of this <tt>ArrayList</tt> instance, if
205	>	* Increases the capacity of this {@code ArrayList} instance, if
206		* necessary, to ensure that it can hold at least the number of elements
207		* specified by the minimum capacity argument.
208		*
209	<	* @param   minCapacity   the desired minimum capacity
209	>	* @param minCapacity the desired minimum capacity
210		*/
211		public void ensureCapacity(int minCapacity) {
212	<	modCount++;
213	<	int oldCapacity = elementData.length;
214	<	if (minCapacity > oldCapacity) {
215	<	int newCapacity = (oldCapacity * 3)/2 + 1;
216	<	if (newCapacity < minCapacity)
184	<	newCapacity = minCapacity;
185	<	// minCapacity is usually close to size, so this is a win:
186	<	elementData = Arrays.copyOf(elementData, newCapacity);
212	>	if (minCapacity > elementData.length
213	>	&& !(elementData == DEFAULTCAPACITY_EMPTY_ELEMENTDATA
214	>	&& minCapacity <= DEFAULT_CAPACITY)) {
215	>	modCount++;
216	>	grow(minCapacity);
217		}
218		}
219
220		/**
221	+	* The maximum size of array to allocate (unless necessary).
222	+	* Some VMs reserve some header words in an array.
223	+	* Attempts to allocate larger arrays may result in
224	+	* OutOfMemoryError: Requested array size exceeds VM limit
225	+	*/
226	+	private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
227	+
228	+	/**
229	+	* Increases the capacity to ensure that it can hold at least the
230	+	* number of elements specified by the minimum capacity argument.
231	+	*
232	+	* @param minCapacity the desired minimum capacity
233	+	* @throws OutOfMemoryError if minCapacity is less than zero
234	+	*/
235	+	private Object[] grow(int minCapacity) {
236	+	return elementData = Arrays.copyOf(elementData,
237	+	newCapacity(minCapacity));
238	+	}
239	+
240	+	private Object[] grow() {
241	+	return grow(size + 1);
242	+	}
243	+
244	+	/**
245	+	* Returns a capacity at least as large as the given minimum capacity.
246	+	* Returns the current capacity increased by 50% if that suffices.
247	+	* Will not return a capacity greater than MAX_ARRAY_SIZE unless
248	+	* the given minimum capacity is greater than MAX_ARRAY_SIZE.
249	+	*
250	+	* @param minCapacity the desired minimum capacity
251	+	* @throws OutOfMemoryError if minCapacity is less than zero
252	+	*/
253	+	private int newCapacity(int minCapacity) {
254	+	// overflow-conscious code
255	+	int oldCapacity = elementData.length;
256	+	int newCapacity = oldCapacity + (oldCapacity >> 1);
257	+	if (newCapacity - minCapacity <= 0) {
258	+	if (elementData == DEFAULTCAPACITY_EMPTY_ELEMENTDATA)
259	+	return Math.max(DEFAULT_CAPACITY, minCapacity);
260	+	if (minCapacity < 0) // overflow
261	+	throw new OutOfMemoryError();
262	+	return minCapacity;
263	+	}
264	+	return (newCapacity - MAX_ARRAY_SIZE <= 0)
265	+	? newCapacity
266	+	: hugeCapacity(minCapacity);
267	+	}
268	+
269	+	private static int hugeCapacity(int minCapacity) {
270	+	if (minCapacity < 0) // overflow
271	+	throw new OutOfMemoryError();
272	+	return (minCapacity > MAX_ARRAY_SIZE)
273	+	? Integer.MAX_VALUE
274	+	: MAX_ARRAY_SIZE;
275	+	}
276	+
277	+	/**
278		* Returns the number of elements in this list.
279		*
280		* @return the number of elements in this list
#	Line 197 | Line 284 | public class ArrayList<E> extends Abstra
284		}
285
286		/**
287	<	* Returns <tt>true</tt> if this list contains no elements.
287	>	* Returns {@code true} if this list contains no elements.
288		*
289	<	* @return <tt>true</tt> if this list contains no elements
289	>	* @return {@code true} if this list contains no elements
290		*/
291		public boolean isEmpty() {
292		return size == 0;
293		}
294
295		/**
296	<	* Returns <tt>true</tt> if this list contains the specified element.
297	<	* More formally, returns <tt>true</tt> if and only if this list contains
298	<	* at least one element <tt>e</tt> such that
299	<	* <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>.
296	>	* Returns {@code true} if this list contains the specified element.
297	>	* More formally, returns {@code true} if and only if this list contains
298	>	* at least one element {@code e} such that
299	>	* {@code Objects.equals(o, e)}.
300		*
301		* @param o element whose presence in this list is to be tested
302	<	* @return <tt>true</tt> if this list contains the specified element
302	>	* @return {@code true} if this list contains the specified element
303		*/
304		public boolean contains(Object o) {
305		return indexOf(o) >= 0;
#	Line 221 | Line 308 | public class ArrayList<E> extends Abstra
308		/**
309		* Returns the index of the first occurrence of the specified element
310		* in this list, or -1 if this list does not contain the element.
311	<	* More formally, returns the lowest index <tt>i</tt> such that
312	<	* <tt>(o==null&nbsp;?&nbsp;get(i)==null&nbsp;:&nbsp;o.equals(get(i)))</tt>,
311	>	* More formally, returns the lowest index {@code i} such that
312	>	* {@code Objects.equals(o, get(i))},
313		* or -1 if there is no such index.
314		*/
315		public int indexOf(Object o) {
#	Line 241 | Line 328 | public class ArrayList<E> extends Abstra
328		/**
329		* Returns the index of the last occurrence of the specified element
330		* in this list, or -1 if this list does not contain the element.
331	<	* More formally, returns the highest index <tt>i</tt> such that
332	<	* <tt>(o==null&nbsp;?&nbsp;get(i)==null&nbsp;:&nbsp;o.equals(get(i)))</tt>,
331	>	* More formally, returns the highest index {@code i} such that
332	>	* {@code Objects.equals(o, get(i))},
333		* or -1 if there is no such index.
334		*/
335		public int lastIndexOf(Object o) {
#	Line 259 | Line 346 | public class ArrayList<E> extends Abstra
346		}
347
348		/**
349	<	* Returns a shallow copy of this <tt>ArrayList</tt> instance.  (The
349	>	* Returns a shallow copy of this {@code ArrayList} instance.  (The
350		* elements themselves are not copied.)
351		*
352	<	* @return a clone of this <tt>ArrayList</tt> instance
352	>	* @return a clone of this {@code ArrayList} instance
353		*/
354		public Object clone() {
355		try {
356	<	@SuppressWarnings("unchecked")
270	<	ArrayList<E> v = (ArrayList<E>) super.clone();
356	>	ArrayList<?> v = (ArrayList<?>) super.clone();
357		v.elementData = Arrays.copyOf(elementData, size);
358		v.modCount = 0;
359		return v;
360		} catch (CloneNotSupportedException e) {
361		// this shouldn't happen, since we are Cloneable
362	<	throw new InternalError();
362	>	throw new InternalError(e);
363		}
364		}
365
#	Line 306 | Line 392 | public class ArrayList<E> extends Abstra
392		* <p>If the list fits in the specified array with room to spare
393		* (i.e., the array has more elements than the list), the element in
394		* the array immediately following the end of the collection is set to
395	<	* <tt>null</tt>.  (This is useful in determining the length of the
395	>	* {@code null}.  (This is useful in determining the length of the
396		* list <i>only</i> if the caller knows that the list does not contain
397		* any null elements.)
398		*
#	Line 345 | Line 431 | public class ArrayList<E> extends Abstra
431		* @throws IndexOutOfBoundsException {@inheritDoc}
432		*/
433		public E get(int index) {
434	<	rangeCheck(index);
349	<
434	>	Objects.checkIndex(index, size);
435		return elementData(index);
436		}
437
#	Line 360 | Line 445 | public class ArrayList<E> extends Abstra
445		* @throws IndexOutOfBoundsException {@inheritDoc}
446		*/
447		public E set(int index, E element) {
448	<	rangeCheck(index);
364	<
448	>	Objects.checkIndex(index, size);
449		E oldValue = elementData(index);
450		elementData[index] = element;
451		return oldValue;
452		}
453
454		/**
455	+	* This helper method split out from add(E) to keep method
456	+	* bytecode size under 35 (the -XX:MaxInlineSize default value),
457	+	* which helps when add(E) is called in a C1-compiled loop.
458	+	*/
459	+	private void add(E e, Object[] elementData, int s) {
460	+	if (s == elementData.length)
461	+	elementData = grow();
462	+	elementData[s] = e;
463	+	size = s + 1;
464	+	}
465	+
466	+	/**
467		* Appends the specified element to the end of this list.
468		*
469		* @param e element to be appended to this list
470	<	* @return <tt>true</tt> (as specified by {@link Collection#add})
470	>	* @return {@code true} (as specified by {@link Collection#add})
471		*/
472		public boolean add(E e) {
473	<	ensureCapacity(size + 1);  // Increments modCount!!
474	<	elementData[size++] = e;
473	>	modCount++;
474	>	add(e, elementData, size);
475		return true;
476		}
477
#	Line 390 | Line 486 | public class ArrayList<E> extends Abstra
486		*/
487		public void add(int index, E element) {
488		rangeCheckForAdd(index);
489	<
490	<	ensureCapacity(size+1);  // Increments modCount!!
491	<	System.arraycopy(elementData, index, elementData, index + 1,
492	<	size - index);
489	>	modCount++;
490	>	final int s;
491	>	Object[] elementData;
492	>	if ((s = size) == (elementData = this.elementData).length)
493	>	elementData = grow();
494	>	System.arraycopy(elementData, index,
495	>	elementData, index + 1,
496	>	s - index);
497		elementData[index] = element;
498	<	size++;
498	>	size = s + 1;
499		}
500
501		/**
#	Line 408 | Line 508 | public class ArrayList<E> extends Abstra
508		* @throws IndexOutOfBoundsException {@inheritDoc}
509		*/
510		public E remove(int index) {
511	<	rangeCheck(index);
511	>	Objects.checkIndex(index, size);
512
513		modCount++;
514		E oldValue = elementData(index);
#	Line 417 | Line 517 | public class ArrayList<E> extends Abstra
517		if (numMoved > 0)
518		System.arraycopy(elementData, index+1, elementData, index,
519		numMoved);
520	<	elementData[--size] = null; // Let gc do its work
520	>	elementData[--size] = null; // clear to let GC do its work
521
522		return oldValue;
523		}
#	Line 426 | Line 526 | public class ArrayList<E> extends Abstra
526		* Removes the first occurrence of the specified element from this list,
527		* if it is present.  If the list does not contain the element, it is
528		* unchanged.  More formally, removes the element with the lowest index
529	<	* <tt>i</tt> such that
530	<	* <tt>(o==null&nbsp;?&nbsp;get(i)==null&nbsp;:&nbsp;o.equals(get(i)))</tt>
531	<	* (if such an element exists).  Returns <tt>true</tt> if this list
529	>	* {@code i} such that
530	>	* {@code Objects.equals(o, get(i))}
531	>	* (if such an element exists).  Returns {@code true} if this list
532		* contained the specified element (or equivalently, if this list
533		* changed as a result of the call).
534		*
535		* @param o element to be removed from this list, if present
536	<	* @return <tt>true</tt> if this list contained the specified element
536	>	* @return {@code true} if this list contained the specified element
537		*/
538		public boolean remove(Object o) {
539		if (o == null) {
#	Line 462 | Line 562 | public class ArrayList<E> extends Abstra
562		if (numMoved > 0)
563		System.arraycopy(elementData, index+1, elementData, index,
564		numMoved);
565	<	elementData[--size] = null; // Let gc do its work
565	>	elementData[--size] = null; // clear to let GC do its work
566		}
567
568		/**
#	Line 472 | Line 572 | public class ArrayList<E> extends Abstra
572		public void clear() {
573		modCount++;
574
575	<	// Let gc do its work
575	>	// clear to let GC do its work
576		for (int i = 0; i < size; i++)
577		elementData[i] = null;
578
#	Line 489 | Line 589 | public class ArrayList<E> extends Abstra
589		* list is nonempty.)
590		*
591		* @param c collection containing elements to be added to this list
592	<	* @return <tt>true</tt> if this list changed as a result of the call
592	>	* @return {@code true} if this list changed as a result of the call
593		* @throws NullPointerException if the specified collection is null
594		*/
595		public boolean addAll(Collection<? extends E> c) {
596		Object[] a = c.toArray();
597	+	modCount++;
598		int numNew = a.length;
599	<	ensureCapacity(size + numNew);  // Increments modCount
600	<	System.arraycopy(a, 0, elementData, size, numNew);
601	<	size += numNew;
602	<	return numNew != 0;
599	>	if (numNew == 0)
600	>	return false;
601	>	Object[] elementData;
602	>	final int s;
603	>	if (numNew > (elementData = this.elementData).length - (s = size))
604	>	elementData = grow(s + numNew);
605	>	System.arraycopy(a, 0, elementData, s, numNew);
606	>	size = s + numNew;
607	>	return true;
608		}
609
610		/**
#	Line 512 | Line 618 | public class ArrayList<E> extends Abstra
618		* @param index index at which to insert the first element from the
619		*              specified collection
620		* @param c collection containing elements to be added to this list
621	<	* @return <tt>true</tt> if this list changed as a result of the call
621	>	* @return {@code true} if this list changed as a result of the call
622		* @throws IndexOutOfBoundsException {@inheritDoc}
623		* @throws NullPointerException if the specified collection is null
624		*/
#	Line 520 | Line 626 | public class ArrayList<E> extends Abstra
626		rangeCheckForAdd(index);
627
628		Object[] a = c.toArray();
629	+	modCount++;
630		int numNew = a.length;
631	<	ensureCapacity(size + numNew);  // Increments modCount
631	>	if (numNew == 0)
632	>	return false;
633	>	Object[] elementData;
634	>	final int s;
635	>	if (numNew > (elementData = this.elementData).length - (s = size))
636	>	elementData = grow(s + numNew);
637
638	<	int numMoved = size - index;
638	>	int numMoved = s - index;
639		if (numMoved > 0)
640	<	System.arraycopy(elementData, index, elementData, index + numNew,
640	>	System.arraycopy(elementData, index,
641	>	elementData, index + numNew,
642		numMoved);
530	–
643		System.arraycopy(a, 0, elementData, index, numNew);
644	<	size += numNew;
645	<	return numNew != 0;
644	>	size = s + numNew;
645	>	return true;
646		}
647
648		/**
#	Line 543 | Line 655 | public class ArrayList<E> extends Abstra
655		* @throws IndexOutOfBoundsException if {@code fromIndex} or
656		*         {@code toIndex} is out of range
657		*         ({@code fromIndex < 0 ||
546	–	*          fromIndex >= size() ||
658		*          toIndex > size() ||
659		*          toIndex < fromIndex})
660		*/
661		protected void removeRange(int fromIndex, int toIndex) {
662	+	if (fromIndex > toIndex) {
663	+	throw new IndexOutOfBoundsException(
664	+	outOfBoundsMsg(fromIndex, toIndex));
665	+	}
666		modCount++;
667		int numMoved = size - toIndex;
668		System.arraycopy(elementData, toIndex, elementData, fromIndex,
669		numMoved);
670
671	<	// Let gc do its work
671	>	// clear to let GC do its work
672		int newSize = size - (toIndex-fromIndex);
673	<	while (size != newSize)
674	<	elementData[--size] = null;
675	<	}
676	<
562	<	/**
563	<	* Checks if the given index is in range.  If not, throws an appropriate
564	<	* runtime exception.  This method does *not* check if the index is
565	<	* negative: It is always used immediately prior to an array access,
566	<	* which throws an ArrayIndexOutOfBoundsException if index is negative.
567	<	*/
568	<	private void rangeCheck(int index) {
569	<	if (index >= size)
570	<	throw new IndexOutOfBoundsException(outOfBoundsMsg(index));
673	>	for (int i = newSize; i < size; i++) {
674	>	elementData[i] = null;
675	>	}
676	>	size = newSize;
677		}
678
679		/**
#	Line 588 | Line 694 | public class ArrayList<E> extends Abstra
694		}
695
696		/**
697	+	* A version used in checking (fromIndex > toIndex) condition
698	+	*/
699	+	private static String outOfBoundsMsg(int fromIndex, int toIndex) {
700	+	return "From Index: " + fromIndex + " > To Index: " + toIndex;
701	+	}
702	+
703	+	/**
704		* Removes from this list all of its elements that are contained in the
705		* specified collection.
706		*
707		* @param c collection containing elements to be removed from this list
708		* @return {@code true} if this list changed as a result of the call
709		* @throws ClassCastException if the class of an element of this list
710	<	*         is incompatible with the specified collection (optional)
710	>	*         is incompatible with the specified collection
711	>	* (<a href="Collection.html#optional-restrictions">optional</a>)
712		* @throws NullPointerException if this list contains a null element and the
713	<	*         specified collection does not permit null elements (optional),
713	>	*         specified collection does not permit null elements
714	>	* (<a href="Collection.html#optional-restrictions">optional</a>),
715		*         or if the specified collection is null
716		* @see Collection#contains(Object)
717		*/
718		public boolean removeAll(Collection<?> c) {
719	+	Objects.requireNonNull(c);
720		return batchRemove(c, false);
721		}
722
#	Line 612 | Line 728 | public class ArrayList<E> extends Abstra
728		* @param c collection containing elements to be retained in this list
729		* @return {@code true} if this list changed as a result of the call
730		* @throws ClassCastException if the class of an element of this list
731	<	*         is incompatible with the specified collection (optional)
731	>	*         is incompatible with the specified collection
732	>	* (<a href="Collection.html#optional-restrictions">optional</a>)
733		* @throws NullPointerException if this list contains a null element and the
734	<	*         specified collection does not permit null elements (optional),
734	>	*         specified collection does not permit null elements
735	>	* (<a href="Collection.html#optional-restrictions">optional</a>),
736		*         or if the specified collection is null
737		* @see Collection#contains(Object)
738		*/
739		public boolean retainAll(Collection<?> c) {
740	+	Objects.requireNonNull(c);
741		return batchRemove(c, true);
742		}
743
#	Line 640 | Line 759 | public class ArrayList<E> extends Abstra
759		w += size - r;
760		}
761		if (w != size) {
762	+	// clear to let GC do its work
763		for (int i = w; i < size; i++)
764		elementData[i] = null;
765		modCount += size - w;
#	Line 651 | Line 771 | public class ArrayList<E> extends Abstra
771		}
772
773		/**
774	<	* Save the state of the <tt>ArrayList</tt> instance to a stream (that
774	>	* Save the state of the {@code ArrayList} instance to a stream (that
775		* is, serialize it).
776		*
777	<	* @serialData The length of the array backing the <tt>ArrayList</tt>
777	>	* @serialData The length of the array backing the {@code ArrayList}
778		*             instance is emitted (int), followed by all of its elements
779	<	*             (each an <tt>Object</tt>) in the proper order.
779	>	*             (each an {@code Object}) in the proper order.
780		*/
781		private void writeObject(java.io.ObjectOutputStream s)
782		throws java.io.IOException{
#	Line 664 | Line 784 | public class ArrayList<E> extends Abstra
784		int expectedModCount = modCount;
785		s.defaultWriteObject();
786
787	<	// Write out array length
788	<	s.writeInt(elementData.length);
787	>	// Write out size as capacity for behavioural compatibility with clone()
788	>	s.writeInt(size);
789
790		// Write out all elements in the proper order.
791	<	for (int i=0; i<size; i++)
791	>	for (int i=0; i<size; i++) {
792		s.writeObject(elementData[i]);
793	+	}
794
795		if (modCount != expectedModCount) {
796		throw new ConcurrentModificationException();
797		}
677	–
798		}
799
800		/**
801	<	* Reconstitute the <tt>ArrayList</tt> instance from a stream (that is,
801	>	* Reconstitute the {@code ArrayList} instance from a stream (that is,
802		* deserialize it).
803		*/
804		private void readObject(java.io.ObjectInputStream s)
805		throws java.io.IOException, ClassNotFoundException {
806	+
807		// Read in size, and any hidden stuff
808		s.defaultReadObject();
809
810	<	// Read in array length and allocate array
811	<	int arrayLength = s.readInt();
812	<	Object[] a = elementData = new Object[arrayLength];
813	<
814	<	// Read in all elements in the proper order.
815	<	for (int i=0; i<size; i++)
816	<	a[i] = s.readObject();
810	>	// Read in capacity
811	>	s.readInt(); // ignored
812	>
813	>	if (size > 0) {
814	>	// like clone(), allocate array based upon size not capacity
815	>	Object[] elements = new Object[size];
816	>
817	>	// Read in all elements in the proper order.
818	>	for (int i = 0; i < size; i++) {
819	>	elements[i] = s.readObject();
820	>	}
821	>
822	>	elementData = elements;
823	>	} else if (size == 0) {
824	>	elementData = EMPTY_ELEMENTDATA;
825	>	} else {
826	>	throw new java.io.InvalidObjectException("Invalid size: " + size);
827	>	}
828		}
829
830		/**
#	Line 708 | Line 840 | public class ArrayList<E> extends Abstra
840		* @throws IndexOutOfBoundsException {@inheritDoc}
841		*/
842		public ListIterator<E> listIterator(int index) {
843	<	if (index < 0 || index > size)
712	<	throw new IndexOutOfBoundsException("Index: "+index);
843	>	rangeCheckForAdd(index);
844		return new ListItr(index);
845		}
846
#	Line 744 | Line 875 | public class ArrayList<E> extends Abstra
875		int lastRet = -1; // index of last element returned; -1 if no such
876		int expectedModCount = modCount;
877
878	+	// prevent creating a synthetic constructor
879	+	Itr() {}
880	+
881		public boolean hasNext() {
882		return cursor != size;
883		}
#	Line 776 | Line 910 | public class ArrayList<E> extends Abstra
910		}
911		}
912
913	+	@Override
914	+	@SuppressWarnings("unchecked")
915	+	public void forEachRemaining(Consumer<? super E> consumer) {
916	+	Objects.requireNonNull(consumer);
917	+	final int size = ArrayList.this.size;
918	+	int i = cursor;
919	+	if (i >= size) {
920	+	return;
921	+	}
922	+	final Object[] elementData = ArrayList.this.elementData;
923	+	if (i >= elementData.length) {
924	+	throw new ConcurrentModificationException();
925	+	}
926	+	while (i != size && modCount == expectedModCount) {
927	+	consumer.accept((E) elementData[i++]);
928	+	}
929	+	// update once at end of iteration to reduce heap write traffic
930	+	cursor = i;
931	+	lastRet = i - 1;
932	+	checkForComodification();
933	+	}
934	+
935		final void checkForComodification() {
936		if (modCount != expectedModCount)
937		throw new ConcurrentModificationException();
#	Line 874 | Line 1030 | public class ArrayList<E> extends Abstra
1030		*/
1031		public List<E> subList(int fromIndex, int toIndex) {
1032		subListRangeCheck(fromIndex, toIndex, size);
1033	<	return new SubList(this, 0, fromIndex, toIndex);
1033	>	return new SubList<>(this, fromIndex, toIndex);
1034		}
1035
1036	<	static void subListRangeCheck(int fromIndex, int toIndex, int size) {
1037	<	if (fromIndex < 0)
1038	<	throw new IndexOutOfBoundsException("fromIndex = " + fromIndex);
883	<	if (toIndex > size)
884	<	throw new IndexOutOfBoundsException("toIndex = " + toIndex);
885	<	if (fromIndex > toIndex)
886	<	throw new IllegalArgumentException("fromIndex(" + fromIndex +
887	<	") > toIndex(" + toIndex + ")");
888	<	}
889	<
890	<	private class SubList extends AbstractList<E> implements RandomAccess {
891	<	private final AbstractList<E> parent;
892	<	private final int parentOffset;
1036	>	private static class SubList<E> extends AbstractList<E> implements RandomAccess {
1037	>	private final ArrayList<E> root;
1038	>	private final SubList<E> parent;
1039		private final int offset;
1040	<	int size;
1040	>	private int size;
1041	>
1042	>	/**
1043	>	* Constructs a sublist of an arbitrary ArrayList.
1044	>	*/
1045	>	public SubList(ArrayList<E> root, int fromIndex, int toIndex) {
1046	>	this.root = root;
1047	>	this.parent = null;
1048	>	this.offset = fromIndex;
1049	>	this.size = toIndex - fromIndex;
1050	>	this.modCount = root.modCount;
1051	>	}
1052
1053	<	SubList(AbstractList<E> parent,
1054	<	int offset, int fromIndex, int toIndex) {
1053	>	/**
1054	>	* Constructs a sublist of another SubList.
1055	>	*/
1056	>	private SubList(SubList<E> parent, int fromIndex, int toIndex) {
1057	>	this.root = parent.root;
1058		this.parent = parent;
1059	<	this.parentOffset = fromIndex;
900	<	this.offset = offset + fromIndex;
1059	>	this.offset = parent.offset + fromIndex;
1060		this.size = toIndex - fromIndex;
1061	<	this.modCount = ArrayList.this.modCount;
1061	>	this.modCount = root.modCount;
1062		}
1063
1064	<	public E set(int index, E e) {
1065	<	rangeCheck(index);
1064	>	public E set(int index, E element) {
1065	>	Objects.checkIndex(index, size);
1066		checkForComodification();
1067	<	E oldValue = ArrayList.this.elementData(offset + index);
1068	<	ArrayList.this.elementData[offset + index] = e;
1067	>	E oldValue = root.elementData(offset + index);
1068	>	root.elementData[offset + index] = element;
1069		return oldValue;
1070		}
1071
1072		public E get(int index) {
1073	<	rangeCheck(index);
1073	>	Objects.checkIndex(index, size);
1074		checkForComodification();
1075	<	return ArrayList.this.elementData(offset + index);
1075	>	return root.elementData(offset + index);
1076		}
1077
1078		public int size() {
1079		checkForComodification();
1080	<	return this.size;
1080	>	return size;
1081		}
1082
1083	<	public void add(int index, E e) {
1083	>	public void add(int index, E element) {
1084		rangeCheckForAdd(index);
1085		checkForComodification();
1086	<	parent.add(parentOffset + index, e);
1087	<	this.modCount = parent.modCount;
929	<	this.size++;
1086	>	root.add(offset + index, element);
1087	>	updateSizeAndModCount(1);
1088		}
1089
1090		public E remove(int index) {
1091	<	rangeCheck(index);
1091	>	Objects.checkIndex(index, size);
1092		checkForComodification();
1093	<	E result = parent.remove(parentOffset + index);
1094	<	this.modCount = parent.modCount;
937	<	this.size--;
1093	>	E result = root.remove(offset + index);
1094	>	updateSizeAndModCount(-1);
1095		return result;
1096		}
1097
1098		protected void removeRange(int fromIndex, int toIndex) {
1099		checkForComodification();
1100	<	parent.removeRange(parentOffset + fromIndex,
1101	<	parentOffset + toIndex);
945	<	this.modCount = parent.modCount;
946	<	this.size -= toIndex - fromIndex;
1100	>	root.removeRange(offset + fromIndex, offset + toIndex);
1101	>	updateSizeAndModCount(fromIndex - toIndex);
1102		}
1103
1104		public boolean addAll(Collection<? extends E> c) {
#	Line 955 | Line 1110 | public class ArrayList<E> extends Abstra
1110		int cSize = c.size();
1111		if (cSize==0)
1112		return false;
958	–
1113		checkForComodification();
1114	<	parent.addAll(parentOffset + index, c);
1115	<	this.modCount = parent.modCount;
962	<	this.size += cSize;
1114	>	root.addAll(offset + index, c);
1115	>	updateSizeAndModCount(cSize);
1116		return true;
1117		}
1118
#	Line 967 | Line 1120 | public class ArrayList<E> extends Abstra
1120		return listIterator();
1121		}
1122
1123	<	public ListIterator<E> listIterator(final int index) {
1123	>	public ListIterator<E> listIterator(int index) {
1124		checkForComodification();
1125		rangeCheckForAdd(index);
973	–	final int offset = this.offset;
1126
1127		return new ListIterator<E>() {
1128		int cursor = index;
1129		int lastRet = -1;
1130	<	int expectedModCount = ArrayList.this.modCount;
1130	>	int expectedModCount = root.modCount;
1131
1132		public boolean hasNext() {
1133		return cursor != SubList.this.size;
#	Line 987 | Line 1139 | public class ArrayList<E> extends Abstra
1139		int i = cursor;
1140		if (i >= SubList.this.size)
1141		throw new NoSuchElementException();
1142	<	Object[] elementData = ArrayList.this.elementData;
1142	>	Object[] elementData = root.elementData;
1143		if (offset + i >= elementData.length)
1144		throw new ConcurrentModificationException();
1145		cursor = i + 1;
#	Line 1004 | Line 1156 | public class ArrayList<E> extends Abstra
1156		int i = cursor - 1;
1157		if (i < 0)
1158		throw new NoSuchElementException();
1159	<	Object[] elementData = ArrayList.this.elementData;
1159	>	Object[] elementData = root.elementData;
1160		if (offset + i >= elementData.length)
1161		throw new ConcurrentModificationException();
1162		cursor = i;
1163		return (E) elementData[offset + (lastRet = i)];
1164		}
1165
1166	+	@SuppressWarnings("unchecked")
1167	+	public void forEachRemaining(Consumer<? super E> consumer) {
1168	+	Objects.requireNonNull(consumer);
1169	+	final int size = SubList.this.size;
1170	+	int i = cursor;
1171	+	if (i >= size) {
1172	+	return;
1173	+	}
1174	+	final Object[] elementData = root.elementData;
1175	+	if (offset + i >= elementData.length) {
1176	+	throw new ConcurrentModificationException();
1177	+	}
1178	+	while (i != size && modCount == expectedModCount) {
1179	+	consumer.accept((E) elementData[offset + (i++)]);
1180	+	}
1181	+	// update once at end of iteration to reduce heap write traffic
1182	+	lastRet = cursor = i;
1183	+	checkForComodification();
1184	+	}
1185	+
1186		public int nextIndex() {
1187		return cursor;
1188		}
#	Line 1028 | Line 1200 | public class ArrayList<E> extends Abstra
1200		SubList.this.remove(lastRet);
1201		cursor = lastRet;
1202		lastRet = -1;
1203	<	expectedModCount = ArrayList.this.modCount;
1203	>	expectedModCount = root.modCount;
1204		} catch (IndexOutOfBoundsException ex) {
1205		throw new ConcurrentModificationException();
1206		}
#	Line 1040 | Line 1212 | public class ArrayList<E> extends Abstra
1212		checkForComodification();
1213
1214		try {
1215	<	ArrayList.this.set(offset + lastRet, e);
1215	>	root.set(offset + lastRet, e);
1216		} catch (IndexOutOfBoundsException ex) {
1217		throw new ConcurrentModificationException();
1218		}
#	Line 1054 | Line 1226 | public class ArrayList<E> extends Abstra
1226		SubList.this.add(i, e);
1227		cursor = i + 1;
1228		lastRet = -1;
1229	<	expectedModCount = ArrayList.this.modCount;
1229	>	expectedModCount = root.modCount;
1230		} catch (IndexOutOfBoundsException ex) {
1231		throw new ConcurrentModificationException();
1232		}
1233		}
1234
1235		final void checkForComodification() {
1236	<	if (expectedModCount != ArrayList.this.modCount)
1236	>	if (root.modCount != expectedModCount)
1237		throw new ConcurrentModificationException();
1238		}
1239		};
#	Line 1069 | Line 1241 | public class ArrayList<E> extends Abstra
1241
1242		public List<E> subList(int fromIndex, int toIndex) {
1243		subListRangeCheck(fromIndex, toIndex, size);
1244	<	return new SubList(this, offset, fromIndex, toIndex);
1073	<	}
1074	<
1075	<	private void rangeCheck(int index) {
1076	<	if (index < 0 || index >= this.size)
1077	<	throw new IndexOutOfBoundsException(outOfBoundsMsg(index));
1244	>	return new SubList<>(this, fromIndex, toIndex);
1245		}
1246
1247		private void rangeCheckForAdd(int index) {
#	Line 1087 | Line 1254 | public class ArrayList<E> extends Abstra
1254		}
1255
1256		private void checkForComodification() {
1257	<	if (ArrayList.this.modCount != this.modCount)
1257	>	if (root.modCount != modCount)
1258		throw new ConcurrentModificationException();
1259		}
1260	+
1261	+	private void updateSizeAndModCount(int sizeChange) {
1262	+	SubList<E> slist = this;
1263	+	do {
1264	+	slist.size += sizeChange;
1265	+	slist.modCount = root.modCount;
1266	+	slist = slist.parent;
1267	+	} while (slist != null);
1268	+	}
1269	+
1270	+	public Spliterator<E> spliterator() {
1271	+	checkForComodification();
1272	+
1273	+	// ArrayListSpliterator is not used because late-binding logic
1274	+	// is different here
1275	+	return new Spliterator<>() {
1276	+	private int index = offset; // current index, modified on advance/split
1277	+	private int fence = -1; // -1 until used; then one past last index
1278	+	private int expectedModCount; // initialized when fence set
1279	+
1280	+	private int getFence() { // initialize fence to size on first use
1281	+	int hi; // (a specialized variant appears in method forEach)
1282	+	if ((hi = fence) < 0) {
1283	+	expectedModCount = modCount;
1284	+	hi = fence = offset + size;
1285	+	}
1286	+	return hi;
1287	+	}
1288	+
1289	+	public ArrayListSpliterator<E> trySplit() {
1290	+	int hi = getFence(), lo = index, mid = (lo + hi) >>> 1;
1291	+	// ArrayListSpliterator could be used here as the source is already bound
1292	+	return (lo >= mid) ? null : // divide range in half unless too small
1293	+	new ArrayListSpliterator<>(root, lo, index = mid,
1294	+	expectedModCount);
1295	+	}
1296	+
1297	+	public boolean tryAdvance(Consumer<? super E> action) {
1298	+	Objects.requireNonNull(action);
1299	+	int hi = getFence(), i = index;
1300	+	if (i < hi) {
1301	+	index = i + 1;
1302	+	@SuppressWarnings("unchecked") E e = (E)root.elementData[i];
1303	+	action.accept(e);
1304	+	if (root.modCount != expectedModCount)
1305	+	throw new ConcurrentModificationException();
1306	+	return true;
1307	+	}
1308	+	return false;
1309	+	}
1310	+
1311	+	public void forEachRemaining(Consumer<? super E> action) {
1312	+	Objects.requireNonNull(action);
1313	+	int i, hi, mc; // hoist accesses and checks from loop
1314	+	ArrayList<E> lst = root;
1315	+	Object[] a;
1316	+	if ((a = lst.elementData) != null) {
1317	+	if ((hi = fence) < 0) {
1318	+	mc = modCount;
1319	+	hi = offset + size;
1320	+	}
1321	+	else
1322	+	mc = expectedModCount;
1323	+	if ((i = index) >= 0 && (index = hi) <= a.length) {
1324	+	for (; i < hi; ++i) {
1325	+	@SuppressWarnings("unchecked") E e = (E) a[i];
1326	+	action.accept(e);
1327	+	}
1328	+	if (lst.modCount == mc)
1329	+	return;
1330	+	}
1331	+	}
1332	+	throw new ConcurrentModificationException();
1333	+	}
1334	+
1335	+	public long estimateSize() {
1336	+	return (long) (getFence() - index);
1337	+	}
1338	+
1339	+	public int characteristics() {
1340	+	return Spliterator.ORDERED | Spliterator.SIZED | Spliterator.SUBSIZED;
1341	+	}
1342	+	};
1343	+	}
1344	+	}
1345	+
1346	+	@Override
1347	+	public void forEach(Consumer<? super E> action) {
1348	+	Objects.requireNonNull(action);
1349	+	final int expectedModCount = modCount;
1350	+	@SuppressWarnings("unchecked")
1351	+	final E[] elementData = (E[]) this.elementData;
1352	+	final int size = this.size;
1353	+	for (int i=0; modCount == expectedModCount && i < size; i++) {
1354	+	action.accept(elementData[i]);
1355	+	}
1356	+	if (modCount != expectedModCount) {
1357	+	throw new ConcurrentModificationException();
1358	+	}
1359	+	}
1360	+
1361	+	/**
1362	+	* Creates a <em><a href="Spliterator.html#binding">late-binding</a></em>
1363	+	* and <em>fail-fast</em> {@link Spliterator} over the elements in this
1364	+	* list.
1365	+	*
1366	+	* <p>The {@code Spliterator} reports {@link Spliterator#SIZED},
1367	+	* {@link Spliterator#SUBSIZED}, and {@link Spliterator#ORDERED}.
1368	+	* Overriding implementations should document the reporting of additional
1369	+	* characteristic values.
1370	+	*
1371	+	* @return a {@code Spliterator} over the elements in this list
1372	+	* @since 1.8
1373	+	*/
1374	+	@Override
1375	+	public Spliterator<E> spliterator() {
1376	+	return new ArrayListSpliterator<>(this, 0, -1, 0);
1377	+	}
1378	+
1379	+	/** Index-based split-by-two, lazily initialized Spliterator */
1380	+	static final class ArrayListSpliterator<E> implements Spliterator<E> {
1381	+
1382	+	/*
1383	+	* If ArrayLists were immutable, or structurally immutable (no
1384	+	* adds, removes, etc), we could implement their spliterators
1385	+	* with Arrays.spliterator. Instead we detect as much
1386	+	* interference during traversal as practical without
1387	+	* sacrificing much performance. We rely primarily on
1388	+	* modCounts. These are not guaranteed to detect concurrency
1389	+	* violations, and are sometimes overly conservative about
1390	+	* within-thread interference, but detect enough problems to
1391	+	* be worthwhile in practice. To carry this out, we (1) lazily
1392	+	* initialize fence and expectedModCount until the latest
1393	+	* point that we need to commit to the state we are checking
1394	+	* against; thus improving precision.  (This doesn't apply to
1395	+	* SubLists, that create spliterators with current non-lazy
1396	+	* values).  (2) We perform only a single
1397	+	* ConcurrentModificationException check at the end of forEach
1398	+	* (the most performance-sensitive method). When using forEach
1399	+	* (as opposed to iterators), we can normally only detect
1400	+	* interference after actions, not before. Further
1401	+	* CME-triggering checks apply to all other possible
1402	+	* violations of assumptions for example null or too-small
1403	+	* elementData array given its size(), that could only have
1404	+	* occurred due to interference.  This allows the inner loop
1405	+	* of forEach to run without any further checks, and
1406	+	* simplifies lambda-resolution. While this does entail a
1407	+	* number of checks, note that in the common case of
1408	+	* list.stream().forEach(a), no checks or other computation
1409	+	* occur anywhere other than inside forEach itself.  The other
1410	+	* less-often-used methods cannot take advantage of most of
1411	+	* these streamlinings.
1412	+	*/
1413	+
1414	+	private final ArrayList<E> list;
1415	+	private int index; // current index, modified on advance/split
1416	+	private int fence; // -1 until used; then one past last index
1417	+	private int expectedModCount; // initialized when fence set
1418	+
1419	+	/** Create new spliterator covering the given  range */
1420	+	ArrayListSpliterator(ArrayList<E> list, int origin, int fence,
1421	+	int expectedModCount) {
1422	+	this.list = list; // OK if null unless traversed
1423	+	this.index = origin;
1424	+	this.fence = fence;
1425	+	this.expectedModCount = expectedModCount;
1426	+	}
1427	+
1428	+	private int getFence() { // initialize fence to size on first use
1429	+	int hi; // (a specialized variant appears in method forEach)
1430	+	ArrayList<E> lst;
1431	+	if ((hi = fence) < 0) {
1432	+	if ((lst = list) == null)
1433	+	hi = fence = 0;
1434	+	else {
1435	+	expectedModCount = lst.modCount;
1436	+	hi = fence = lst.size;
1437	+	}
1438	+	}
1439	+	return hi;
1440	+	}
1441	+
1442	+	public ArrayListSpliterator<E> trySplit() {
1443	+	int hi = getFence(), lo = index, mid = (lo + hi) >>> 1;
1444	+	return (lo >= mid) ? null : // divide range in half unless too small
1445	+	new ArrayListSpliterator<>(list, lo, index = mid,
1446	+	expectedModCount);
1447	+	}
1448	+
1449	+	public boolean tryAdvance(Consumer<? super E> action) {
1450	+	if (action == null)
1451	+	throw new NullPointerException();
1452	+	int hi = getFence(), i = index;
1453	+	if (i < hi) {
1454	+	index = i + 1;
1455	+	@SuppressWarnings("unchecked") E e = (E)list.elementData[i];
1456	+	action.accept(e);
1457	+	if (list.modCount != expectedModCount)
1458	+	throw new ConcurrentModificationException();
1459	+	return true;
1460	+	}
1461	+	return false;
1462	+	}
1463	+
1464	+	public void forEachRemaining(Consumer<? super E> action) {
1465	+	int i, hi, mc; // hoist accesses and checks from loop
1466	+	ArrayList<E> lst; Object[] a;
1467	+	if (action == null)
1468	+	throw new NullPointerException();
1469	+	if ((lst = list) != null && (a = lst.elementData) != null) {
1470	+	if ((hi = fence) < 0) {
1471	+	mc = lst.modCount;
1472	+	hi = lst.size;
1473	+	}
1474	+	else
1475	+	mc = expectedModCount;
1476	+	if ((i = index) >= 0 && (index = hi) <= a.length) {
1477	+	for (; i < hi; ++i) {
1478	+	@SuppressWarnings("unchecked") E e = (E) a[i];
1479	+	action.accept(e);
1480	+	}
1481	+	if (lst.modCount == mc)
1482	+	return;
1483	+	}
1484	+	}
1485	+	throw new ConcurrentModificationException();
1486	+	}
1487	+
1488	+	public long estimateSize() {
1489	+	return (long) (getFence() - index);
1490	+	}
1491	+
1492	+	public int characteristics() {
1493	+	return Spliterator.ORDERED | Spliterator.SIZED | Spliterator.SUBSIZED;
1494	+	}
1495	+	}
1496	+
1497	+	@SuppressWarnings("unchecked")
1498	+	@Override
1499	+	public boolean removeIf(Predicate<? super E> filter) {
1500	+	Objects.requireNonNull(filter);
1501	+	int expectedModCount = modCount;
1502	+	final Object[] es = elementData;
1503	+	final int size = this.size;
1504	+	final boolean modified;
1505	+	int r;
1506	+	for (r = 0; r < size; r++)
1507	+	if (filter.test((E) es[r]))
1508	+	break;
1509	+	if (modified = (r < size)) {
1510	+	expectedModCount++;
1511	+	modCount++;
1512	+	int w = r++;
1513	+	try {
1514	+	for (E e; r < size; r++)
1515	+	if (!filter.test(e = (E) es[r]))
1516	+	es[w++] = e;
1517	+	Arrays.fill(es, (this.size = w), size, null);
1518	+	} catch (Throwable ex) {
1519	+	// copy remaining elements
1520	+	System.arraycopy(es, r, es, w, size - r);
1521	+	Arrays.fill(es, (this.size = w + size - r), size, null);
1522	+	throw ex;
1523	+	}
1524	+	}
1525	+	if (modCount != expectedModCount)
1526	+	throw new ConcurrentModificationException();
1527	+	return modified;
1528	+	}
1529	+
1530	+	@Override
1531	+	@SuppressWarnings("unchecked")
1532	+	public void replaceAll(UnaryOperator<E> operator) {
1533	+	Objects.requireNonNull(operator);
1534	+	final int expectedModCount = modCount;
1535	+	final int size = this.size;
1536	+	for (int i=0; modCount == expectedModCount && i < size; i++) {
1537	+	elementData[i] = operator.apply((E) elementData[i]);
1538	+	}
1539	+	if (modCount != expectedModCount) {
1540	+	throw new ConcurrentModificationException();
1541	+	}
1542	+	modCount++;
1543	+	}
1544	+
1545	+	@Override
1546	+	@SuppressWarnings("unchecked")
1547	+	public void sort(Comparator<? super E> c) {
1548	+	final int expectedModCount = modCount;
1549	+	Arrays.sort((E[]) elementData, 0, size, c);
1550	+	if (modCount != expectedModCount) {
1551	+	throw new ConcurrentModificationException();
1552	+	}
1553	+	modCount++;
1554		}
1555		}

Diff Legend

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