1 |
|
/* |
2 |
< |
* Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. |
2 |
> |
* Copyright (c) 1997, 2017, 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 |
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 |
+ |
import jdk.internal.misc.SharedSecrets; |
32 |
+ |
|
33 |
|
/** |
34 |
< |
* Resizable-array implementation of the <tt>List</tt> interface. Implements |
34 |
> |
* Resizable-array implementation of the {@code List} interface. Implements |
35 |
|
* all optional list operations, and permits all elements, including |
36 |
< |
* <tt>null</tt>. In addition to implementing the <tt>List</tt> interface, |
36 |
> |
* {@code null}. In addition to implementing the {@code List} interface, |
37 |
|
* this class provides methods to manipulate the size of the array that is |
38 |
|
* used internally to store the list. (This class is roughly equivalent to |
39 |
< |
* <tt>Vector</tt>, except that it is unsynchronized.) |
39 |
> |
* {@code Vector}, except that it is unsynchronized.) |
40 |
|
* |
41 |
< |
* <p>The <tt>size</tt>, <tt>isEmpty</tt>, <tt>get</tt>, <tt>set</tt>, |
42 |
< |
* <tt>iterator</tt>, and <tt>listIterator</tt> operations run in constant |
43 |
< |
* time. The <tt>add</tt> operation runs in <i>amortized constant time</i>, |
41 |
> |
* <p>The {@code size}, {@code isEmpty}, {@code get}, {@code set}, |
42 |
> |
* {@code iterator}, and {@code listIterator} operations run in constant |
43 |
> |
* time. The {@code add} operation runs in <i>amortized constant time</i>, |
44 |
|
* that is, adding n elements requires O(n) time. All of the other operations |
45 |
|
* run in linear time (roughly speaking). The constant factor is low compared |
46 |
< |
* to that for the <tt>LinkedList</tt> implementation. |
46 |
> |
* to that for the {@code LinkedList} implementation. |
47 |
|
* |
48 |
< |
* <p>Each <tt>ArrayList</tt> instance has a <i>capacity</i>. The capacity is |
48 |
> |
* <p>Each {@code ArrayList} instance has a <i>capacity</i>. The capacity is |
49 |
|
* the size of the array used to store the elements in the list. It is always |
50 |
|
* at least as large as the list size. As elements are added to an ArrayList, |
51 |
|
* its capacity grows automatically. The details of the growth policy are not |
52 |
|
* specified beyond the fact that adding an element has constant amortized |
53 |
|
* time cost. |
54 |
|
* |
55 |
< |
* <p>An application can increase the capacity of an <tt>ArrayList</tt> instance |
56 |
< |
* before adding a large number of elements using the <tt>ensureCapacity</tt> |
55 |
> |
* <p>An application can increase the capacity of an {@code ArrayList} instance |
56 |
> |
* before adding a large number of elements using the {@code ensureCapacity} |
57 |
|
* operation. This may reduce the amount of incremental reallocation. |
58 |
|
* |
59 |
|
* <p><strong>Note that this implementation is not synchronized.</strong> |
60 |
< |
* If multiple threads access an <tt>ArrayList</tt> instance concurrently, |
60 |
> |
* If multiple threads access an {@code ArrayList} instance concurrently, |
61 |
|
* and at least one of the threads modifies the list structurally, it |
62 |
|
* <i>must</i> be synchronized externally. (A structural modification is |
63 |
|
* any operation that adds or deletes one or more elements, or explicitly |
71 |
|
* unsynchronized access to the list:<pre> |
72 |
|
* List list = Collections.synchronizedList(new ArrayList(...));</pre> |
73 |
|
* |
74 |
< |
* <p><a name="fail-fast"/> |
74 |
> |
* <p id="fail-fast"> |
75 |
|
* The iterators returned by this class's {@link #iterator() iterator} and |
76 |
|
* {@link #listIterator(int) listIterator} methods are <em>fail-fast</em>: |
77 |
|
* if the list is structurally modified at any time after the iterator is |
92 |
|
* should be used only to detect bugs.</i> |
93 |
|
* |
94 |
|
* <p>This class is a member of the |
95 |
< |
* <a href="{@docRoot}/../technotes/guides/collections/index.html"> |
95 |
> |
* <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> |
96 |
|
* Java Collections Framework</a>. |
97 |
|
* |
98 |
+ |
* @param <E> the type of elements in this list |
99 |
+ |
* |
100 |
|
* @author Josh Bloch |
101 |
|
* @author Neal Gafter |
102 |
|
* @see Collection |
105 |
|
* @see Vector |
106 |
|
* @since 1.2 |
107 |
|
*/ |
101 |
– |
|
108 |
|
public class ArrayList<E> extends AbstractList<E> |
109 |
|
implements List<E>, RandomAccess, Cloneable, java.io.Serializable |
110 |
|
{ |
111 |
|
private static final long serialVersionUID = 8683452581122892189L; |
112 |
|
|
113 |
|
/** |
114 |
+ |
* Default initial capacity. |
115 |
+ |
*/ |
116 |
+ |
private static final int DEFAULT_CAPACITY = 10; |
117 |
+ |
|
118 |
+ |
/** |
119 |
+ |
* Shared empty array instance used for empty instances. |
120 |
+ |
*/ |
121 |
+ |
private static final Object[] EMPTY_ELEMENTDATA = {}; |
122 |
+ |
|
123 |
+ |
/** |
124 |
+ |
* Shared empty array instance used for default sized empty instances. We |
125 |
+ |
* distinguish this from EMPTY_ELEMENTDATA to know how much to inflate when |
126 |
+ |
* first element is added. |
127 |
+ |
*/ |
128 |
+ |
private static final Object[] DEFAULTCAPACITY_EMPTY_ELEMENTDATA = {}; |
129 |
+ |
|
130 |
+ |
/** |
131 |
|
* The array buffer into which the elements of the ArrayList are stored. |
132 |
< |
* The capacity of the ArrayList is the length of this array buffer. |
132 |
> |
* The capacity of the ArrayList is the length of this array buffer. Any |
133 |
> |
* empty ArrayList with elementData == DEFAULTCAPACITY_EMPTY_ELEMENTDATA |
134 |
> |
* will be expanded to DEFAULT_CAPACITY when the first element is added. |
135 |
|
*/ |
136 |
< |
private transient Object[] elementData; |
136 |
> |
transient Object[] elementData; // non-private to simplify nested class access |
137 |
|
|
138 |
|
/** |
139 |
|
* The size of the ArrayList (the number of elements it contains). |
150 |
|
* is negative |
151 |
|
*/ |
152 |
|
public ArrayList(int initialCapacity) { |
153 |
< |
super(); |
154 |
< |
if (initialCapacity < 0) |
153 |
> |
if (initialCapacity > 0) { |
154 |
> |
this.elementData = new Object[initialCapacity]; |
155 |
> |
} else if (initialCapacity == 0) { |
156 |
> |
this.elementData = EMPTY_ELEMENTDATA; |
157 |
> |
} else { |
158 |
|
throw new IllegalArgumentException("Illegal Capacity: "+ |
159 |
|
initialCapacity); |
160 |
< |
this.elementData = new Object[initialCapacity]; |
160 |
> |
} |
161 |
|
} |
162 |
|
|
163 |
|
/** |
164 |
|
* Constructs an empty list with an initial capacity of ten. |
165 |
|
*/ |
166 |
|
public ArrayList() { |
167 |
< |
this(10); |
167 |
> |
this.elementData = DEFAULTCAPACITY_EMPTY_ELEMENTDATA; |
168 |
|
} |
169 |
|
|
170 |
|
/** |
177 |
|
*/ |
178 |
|
public ArrayList(Collection<? extends E> c) { |
179 |
|
elementData = c.toArray(); |
180 |
< |
size = elementData.length; |
181 |
< |
// c.toArray might (incorrectly) not return Object[] (see 6260652) |
182 |
< |
if (elementData.getClass() != Object[].class) |
183 |
< |
elementData = Arrays.copyOf(elementData, size, Object[].class); |
180 |
> |
if ((size = elementData.length) != 0) { |
181 |
> |
// defend against c.toArray (incorrectly) not returning Object[] |
182 |
> |
// (see e.g. https://bugs.openjdk.java.net/browse/JDK-6260652) |
183 |
> |
if (elementData.getClass() != Object[].class) |
184 |
> |
elementData = Arrays.copyOf(elementData, size, Object[].class); |
185 |
> |
} else { |
186 |
> |
// replace with empty array. |
187 |
> |
this.elementData = EMPTY_ELEMENTDATA; |
188 |
> |
} |
189 |
|
} |
190 |
|
|
191 |
|
/** |
192 |
< |
* Trims the capacity of this <tt>ArrayList</tt> instance to be the |
192 |
> |
* Trims the capacity of this {@code ArrayList} instance to be the |
193 |
|
* list's current size. An application can use this operation to minimize |
194 |
< |
* the storage of an <tt>ArrayList</tt> instance. |
194 |
> |
* the storage of an {@code ArrayList} instance. |
195 |
|
*/ |
196 |
|
public void trimToSize() { |
197 |
|
modCount++; |
198 |
< |
int oldCapacity = elementData.length; |
199 |
< |
if (size < oldCapacity) { |
200 |
< |
elementData = Arrays.copyOf(elementData, size); |
198 |
> |
if (size < elementData.length) { |
199 |
> |
elementData = (size == 0) |
200 |
> |
? EMPTY_ELEMENTDATA |
201 |
> |
: Arrays.copyOf(elementData, size); |
202 |
|
} |
203 |
|
} |
204 |
|
|
205 |
|
/** |
206 |
< |
* Increases the capacity of this <tt>ArrayList</tt> instance, if |
206 |
> |
* Increases the capacity of this {@code ArrayList} instance, if |
207 |
|
* necessary, to ensure that it can hold at least the number of elements |
208 |
|
* specified by the minimum capacity argument. |
209 |
|
* |
210 |
< |
* @param minCapacity the desired minimum capacity |
210 |
> |
* @param minCapacity the desired minimum capacity |
211 |
|
*/ |
212 |
|
public void ensureCapacity(int minCapacity) { |
213 |
< |
modCount++; |
214 |
< |
int oldCapacity = elementData.length; |
215 |
< |
if (minCapacity > oldCapacity) { |
216 |
< |
int newCapacity = (oldCapacity * 3)/2 + 1; |
217 |
< |
if (newCapacity < minCapacity) |
184 |
< |
newCapacity = minCapacity; |
185 |
< |
// minCapacity is usually close to size, so this is a win: |
186 |
< |
elementData = Arrays.copyOf(elementData, newCapacity); |
213 |
> |
if (minCapacity > elementData.length |
214 |
> |
&& !(elementData == DEFAULTCAPACITY_EMPTY_ELEMENTDATA |
215 |
> |
&& minCapacity <= DEFAULT_CAPACITY)) { |
216 |
> |
modCount++; |
217 |
> |
grow(minCapacity); |
218 |
|
} |
219 |
|
} |
220 |
|
|
221 |
|
/** |
222 |
+ |
* The maximum size of array to allocate (unless necessary). |
223 |
+ |
* Some VMs reserve some header words in an array. |
224 |
+ |
* Attempts to allocate larger arrays may result in |
225 |
+ |
* OutOfMemoryError: Requested array size exceeds VM limit |
226 |
+ |
*/ |
227 |
+ |
private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8; |
228 |
+ |
|
229 |
+ |
/** |
230 |
+ |
* Increases the capacity to ensure that it can hold at least the |
231 |
+ |
* number of elements specified by the minimum capacity argument. |
232 |
+ |
* |
233 |
+ |
* @param minCapacity the desired minimum capacity |
234 |
+ |
* @throws OutOfMemoryError if minCapacity is less than zero |
235 |
+ |
*/ |
236 |
+ |
private Object[] grow(int minCapacity) { |
237 |
+ |
return elementData = Arrays.copyOf(elementData, |
238 |
+ |
newCapacity(minCapacity)); |
239 |
+ |
} |
240 |
+ |
|
241 |
+ |
private Object[] grow() { |
242 |
+ |
return grow(size + 1); |
243 |
+ |
} |
244 |
+ |
|
245 |
+ |
/** |
246 |
+ |
* Returns a capacity at least as large as the given minimum capacity. |
247 |
+ |
* Returns the current capacity increased by 50% if that suffices. |
248 |
+ |
* Will not return a capacity greater than MAX_ARRAY_SIZE unless |
249 |
+ |
* the given minimum capacity is greater than MAX_ARRAY_SIZE. |
250 |
+ |
* |
251 |
+ |
* @param minCapacity the desired minimum capacity |
252 |
+ |
* @throws OutOfMemoryError if minCapacity is less than zero |
253 |
+ |
*/ |
254 |
+ |
private int newCapacity(int minCapacity) { |
255 |
+ |
// overflow-conscious code |
256 |
+ |
int oldCapacity = elementData.length; |
257 |
+ |
int newCapacity = oldCapacity + (oldCapacity >> 1); |
258 |
+ |
if (newCapacity - minCapacity <= 0) { |
259 |
+ |
if (elementData == DEFAULTCAPACITY_EMPTY_ELEMENTDATA) |
260 |
+ |
return Math.max(DEFAULT_CAPACITY, minCapacity); |
261 |
+ |
if (minCapacity < 0) // overflow |
262 |
+ |
throw new OutOfMemoryError(); |
263 |
+ |
return minCapacity; |
264 |
+ |
} |
265 |
+ |
return (newCapacity - MAX_ARRAY_SIZE <= 0) |
266 |
+ |
? newCapacity |
267 |
+ |
: hugeCapacity(minCapacity); |
268 |
+ |
} |
269 |
+ |
|
270 |
+ |
private static int hugeCapacity(int minCapacity) { |
271 |
+ |
if (minCapacity < 0) // overflow |
272 |
+ |
throw new OutOfMemoryError(); |
273 |
+ |
return (minCapacity > MAX_ARRAY_SIZE) |
274 |
+ |
? Integer.MAX_VALUE |
275 |
+ |
: MAX_ARRAY_SIZE; |
276 |
+ |
} |
277 |
+ |
|
278 |
+ |
/** |
279 |
|
* Returns the number of elements in this list. |
280 |
|
* |
281 |
|
* @return the number of elements in this list |
285 |
|
} |
286 |
|
|
287 |
|
/** |
288 |
< |
* Returns <tt>true</tt> if this list contains no elements. |
288 |
> |
* Returns {@code true} if this list contains no elements. |
289 |
|
* |
290 |
< |
* @return <tt>true</tt> if this list contains no elements |
290 |
> |
* @return {@code true} if this list contains no elements |
291 |
|
*/ |
292 |
|
public boolean isEmpty() { |
293 |
|
return size == 0; |
294 |
|
} |
295 |
|
|
296 |
|
/** |
297 |
< |
* Returns <tt>true</tt> if this list contains the specified element. |
298 |
< |
* More formally, returns <tt>true</tt> if and only if this list contains |
299 |
< |
* at least one element <tt>e</tt> such that |
300 |
< |
* <tt>(o==null ? e==null : o.equals(e))</tt>. |
297 |
> |
* Returns {@code true} if this list contains the specified element. |
298 |
> |
* More formally, returns {@code true} if and only if this list contains |
299 |
> |
* at least one element {@code e} such that |
300 |
> |
* {@code Objects.equals(o, e)}. |
301 |
|
* |
302 |
|
* @param o element whose presence in this list is to be tested |
303 |
< |
* @return <tt>true</tt> if this list contains the specified element |
303 |
> |
* @return {@code true} if this list contains the specified element |
304 |
|
*/ |
305 |
|
public boolean contains(Object o) { |
306 |
|
return indexOf(o) >= 0; |
309 |
|
/** |
310 |
|
* Returns the index of the first occurrence of the specified element |
311 |
|
* in this list, or -1 if this list does not contain the element. |
312 |
< |
* More formally, returns the lowest index <tt>i</tt> such that |
313 |
< |
* <tt>(o==null ? get(i)==null : o.equals(get(i)))</tt>, |
312 |
> |
* More formally, returns the lowest index {@code i} such that |
313 |
> |
* {@code Objects.equals(o, get(i))}, |
314 |
|
* or -1 if there is no such index. |
315 |
|
*/ |
316 |
|
public int indexOf(Object o) { |
329 |
|
/** |
330 |
|
* Returns the index of the last occurrence of the specified element |
331 |
|
* in this list, or -1 if this list does not contain the element. |
332 |
< |
* More formally, returns the highest index <tt>i</tt> such that |
333 |
< |
* <tt>(o==null ? get(i)==null : o.equals(get(i)))</tt>, |
332 |
> |
* More formally, returns the highest index {@code i} such that |
333 |
> |
* {@code Objects.equals(o, get(i))}, |
334 |
|
* or -1 if there is no such index. |
335 |
|
*/ |
336 |
|
public int lastIndexOf(Object o) { |
347 |
|
} |
348 |
|
|
349 |
|
/** |
350 |
< |
* Returns a shallow copy of this <tt>ArrayList</tt> instance. (The |
350 |
> |
* Returns a shallow copy of this {@code ArrayList} instance. (The |
351 |
|
* elements themselves are not copied.) |
352 |
|
* |
353 |
< |
* @return a clone of this <tt>ArrayList</tt> instance |
353 |
> |
* @return a clone of this {@code ArrayList} instance |
354 |
|
*/ |
355 |
|
public Object clone() { |
356 |
|
try { |
357 |
< |
@SuppressWarnings("unchecked") |
270 |
< |
ArrayList<E> v = (ArrayList<E>) super.clone(); |
357 |
> |
ArrayList<?> v = (ArrayList<?>) super.clone(); |
358 |
|
v.elementData = Arrays.copyOf(elementData, size); |
359 |
|
v.modCount = 0; |
360 |
|
return v; |
361 |
|
} catch (CloneNotSupportedException e) { |
362 |
|
// this shouldn't happen, since we are Cloneable |
363 |
< |
throw new InternalError(); |
363 |
> |
throw new InternalError(e); |
364 |
|
} |
365 |
|
} |
366 |
|
|
393 |
|
* <p>If the list fits in the specified array with room to spare |
394 |
|
* (i.e., the array has more elements than the list), the element in |
395 |
|
* the array immediately following the end of the collection is set to |
396 |
< |
* <tt>null</tt>. (This is useful in determining the length of the |
396 |
> |
* {@code null}. (This is useful in determining the length of the |
397 |
|
* list <i>only</i> if the caller knows that the list does not contain |
398 |
|
* any null elements.) |
399 |
|
* |
424 |
|
return (E) elementData[index]; |
425 |
|
} |
426 |
|
|
427 |
+ |
@SuppressWarnings("unchecked") |
428 |
+ |
static <E> E elementAt(Object[] es, int index) { |
429 |
+ |
return (E) es[index]; |
430 |
+ |
} |
431 |
+ |
|
432 |
|
/** |
433 |
|
* Returns the element at the specified position in this list. |
434 |
|
* |
437 |
|
* @throws IndexOutOfBoundsException {@inheritDoc} |
438 |
|
*/ |
439 |
|
public E get(int index) { |
440 |
< |
rangeCheck(index); |
349 |
< |
|
440 |
> |
Objects.checkIndex(index, size); |
441 |
|
return elementData(index); |
442 |
|
} |
443 |
|
|
451 |
|
* @throws IndexOutOfBoundsException {@inheritDoc} |
452 |
|
*/ |
453 |
|
public E set(int index, E element) { |
454 |
< |
rangeCheck(index); |
364 |
< |
|
454 |
> |
Objects.checkIndex(index, size); |
455 |
|
E oldValue = elementData(index); |
456 |
|
elementData[index] = element; |
457 |
|
return oldValue; |
458 |
|
} |
459 |
|
|
460 |
|
/** |
461 |
+ |
* This helper method split out from add(E) to keep method |
462 |
+ |
* bytecode size under 35 (the -XX:MaxInlineSize default value), |
463 |
+ |
* which helps when add(E) is called in a C1-compiled loop. |
464 |
+ |
*/ |
465 |
+ |
private void add(E e, Object[] elementData, int s) { |
466 |
+ |
if (s == elementData.length) |
467 |
+ |
elementData = grow(); |
468 |
+ |
elementData[s] = e; |
469 |
+ |
size = s + 1; |
470 |
+ |
} |
471 |
+ |
|
472 |
+ |
/** |
473 |
|
* Appends the specified element to the end of this list. |
474 |
|
* |
475 |
|
* @param e element to be appended to this list |
476 |
< |
* @return <tt>true</tt> (as specified by {@link Collection#add}) |
476 |
> |
* @return {@code true} (as specified by {@link Collection#add}) |
477 |
|
*/ |
478 |
|
public boolean add(E e) { |
479 |
< |
ensureCapacity(size + 1); // Increments modCount!! |
480 |
< |
elementData[size++] = e; |
479 |
> |
modCount++; |
480 |
> |
add(e, elementData, size); |
481 |
|
return true; |
482 |
|
} |
483 |
|
|
492 |
|
*/ |
493 |
|
public void add(int index, E element) { |
494 |
|
rangeCheckForAdd(index); |
495 |
< |
|
496 |
< |
ensureCapacity(size+1); // Increments modCount!! |
497 |
< |
System.arraycopy(elementData, index, elementData, index + 1, |
498 |
< |
size - index); |
495 |
> |
modCount++; |
496 |
> |
final int s; |
497 |
> |
Object[] elementData; |
498 |
> |
if ((s = size) == (elementData = this.elementData).length) |
499 |
> |
elementData = grow(); |
500 |
> |
System.arraycopy(elementData, index, |
501 |
> |
elementData, index + 1, |
502 |
> |
s - index); |
503 |
|
elementData[index] = element; |
504 |
< |
size++; |
504 |
> |
size = s + 1; |
505 |
> |
// checkInvariants(); |
506 |
|
} |
507 |
|
|
508 |
|
/** |
515 |
|
* @throws IndexOutOfBoundsException {@inheritDoc} |
516 |
|
*/ |
517 |
|
public E remove(int index) { |
518 |
< |
rangeCheck(index); |
518 |
> |
Objects.checkIndex(index, size); |
519 |
> |
final Object[] es = elementData; |
520 |
|
|
521 |
< |
modCount++; |
522 |
< |
E oldValue = elementData(index); |
415 |
< |
|
416 |
< |
int numMoved = size - index - 1; |
417 |
< |
if (numMoved > 0) |
418 |
< |
System.arraycopy(elementData, index+1, elementData, index, |
419 |
< |
numMoved); |
420 |
< |
elementData[--size] = null; // Let gc do its work |
521 |
> |
@SuppressWarnings("unchecked") E oldValue = (E) es[index]; |
522 |
> |
fastRemove(es, index); |
523 |
|
|
524 |
+ |
// checkInvariants(); |
525 |
|
return oldValue; |
526 |
|
} |
527 |
|
|
529 |
|
* Removes the first occurrence of the specified element from this list, |
530 |
|
* if it is present. If the list does not contain the element, it is |
531 |
|
* unchanged. More formally, removes the element with the lowest index |
532 |
< |
* <tt>i</tt> such that |
533 |
< |
* <tt>(o==null ? get(i)==null : o.equals(get(i)))</tt> |
534 |
< |
* (if such an element exists). Returns <tt>true</tt> if this list |
532 |
> |
* {@code i} such that |
533 |
> |
* {@code Objects.equals(o, get(i))} |
534 |
> |
* (if such an element exists). Returns {@code true} if this list |
535 |
|
* contained the specified element (or equivalently, if this list |
536 |
|
* changed as a result of the call). |
537 |
|
* |
538 |
|
* @param o element to be removed from this list, if present |
539 |
< |
* @return <tt>true</tt> if this list contained the specified element |
539 |
> |
* @return {@code true} if this list contained the specified element |
540 |
|
*/ |
541 |
|
public boolean remove(Object o) { |
542 |
< |
if (o == null) { |
543 |
< |
for (int index = 0; index < size; index++) |
544 |
< |
if (elementData[index] == null) { |
545 |
< |
fastRemove(index); |
546 |
< |
return true; |
547 |
< |
} |
548 |
< |
} else { |
549 |
< |
for (int index = 0; index < size; index++) |
550 |
< |
if (o.equals(elementData[index])) { |
551 |
< |
fastRemove(index); |
552 |
< |
return true; |
553 |
< |
} |
542 |
> |
final Object[] es = elementData; |
543 |
> |
final int size = this.size; |
544 |
> |
int i = 0; |
545 |
> |
found: { |
546 |
> |
if (o == null) { |
547 |
> |
for (; i < size; i++) |
548 |
> |
if (es[i] == null) |
549 |
> |
break found; |
550 |
> |
} else { |
551 |
> |
for (; i < size; i++) |
552 |
> |
if (o.equals(es[i])) |
553 |
> |
break found; |
554 |
> |
} |
555 |
> |
return false; |
556 |
|
} |
557 |
< |
return false; |
557 |
> |
fastRemove(es, i); |
558 |
> |
return true; |
559 |
|
} |
560 |
|
|
561 |
< |
/* |
561 |
> |
/** |
562 |
|
* Private remove method that skips bounds checking and does not |
563 |
|
* return the value removed. |
564 |
|
*/ |
565 |
< |
private void fastRemove(int index) { |
565 |
> |
private void fastRemove(Object[] es, int i) { |
566 |
|
modCount++; |
567 |
< |
int numMoved = size - index - 1; |
568 |
< |
if (numMoved > 0) |
569 |
< |
System.arraycopy(elementData, index+1, elementData, index, |
570 |
< |
numMoved); |
465 |
< |
elementData[--size] = null; // Let gc do its work |
567 |
> |
final int newSize; |
568 |
> |
if ((newSize = size - 1) > i) |
569 |
> |
System.arraycopy(es, i + 1, es, i, newSize - i); |
570 |
> |
es[size = newSize] = null; |
571 |
|
} |
572 |
|
|
573 |
|
/** |
576 |
|
*/ |
577 |
|
public void clear() { |
578 |
|
modCount++; |
579 |
< |
|
580 |
< |
// Let gc do its work |
581 |
< |
for (int i = 0; i < size; i++) |
477 |
< |
elementData[i] = null; |
478 |
< |
|
479 |
< |
size = 0; |
579 |
> |
final Object[] es = elementData; |
580 |
> |
for (int to = size, i = size = 0; i < to; i++) |
581 |
> |
es[i] = null; |
582 |
|
} |
583 |
|
|
584 |
|
/** |
591 |
|
* list is nonempty.) |
592 |
|
* |
593 |
|
* @param c collection containing elements to be added to this list |
594 |
< |
* @return <tt>true</tt> if this list changed as a result of the call |
594 |
> |
* @return {@code true} if this list changed as a result of the call |
595 |
|
* @throws NullPointerException if the specified collection is null |
596 |
|
*/ |
597 |
|
public boolean addAll(Collection<? extends E> c) { |
598 |
|
Object[] a = c.toArray(); |
599 |
+ |
modCount++; |
600 |
|
int numNew = a.length; |
601 |
< |
ensureCapacity(size + numNew); // Increments modCount |
602 |
< |
System.arraycopy(a, 0, elementData, size, numNew); |
603 |
< |
size += numNew; |
604 |
< |
return numNew != 0; |
601 |
> |
if (numNew == 0) |
602 |
> |
return false; |
603 |
> |
Object[] elementData; |
604 |
> |
final int s; |
605 |
> |
if (numNew > (elementData = this.elementData).length - (s = size)) |
606 |
> |
elementData = grow(s + numNew); |
607 |
> |
System.arraycopy(a, 0, elementData, s, numNew); |
608 |
> |
size = s + numNew; |
609 |
> |
// checkInvariants(); |
610 |
> |
return true; |
611 |
|
} |
612 |
|
|
613 |
|
/** |
621 |
|
* @param index index at which to insert the first element from the |
622 |
|
* specified collection |
623 |
|
* @param c collection containing elements to be added to this list |
624 |
< |
* @return <tt>true</tt> if this list changed as a result of the call |
624 |
> |
* @return {@code true} if this list changed as a result of the call |
625 |
|
* @throws IndexOutOfBoundsException {@inheritDoc} |
626 |
|
* @throws NullPointerException if the specified collection is null |
627 |
|
*/ |
629 |
|
rangeCheckForAdd(index); |
630 |
|
|
631 |
|
Object[] a = c.toArray(); |
632 |
+ |
modCount++; |
633 |
|
int numNew = a.length; |
634 |
< |
ensureCapacity(size + numNew); // Increments modCount |
634 |
> |
if (numNew == 0) |
635 |
> |
return false; |
636 |
> |
Object[] elementData; |
637 |
> |
final int s; |
638 |
> |
if (numNew > (elementData = this.elementData).length - (s = size)) |
639 |
> |
elementData = grow(s + numNew); |
640 |
|
|
641 |
< |
int numMoved = size - index; |
641 |
> |
int numMoved = s - index; |
642 |
|
if (numMoved > 0) |
643 |
< |
System.arraycopy(elementData, index, elementData, index + numNew, |
643 |
> |
System.arraycopy(elementData, index, |
644 |
> |
elementData, index + numNew, |
645 |
|
numMoved); |
530 |
– |
|
646 |
|
System.arraycopy(a, 0, elementData, index, numNew); |
647 |
< |
size += numNew; |
648 |
< |
return numNew != 0; |
647 |
> |
size = s + numNew; |
648 |
> |
// checkInvariants(); |
649 |
> |
return true; |
650 |
|
} |
651 |
|
|
652 |
|
/** |
659 |
|
* @throws IndexOutOfBoundsException if {@code fromIndex} or |
660 |
|
* {@code toIndex} is out of range |
661 |
|
* ({@code fromIndex < 0 || |
546 |
– |
* fromIndex >= size() || |
662 |
|
* toIndex > size() || |
663 |
|
* toIndex < fromIndex}) |
664 |
|
*/ |
665 |
|
protected void removeRange(int fromIndex, int toIndex) { |
666 |
+ |
if (fromIndex > toIndex) { |
667 |
+ |
throw new IndexOutOfBoundsException( |
668 |
+ |
outOfBoundsMsg(fromIndex, toIndex)); |
669 |
+ |
} |
670 |
|
modCount++; |
671 |
< |
int numMoved = size - toIndex; |
672 |
< |
System.arraycopy(elementData, toIndex, elementData, fromIndex, |
554 |
< |
numMoved); |
555 |
< |
|
556 |
< |
// Let gc do its work |
557 |
< |
int newSize = size - (toIndex-fromIndex); |
558 |
< |
while (size != newSize) |
559 |
< |
elementData[--size] = null; |
671 |
> |
shiftTailOverGap(elementData, fromIndex, toIndex); |
672 |
> |
// checkInvariants(); |
673 |
|
} |
674 |
|
|
675 |
< |
/** |
676 |
< |
* Checks if the given index is in range. If not, throws an appropriate |
677 |
< |
* runtime exception. This method does *not* check if the index is |
678 |
< |
* negative: It is always used immediately prior to an array access, |
679 |
< |
* 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)); |
675 |
> |
/** Erases the gap from lo to hi, by sliding down following elements. */ |
676 |
> |
private void shiftTailOverGap(Object[] es, int lo, int hi) { |
677 |
> |
System.arraycopy(es, hi, es, lo, size - hi); |
678 |
> |
for (int to = size, i = (size -= hi - lo); i < to; i++) |
679 |
> |
es[i] = null; |
680 |
|
} |
681 |
|
|
682 |
|
/** |
697 |
|
} |
698 |
|
|
699 |
|
/** |
700 |
+ |
* A version used in checking (fromIndex > toIndex) condition |
701 |
+ |
*/ |
702 |
+ |
private static String outOfBoundsMsg(int fromIndex, int toIndex) { |
703 |
+ |
return "From Index: " + fromIndex + " > To Index: " + toIndex; |
704 |
+ |
} |
705 |
+ |
|
706 |
+ |
/** |
707 |
|
* Removes from this list all of its elements that are contained in the |
708 |
|
* specified collection. |
709 |
|
* |
710 |
|
* @param c collection containing elements to be removed from this list |
711 |
|
* @return {@code true} if this list changed as a result of the call |
712 |
|
* @throws ClassCastException if the class of an element of this list |
713 |
< |
* is incompatible with the specified collection (optional) |
713 |
> |
* is incompatible with the specified collection |
714 |
> |
* (<a href="Collection.html#optional-restrictions">optional</a>) |
715 |
|
* @throws NullPointerException if this list contains a null element and the |
716 |
< |
* specified collection does not permit null elements (optional), |
716 |
> |
* specified collection does not permit null elements |
717 |
> |
* (<a href="Collection.html#optional-restrictions">optional</a>), |
718 |
|
* or if the specified collection is null |
719 |
|
* @see Collection#contains(Object) |
720 |
|
*/ |
721 |
|
public boolean removeAll(Collection<?> c) { |
722 |
< |
return batchRemove(c, false); |
722 |
> |
return batchRemove(c, false, 0, size); |
723 |
|
} |
724 |
|
|
725 |
|
/** |
730 |
|
* @param c collection containing elements to be retained in this list |
731 |
|
* @return {@code true} if this list changed as a result of the call |
732 |
|
* @throws ClassCastException if the class of an element of this list |
733 |
< |
* is incompatible with the specified collection (optional) |
733 |
> |
* is incompatible with the specified collection |
734 |
> |
* (<a href="Collection.html#optional-restrictions">optional</a>) |
735 |
|
* @throws NullPointerException if this list contains a null element and the |
736 |
< |
* specified collection does not permit null elements (optional), |
736 |
> |
* specified collection does not permit null elements |
737 |
> |
* (<a href="Collection.html#optional-restrictions">optional</a>), |
738 |
|
* or if the specified collection is null |
739 |
|
* @see Collection#contains(Object) |
740 |
|
*/ |
741 |
|
public boolean retainAll(Collection<?> c) { |
742 |
< |
return batchRemove(c, true); |
742 |
> |
return batchRemove(c, true, 0, size); |
743 |
|
} |
744 |
|
|
745 |
< |
private boolean batchRemove(Collection<?> c, boolean complement) { |
746 |
< |
final Object[] elementData = this.elementData; |
747 |
< |
int r = 0, w = 0; |
748 |
< |
boolean modified = false; |
745 |
> |
boolean batchRemove(Collection<?> c, boolean complement, |
746 |
> |
final int from, final int end) { |
747 |
> |
Objects.requireNonNull(c); |
748 |
> |
final Object[] es = elementData; |
749 |
> |
int r; |
750 |
> |
// Optimize for initial run of survivors |
751 |
> |
for (r = from;; r++) { |
752 |
> |
if (r == end) |
753 |
> |
return false; |
754 |
> |
if (c.contains(es[r]) != complement) |
755 |
> |
break; |
756 |
> |
} |
757 |
> |
int w = r++; |
758 |
|
try { |
759 |
< |
for (; r < size; r++) |
760 |
< |
if (c.contains(elementData[r]) == complement) |
761 |
< |
elementData[w++] = elementData[r]; |
762 |
< |
} finally { |
759 |
> |
for (Object e; r < end; r++) |
760 |
> |
if (c.contains(e = es[r]) == complement) |
761 |
> |
es[w++] = e; |
762 |
> |
} catch (Throwable ex) { |
763 |
|
// Preserve behavioral compatibility with AbstractCollection, |
764 |
|
// even if c.contains() throws. |
765 |
< |
if (r != size) { |
766 |
< |
System.arraycopy(elementData, r, |
767 |
< |
elementData, w, |
768 |
< |
size - r); |
769 |
< |
w += size - r; |
770 |
< |
} |
642 |
< |
if (w != size) { |
643 |
< |
for (int i = w; i < size; i++) |
644 |
< |
elementData[i] = null; |
645 |
< |
modCount += size - w; |
646 |
< |
size = w; |
647 |
< |
modified = true; |
648 |
< |
} |
765 |
> |
System.arraycopy(es, r, es, w, end - r); |
766 |
> |
w += end - r; |
767 |
> |
throw ex; |
768 |
> |
} finally { |
769 |
> |
modCount += end - w; |
770 |
> |
shiftTailOverGap(es, w, end); |
771 |
|
} |
772 |
< |
return modified; |
772 |
> |
// checkInvariants(); |
773 |
> |
return true; |
774 |
|
} |
775 |
|
|
776 |
|
/** |
777 |
< |
* Save the state of the <tt>ArrayList</tt> instance to a stream (that |
778 |
< |
* is, serialize it). |
777 |
> |
* Saves the state of the {@code ArrayList} instance to a stream |
778 |
> |
* (that is, serializes it). |
779 |
|
* |
780 |
< |
* @serialData The length of the array backing the <tt>ArrayList</tt> |
780 |
> |
* @param s the stream |
781 |
> |
* @throws java.io.IOException if an I/O error occurs |
782 |
> |
* @serialData The length of the array backing the {@code ArrayList} |
783 |
|
* instance is emitted (int), followed by all of its elements |
784 |
< |
* (each an <tt>Object</tt>) in the proper order. |
784 |
> |
* (each an {@code Object}) in the proper order. |
785 |
|
*/ |
786 |
|
private void writeObject(java.io.ObjectOutputStream s) |
787 |
< |
throws java.io.IOException{ |
787 |
> |
throws java.io.IOException { |
788 |
|
// Write out element count, and any hidden stuff |
789 |
|
int expectedModCount = modCount; |
790 |
|
s.defaultWriteObject(); |
791 |
|
|
792 |
< |
// Write out array length |
793 |
< |
s.writeInt(elementData.length); |
792 |
> |
// Write out size as capacity for behavioral compatibility with clone() |
793 |
> |
s.writeInt(size); |
794 |
|
|
795 |
|
// Write out all elements in the proper order. |
796 |
< |
for (int i=0; i<size; i++) |
796 |
> |
for (int i=0; i<size; i++) { |
797 |
|
s.writeObject(elementData[i]); |
798 |
+ |
} |
799 |
|
|
800 |
|
if (modCount != expectedModCount) { |
801 |
|
throw new ConcurrentModificationException(); |
802 |
|
} |
677 |
– |
|
803 |
|
} |
804 |
|
|
805 |
|
/** |
806 |
< |
* Reconstitute the <tt>ArrayList</tt> instance from a stream (that is, |
807 |
< |
* deserialize it). |
806 |
> |
* Reconstitutes the {@code ArrayList} instance from a stream (that is, |
807 |
> |
* deserializes it). |
808 |
> |
* @param s the stream |
809 |
> |
* @throws ClassNotFoundException if the class of a serialized object |
810 |
> |
* could not be found |
811 |
> |
* @throws java.io.IOException if an I/O error occurs |
812 |
|
*/ |
813 |
|
private void readObject(java.io.ObjectInputStream s) |
814 |
|
throws java.io.IOException, ClassNotFoundException { |
815 |
+ |
|
816 |
|
// Read in size, and any hidden stuff |
817 |
|
s.defaultReadObject(); |
818 |
|
|
819 |
< |
// Read in array length and allocate array |
820 |
< |
int arrayLength = s.readInt(); |
821 |
< |
Object[] a = elementData = new Object[arrayLength]; |
822 |
< |
|
823 |
< |
// Read in all elements in the proper order. |
824 |
< |
for (int i=0; i<size; i++) |
825 |
< |
a[i] = s.readObject(); |
819 |
> |
// Read in capacity |
820 |
> |
s.readInt(); // ignored |
821 |
> |
|
822 |
> |
if (size > 0) { |
823 |
> |
// like clone(), allocate array based upon size not capacity |
824 |
> |
SharedSecrets.getJavaObjectInputStreamAccess().checkArray(s, Object[].class, size); |
825 |
> |
Object[] elements = new Object[size]; |
826 |
> |
|
827 |
> |
// Read in all elements in the proper order. |
828 |
> |
for (int i = 0; i < size; i++) { |
829 |
> |
elements[i] = s.readObject(); |
830 |
> |
} |
831 |
> |
|
832 |
> |
elementData = elements; |
833 |
> |
} else if (size == 0) { |
834 |
> |
elementData = EMPTY_ELEMENTDATA; |
835 |
> |
} else { |
836 |
> |
throw new java.io.InvalidObjectException("Invalid size: " + size); |
837 |
> |
} |
838 |
|
} |
839 |
|
|
840 |
|
/** |
850 |
|
* @throws IndexOutOfBoundsException {@inheritDoc} |
851 |
|
*/ |
852 |
|
public ListIterator<E> listIterator(int index) { |
853 |
< |
if (index < 0 || index > size) |
712 |
< |
throw new IndexOutOfBoundsException("Index: "+index); |
853 |
> |
rangeCheckForAdd(index); |
854 |
|
return new ListItr(index); |
855 |
|
} |
856 |
|
|
885 |
|
int lastRet = -1; // index of last element returned; -1 if no such |
886 |
|
int expectedModCount = modCount; |
887 |
|
|
888 |
+ |
// prevent creating a synthetic constructor |
889 |
+ |
Itr() {} |
890 |
+ |
|
891 |
|
public boolean hasNext() { |
892 |
|
return cursor != size; |
893 |
|
} |
920 |
|
} |
921 |
|
} |
922 |
|
|
923 |
+ |
@Override |
924 |
+ |
public void forEachRemaining(Consumer<? super E> action) { |
925 |
+ |
Objects.requireNonNull(action); |
926 |
+ |
final int size = ArrayList.this.size; |
927 |
+ |
int i = cursor; |
928 |
+ |
if (i < size) { |
929 |
+ |
final Object[] es = elementData; |
930 |
+ |
if (i >= es.length) |
931 |
+ |
throw new ConcurrentModificationException(); |
932 |
+ |
for (; i < size && modCount == expectedModCount; i++) |
933 |
+ |
action.accept(elementAt(es, i)); |
934 |
+ |
// update once at end to reduce heap write traffic |
935 |
+ |
cursor = i; |
936 |
+ |
lastRet = i - 1; |
937 |
+ |
checkForComodification(); |
938 |
+ |
} |
939 |
+ |
} |
940 |
+ |
|
941 |
|
final void checkForComodification() { |
942 |
|
if (modCount != expectedModCount) |
943 |
|
throw new ConcurrentModificationException(); |
1036 |
|
*/ |
1037 |
|
public List<E> subList(int fromIndex, int toIndex) { |
1038 |
|
subListRangeCheck(fromIndex, toIndex, size); |
1039 |
< |
return new SubList(this, 0, fromIndex, toIndex); |
1039 |
> |
return new SubList<>(this, fromIndex, toIndex); |
1040 |
|
} |
1041 |
|
|
1042 |
< |
static void subListRangeCheck(int fromIndex, int toIndex, int size) { |
1043 |
< |
if (fromIndex < 0) |
1044 |
< |
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; |
1042 |
> |
private static class SubList<E> extends AbstractList<E> implements RandomAccess { |
1043 |
> |
private final ArrayList<E> root; |
1044 |
> |
private final SubList<E> parent; |
1045 |
|
private final int offset; |
1046 |
< |
int size; |
1046 |
> |
private int size; |
1047 |
> |
|
1048 |
> |
/** |
1049 |
> |
* Constructs a sublist of an arbitrary ArrayList. |
1050 |
> |
*/ |
1051 |
> |
public SubList(ArrayList<E> root, int fromIndex, int toIndex) { |
1052 |
> |
this.root = root; |
1053 |
> |
this.parent = null; |
1054 |
> |
this.offset = fromIndex; |
1055 |
> |
this.size = toIndex - fromIndex; |
1056 |
> |
this.modCount = root.modCount; |
1057 |
> |
} |
1058 |
|
|
1059 |
< |
SubList(AbstractList<E> parent, |
1060 |
< |
int offset, int fromIndex, int toIndex) { |
1059 |
> |
/** |
1060 |
> |
* Constructs a sublist of another SubList. |
1061 |
> |
*/ |
1062 |
> |
private SubList(SubList<E> parent, int fromIndex, int toIndex) { |
1063 |
> |
this.root = parent.root; |
1064 |
|
this.parent = parent; |
1065 |
< |
this.parentOffset = fromIndex; |
900 |
< |
this.offset = offset + fromIndex; |
1065 |
> |
this.offset = parent.offset + fromIndex; |
1066 |
|
this.size = toIndex - fromIndex; |
1067 |
< |
this.modCount = ArrayList.this.modCount; |
1067 |
> |
this.modCount = root.modCount; |
1068 |
|
} |
1069 |
|
|
1070 |
< |
public E set(int index, E e) { |
1071 |
< |
rangeCheck(index); |
1070 |
> |
public E set(int index, E element) { |
1071 |
> |
Objects.checkIndex(index, size); |
1072 |
|
checkForComodification(); |
1073 |
< |
E oldValue = ArrayList.this.elementData(offset + index); |
1074 |
< |
ArrayList.this.elementData[offset + index] = e; |
1073 |
> |
E oldValue = root.elementData(offset + index); |
1074 |
> |
root.elementData[offset + index] = element; |
1075 |
|
return oldValue; |
1076 |
|
} |
1077 |
|
|
1078 |
|
public E get(int index) { |
1079 |
< |
rangeCheck(index); |
1079 |
> |
Objects.checkIndex(index, size); |
1080 |
|
checkForComodification(); |
1081 |
< |
return ArrayList.this.elementData(offset + index); |
1081 |
> |
return root.elementData(offset + index); |
1082 |
|
} |
1083 |
|
|
1084 |
|
public int size() { |
1085 |
|
checkForComodification(); |
1086 |
< |
return this.size; |
1086 |
> |
return size; |
1087 |
|
} |
1088 |
|
|
1089 |
< |
public void add(int index, E e) { |
1089 |
> |
public void add(int index, E element) { |
1090 |
|
rangeCheckForAdd(index); |
1091 |
|
checkForComodification(); |
1092 |
< |
parent.add(parentOffset + index, e); |
1093 |
< |
this.modCount = parent.modCount; |
929 |
< |
this.size++; |
1092 |
> |
root.add(offset + index, element); |
1093 |
> |
updateSizeAndModCount(1); |
1094 |
|
} |
1095 |
|
|
1096 |
|
public E remove(int index) { |
1097 |
< |
rangeCheck(index); |
1097 |
> |
Objects.checkIndex(index, size); |
1098 |
|
checkForComodification(); |
1099 |
< |
E result = parent.remove(parentOffset + index); |
1100 |
< |
this.modCount = parent.modCount; |
937 |
< |
this.size--; |
1099 |
> |
E result = root.remove(offset + index); |
1100 |
> |
updateSizeAndModCount(-1); |
1101 |
|
return result; |
1102 |
|
} |
1103 |
|
|
1104 |
|
protected void removeRange(int fromIndex, int toIndex) { |
1105 |
|
checkForComodification(); |
1106 |
< |
parent.removeRange(parentOffset + fromIndex, |
1107 |
< |
parentOffset + toIndex); |
945 |
< |
this.modCount = parent.modCount; |
946 |
< |
this.size -= toIndex - fromIndex; |
1106 |
> |
root.removeRange(offset + fromIndex, offset + toIndex); |
1107 |
> |
updateSizeAndModCount(fromIndex - toIndex); |
1108 |
|
} |
1109 |
|
|
1110 |
|
public boolean addAll(Collection<? extends E> c) { |
1116 |
|
int cSize = c.size(); |
1117 |
|
if (cSize==0) |
1118 |
|
return false; |
958 |
– |
|
1119 |
|
checkForComodification(); |
1120 |
< |
parent.addAll(parentOffset + index, c); |
1121 |
< |
this.modCount = parent.modCount; |
962 |
< |
this.size += cSize; |
1120 |
> |
root.addAll(offset + index, c); |
1121 |
> |
updateSizeAndModCount(cSize); |
1122 |
|
return true; |
1123 |
|
} |
1124 |
|
|
1125 |
+ |
public boolean removeAll(Collection<?> c) { |
1126 |
+ |
return batchRemove(c, false); |
1127 |
+ |
} |
1128 |
+ |
|
1129 |
+ |
public boolean retainAll(Collection<?> c) { |
1130 |
+ |
return batchRemove(c, true); |
1131 |
+ |
} |
1132 |
+ |
|
1133 |
+ |
private boolean batchRemove(Collection<?> c, boolean complement) { |
1134 |
+ |
checkForComodification(); |
1135 |
+ |
int oldSize = root.size; |
1136 |
+ |
boolean modified = |
1137 |
+ |
root.batchRemove(c, complement, offset, offset + size); |
1138 |
+ |
if (modified) |
1139 |
+ |
updateSizeAndModCount(root.size - oldSize); |
1140 |
+ |
return modified; |
1141 |
+ |
} |
1142 |
+ |
|
1143 |
+ |
public boolean removeIf(Predicate<? super E> filter) { |
1144 |
+ |
checkForComodification(); |
1145 |
+ |
int oldSize = root.size; |
1146 |
+ |
boolean modified = root.removeIf(filter, offset, offset + size); |
1147 |
+ |
if (modified) |
1148 |
+ |
updateSizeAndModCount(root.size - oldSize); |
1149 |
+ |
return modified; |
1150 |
+ |
} |
1151 |
+ |
|
1152 |
+ |
public Object[] toArray() { |
1153 |
+ |
checkForComodification(); |
1154 |
+ |
return Arrays.copyOfRange(root.elementData, offset, offset + size); |
1155 |
+ |
} |
1156 |
+ |
|
1157 |
+ |
@SuppressWarnings("unchecked") |
1158 |
+ |
public <T> T[] toArray(T[] a) { |
1159 |
+ |
checkForComodification(); |
1160 |
+ |
if (a.length < size) |
1161 |
+ |
return (T[]) Arrays.copyOfRange( |
1162 |
+ |
root.elementData, offset, offset + size, a.getClass()); |
1163 |
+ |
System.arraycopy(root.elementData, offset, a, 0, size); |
1164 |
+ |
if (a.length > size) |
1165 |
+ |
a[size] = null; |
1166 |
+ |
return a; |
1167 |
+ |
} |
1168 |
+ |
|
1169 |
|
public Iterator<E> iterator() { |
1170 |
|
return listIterator(); |
1171 |
|
} |
1172 |
|
|
1173 |
< |
public ListIterator<E> listIterator(final int index) { |
1173 |
> |
public ListIterator<E> listIterator(int index) { |
1174 |
|
checkForComodification(); |
1175 |
|
rangeCheckForAdd(index); |
973 |
– |
final int offset = this.offset; |
1176 |
|
|
1177 |
|
return new ListIterator<E>() { |
1178 |
|
int cursor = index; |
1179 |
|
int lastRet = -1; |
1180 |
< |
int expectedModCount = ArrayList.this.modCount; |
1180 |
> |
int expectedModCount = root.modCount; |
1181 |
|
|
1182 |
|
public boolean hasNext() { |
1183 |
|
return cursor != SubList.this.size; |
1189 |
|
int i = cursor; |
1190 |
|
if (i >= SubList.this.size) |
1191 |
|
throw new NoSuchElementException(); |
1192 |
< |
Object[] elementData = ArrayList.this.elementData; |
1192 |
> |
Object[] elementData = root.elementData; |
1193 |
|
if (offset + i >= elementData.length) |
1194 |
|
throw new ConcurrentModificationException(); |
1195 |
|
cursor = i + 1; |
1206 |
|
int i = cursor - 1; |
1207 |
|
if (i < 0) |
1208 |
|
throw new NoSuchElementException(); |
1209 |
< |
Object[] elementData = ArrayList.this.elementData; |
1209 |
> |
Object[] elementData = root.elementData; |
1210 |
|
if (offset + i >= elementData.length) |
1211 |
|
throw new ConcurrentModificationException(); |
1212 |
|
cursor = i; |
1213 |
|
return (E) elementData[offset + (lastRet = i)]; |
1214 |
|
} |
1215 |
|
|
1216 |
+ |
public void forEachRemaining(Consumer<? super E> action) { |
1217 |
+ |
Objects.requireNonNull(action); |
1218 |
+ |
final int size = SubList.this.size; |
1219 |
+ |
int i = cursor; |
1220 |
+ |
if (i < size) { |
1221 |
+ |
final Object[] es = root.elementData; |
1222 |
+ |
if (offset + i >= es.length) |
1223 |
+ |
throw new ConcurrentModificationException(); |
1224 |
+ |
for (; i < size && modCount == expectedModCount; i++) |
1225 |
+ |
action.accept(elementAt(es, offset + i)); |
1226 |
+ |
// update once at end to reduce heap write traffic |
1227 |
+ |
cursor = i; |
1228 |
+ |
lastRet = i - 1; |
1229 |
+ |
checkForComodification(); |
1230 |
+ |
} |
1231 |
+ |
} |
1232 |
+ |
|
1233 |
|
public int nextIndex() { |
1234 |
|
return cursor; |
1235 |
|
} |
1247 |
|
SubList.this.remove(lastRet); |
1248 |
|
cursor = lastRet; |
1249 |
|
lastRet = -1; |
1250 |
< |
expectedModCount = ArrayList.this.modCount; |
1250 |
> |
expectedModCount = root.modCount; |
1251 |
|
} catch (IndexOutOfBoundsException ex) { |
1252 |
|
throw new ConcurrentModificationException(); |
1253 |
|
} |
1259 |
|
checkForComodification(); |
1260 |
|
|
1261 |
|
try { |
1262 |
< |
ArrayList.this.set(offset + lastRet, e); |
1262 |
> |
root.set(offset + lastRet, e); |
1263 |
|
} catch (IndexOutOfBoundsException ex) { |
1264 |
|
throw new ConcurrentModificationException(); |
1265 |
|
} |
1273 |
|
SubList.this.add(i, e); |
1274 |
|
cursor = i + 1; |
1275 |
|
lastRet = -1; |
1276 |
< |
expectedModCount = ArrayList.this.modCount; |
1276 |
> |
expectedModCount = root.modCount; |
1277 |
|
} catch (IndexOutOfBoundsException ex) { |
1278 |
|
throw new ConcurrentModificationException(); |
1279 |
|
} |
1280 |
|
} |
1281 |
|
|
1282 |
|
final void checkForComodification() { |
1283 |
< |
if (expectedModCount != ArrayList.this.modCount) |
1283 |
> |
if (root.modCount != expectedModCount) |
1284 |
|
throw new ConcurrentModificationException(); |
1285 |
|
} |
1286 |
|
}; |
1288 |
|
|
1289 |
|
public List<E> subList(int fromIndex, int toIndex) { |
1290 |
|
subListRangeCheck(fromIndex, toIndex, size); |
1291 |
< |
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)); |
1291 |
> |
return new SubList<>(this, fromIndex, toIndex); |
1292 |
|
} |
1293 |
|
|
1294 |
|
private void rangeCheckForAdd(int index) { |
1301 |
|
} |
1302 |
|
|
1303 |
|
private void checkForComodification() { |
1304 |
< |
if (ArrayList.this.modCount != this.modCount) |
1304 |
> |
if (root.modCount != modCount) |
1305 |
> |
throw new ConcurrentModificationException(); |
1306 |
> |
} |
1307 |
> |
|
1308 |
> |
private void updateSizeAndModCount(int sizeChange) { |
1309 |
> |
SubList<E> slist = this; |
1310 |
> |
do { |
1311 |
> |
slist.size += sizeChange; |
1312 |
> |
slist.modCount = root.modCount; |
1313 |
> |
slist = slist.parent; |
1314 |
> |
} while (slist != null); |
1315 |
> |
} |
1316 |
> |
|
1317 |
> |
public Spliterator<E> spliterator() { |
1318 |
> |
checkForComodification(); |
1319 |
> |
|
1320 |
> |
// ArrayListSpliterator not used here due to late-binding |
1321 |
> |
return new Spliterator<E>() { |
1322 |
> |
private int index = offset; // current index, modified on advance/split |
1323 |
> |
private int fence = -1; // -1 until used; then one past last index |
1324 |
> |
private int expectedModCount; // initialized when fence set |
1325 |
> |
|
1326 |
> |
private int getFence() { // initialize fence to size on first use |
1327 |
> |
int hi; // (a specialized variant appears in method forEach) |
1328 |
> |
if ((hi = fence) < 0) { |
1329 |
> |
expectedModCount = modCount; |
1330 |
> |
hi = fence = offset + size; |
1331 |
> |
} |
1332 |
> |
return hi; |
1333 |
> |
} |
1334 |
> |
|
1335 |
> |
public ArrayList<E>.ArrayListSpliterator trySplit() { |
1336 |
> |
int hi = getFence(), lo = index, mid = (lo + hi) >>> 1; |
1337 |
> |
// ArrayListSpliterator can be used here as the source is already bound |
1338 |
> |
return (lo >= mid) ? null : // divide range in half unless too small |
1339 |
> |
root.new ArrayListSpliterator(lo, index = mid, expectedModCount); |
1340 |
> |
} |
1341 |
> |
|
1342 |
> |
public boolean tryAdvance(Consumer<? super E> action) { |
1343 |
> |
Objects.requireNonNull(action); |
1344 |
> |
int hi = getFence(), i = index; |
1345 |
> |
if (i < hi) { |
1346 |
> |
index = i + 1; |
1347 |
> |
@SuppressWarnings("unchecked") E e = (E)root.elementData[i]; |
1348 |
> |
action.accept(e); |
1349 |
> |
if (root.modCount != expectedModCount) |
1350 |
> |
throw new ConcurrentModificationException(); |
1351 |
> |
return true; |
1352 |
> |
} |
1353 |
> |
return false; |
1354 |
> |
} |
1355 |
> |
|
1356 |
> |
public void forEachRemaining(Consumer<? super E> action) { |
1357 |
> |
Objects.requireNonNull(action); |
1358 |
> |
int i, hi, mc; // hoist accesses and checks from loop |
1359 |
> |
ArrayList<E> lst = root; |
1360 |
> |
Object[] a; |
1361 |
> |
if ((a = lst.elementData) != null) { |
1362 |
> |
if ((hi = fence) < 0) { |
1363 |
> |
mc = modCount; |
1364 |
> |
hi = offset + size; |
1365 |
> |
} |
1366 |
> |
else |
1367 |
> |
mc = expectedModCount; |
1368 |
> |
if ((i = index) >= 0 && (index = hi) <= a.length) { |
1369 |
> |
for (; i < hi; ++i) { |
1370 |
> |
@SuppressWarnings("unchecked") E e = (E) a[i]; |
1371 |
> |
action.accept(e); |
1372 |
> |
} |
1373 |
> |
if (lst.modCount == mc) |
1374 |
> |
return; |
1375 |
> |
} |
1376 |
> |
} |
1377 |
> |
throw new ConcurrentModificationException(); |
1378 |
> |
} |
1379 |
> |
|
1380 |
> |
public long estimateSize() { |
1381 |
> |
return getFence() - index; |
1382 |
> |
} |
1383 |
> |
|
1384 |
> |
public int characteristics() { |
1385 |
> |
return Spliterator.ORDERED | Spliterator.SIZED | Spliterator.SUBSIZED; |
1386 |
> |
} |
1387 |
> |
}; |
1388 |
> |
} |
1389 |
> |
} |
1390 |
> |
|
1391 |
> |
/** |
1392 |
> |
* @throws NullPointerException {@inheritDoc} |
1393 |
> |
*/ |
1394 |
> |
@Override |
1395 |
> |
public void forEach(Consumer<? super E> action) { |
1396 |
> |
Objects.requireNonNull(action); |
1397 |
> |
final int expectedModCount = modCount; |
1398 |
> |
final Object[] es = elementData; |
1399 |
> |
final int size = this.size; |
1400 |
> |
for (int i = 0; modCount == expectedModCount && i < size; i++) |
1401 |
> |
action.accept(elementAt(es, i)); |
1402 |
> |
if (modCount != expectedModCount) |
1403 |
> |
throw new ConcurrentModificationException(); |
1404 |
> |
} |
1405 |
> |
|
1406 |
> |
/** |
1407 |
> |
* Creates a <em><a href="Spliterator.html#binding">late-binding</a></em> |
1408 |
> |
* and <em>fail-fast</em> {@link Spliterator} over the elements in this |
1409 |
> |
* list. |
1410 |
> |
* |
1411 |
> |
* <p>The {@code Spliterator} reports {@link Spliterator#SIZED}, |
1412 |
> |
* {@link Spliterator#SUBSIZED}, and {@link Spliterator#ORDERED}. |
1413 |
> |
* Overriding implementations should document the reporting of additional |
1414 |
> |
* characteristic values. |
1415 |
> |
* |
1416 |
> |
* @return a {@code Spliterator} over the elements in this list |
1417 |
> |
* @since 1.8 |
1418 |
> |
*/ |
1419 |
> |
@Override |
1420 |
> |
public Spliterator<E> spliterator() { |
1421 |
> |
return new ArrayListSpliterator(0, -1, 0); |
1422 |
> |
} |
1423 |
> |
|
1424 |
> |
/** Index-based split-by-two, lazily initialized Spliterator */ |
1425 |
> |
final class ArrayListSpliterator implements Spliterator<E> { |
1426 |
> |
|
1427 |
> |
/* |
1428 |
> |
* If ArrayLists were immutable, or structurally immutable (no |
1429 |
> |
* adds, removes, etc), we could implement their spliterators |
1430 |
> |
* with Arrays.spliterator. Instead we detect as much |
1431 |
> |
* interference during traversal as practical without |
1432 |
> |
* sacrificing much performance. We rely primarily on |
1433 |
> |
* modCounts. These are not guaranteed to detect concurrency |
1434 |
> |
* violations, and are sometimes overly conservative about |
1435 |
> |
* within-thread interference, but detect enough problems to |
1436 |
> |
* be worthwhile in practice. To carry this out, we (1) lazily |
1437 |
> |
* initialize fence and expectedModCount until the latest |
1438 |
> |
* point that we need to commit to the state we are checking |
1439 |
> |
* against; thus improving precision. (This doesn't apply to |
1440 |
> |
* SubLists, that create spliterators with current non-lazy |
1441 |
> |
* values). (2) We perform only a single |
1442 |
> |
* ConcurrentModificationException check at the end of forEach |
1443 |
> |
* (the most performance-sensitive method). When using forEach |
1444 |
> |
* (as opposed to iterators), we can normally only detect |
1445 |
> |
* interference after actions, not before. Further |
1446 |
> |
* CME-triggering checks apply to all other possible |
1447 |
> |
* violations of assumptions for example null or too-small |
1448 |
> |
* elementData array given its size(), that could only have |
1449 |
> |
* occurred due to interference. This allows the inner loop |
1450 |
> |
* of forEach to run without any further checks, and |
1451 |
> |
* simplifies lambda-resolution. While this does entail a |
1452 |
> |
* number of checks, note that in the common case of |
1453 |
> |
* list.stream().forEach(a), no checks or other computation |
1454 |
> |
* occur anywhere other than inside forEach itself. The other |
1455 |
> |
* less-often-used methods cannot take advantage of most of |
1456 |
> |
* these streamlinings. |
1457 |
> |
*/ |
1458 |
> |
|
1459 |
> |
private int index; // current index, modified on advance/split |
1460 |
> |
private int fence; // -1 until used; then one past last index |
1461 |
> |
private int expectedModCount; // initialized when fence set |
1462 |
> |
|
1463 |
> |
/** Creates new spliterator covering the given range. */ |
1464 |
> |
ArrayListSpliterator(int origin, int fence, int expectedModCount) { |
1465 |
> |
this.index = origin; |
1466 |
> |
this.fence = fence; |
1467 |
> |
this.expectedModCount = expectedModCount; |
1468 |
> |
} |
1469 |
> |
|
1470 |
> |
private int getFence() { // initialize fence to size on first use |
1471 |
> |
int hi; // (a specialized variant appears in method forEach) |
1472 |
> |
if ((hi = fence) < 0) { |
1473 |
> |
expectedModCount = modCount; |
1474 |
> |
hi = fence = size; |
1475 |
> |
} |
1476 |
> |
return hi; |
1477 |
> |
} |
1478 |
> |
|
1479 |
> |
public ArrayListSpliterator trySplit() { |
1480 |
> |
int hi = getFence(), lo = index, mid = (lo + hi) >>> 1; |
1481 |
> |
return (lo >= mid) ? null : // divide range in half unless too small |
1482 |
> |
new ArrayListSpliterator(lo, index = mid, expectedModCount); |
1483 |
> |
} |
1484 |
> |
|
1485 |
> |
public boolean tryAdvance(Consumer<? super E> action) { |
1486 |
> |
if (action == null) |
1487 |
> |
throw new NullPointerException(); |
1488 |
> |
int hi = getFence(), i = index; |
1489 |
> |
if (i < hi) { |
1490 |
> |
index = i + 1; |
1491 |
> |
@SuppressWarnings("unchecked") E e = (E)elementData[i]; |
1492 |
> |
action.accept(e); |
1493 |
> |
if (modCount != expectedModCount) |
1494 |
> |
throw new ConcurrentModificationException(); |
1495 |
> |
return true; |
1496 |
> |
} |
1497 |
> |
return false; |
1498 |
> |
} |
1499 |
> |
|
1500 |
> |
public void forEachRemaining(Consumer<? super E> action) { |
1501 |
> |
int i, hi, mc; // hoist accesses and checks from loop |
1502 |
> |
Object[] a; |
1503 |
> |
if (action == null) |
1504 |
> |
throw new NullPointerException(); |
1505 |
> |
if ((a = elementData) != null) { |
1506 |
> |
if ((hi = fence) < 0) { |
1507 |
> |
mc = modCount; |
1508 |
> |
hi = size; |
1509 |
> |
} |
1510 |
> |
else |
1511 |
> |
mc = expectedModCount; |
1512 |
> |
if ((i = index) >= 0 && (index = hi) <= a.length) { |
1513 |
> |
for (; i < hi; ++i) { |
1514 |
> |
@SuppressWarnings("unchecked") E e = (E) a[i]; |
1515 |
> |
action.accept(e); |
1516 |
> |
} |
1517 |
> |
if (modCount == mc) |
1518 |
> |
return; |
1519 |
> |
} |
1520 |
> |
} |
1521 |
> |
throw new ConcurrentModificationException(); |
1522 |
> |
} |
1523 |
> |
|
1524 |
> |
public long estimateSize() { |
1525 |
> |
return getFence() - index; |
1526 |
> |
} |
1527 |
> |
|
1528 |
> |
public int characteristics() { |
1529 |
> |
return Spliterator.ORDERED | Spliterator.SIZED | Spliterator.SUBSIZED; |
1530 |
> |
} |
1531 |
> |
} |
1532 |
> |
|
1533 |
> |
// A tiny bit set implementation |
1534 |
> |
|
1535 |
> |
private static long[] nBits(int n) { |
1536 |
> |
return new long[((n - 1) >> 6) + 1]; |
1537 |
> |
} |
1538 |
> |
private static void setBit(long[] bits, int i) { |
1539 |
> |
bits[i >> 6] |= 1L << i; |
1540 |
> |
} |
1541 |
> |
private static boolean isClear(long[] bits, int i) { |
1542 |
> |
return (bits[i >> 6] & (1L << i)) == 0; |
1543 |
> |
} |
1544 |
> |
|
1545 |
> |
/** |
1546 |
> |
* @throws NullPointerException {@inheritDoc} |
1547 |
> |
*/ |
1548 |
> |
@Override |
1549 |
> |
public boolean removeIf(Predicate<? super E> filter) { |
1550 |
> |
return removeIf(filter, 0, size); |
1551 |
> |
} |
1552 |
> |
|
1553 |
> |
/** |
1554 |
> |
* Removes all elements satisfying the given predicate, from index |
1555 |
> |
* i (inclusive) to index end (exclusive). |
1556 |
> |
*/ |
1557 |
> |
boolean removeIf(Predicate<? super E> filter, int i, final int end) { |
1558 |
> |
Objects.requireNonNull(filter); |
1559 |
> |
int expectedModCount = modCount; |
1560 |
> |
final Object[] es = elementData; |
1561 |
> |
// Optimize for initial run of survivors |
1562 |
> |
for (; i < end && !filter.test(elementAt(es, i)); i++) |
1563 |
> |
; |
1564 |
> |
// Tolerate predicates that reentrantly access the collection for |
1565 |
> |
// read (but writers still get CME), so traverse once to find |
1566 |
> |
// elements to delete, a second pass to physically expunge. |
1567 |
> |
if (i < end) { |
1568 |
> |
final int beg = i; |
1569 |
> |
final long[] deathRow = nBits(end - beg); |
1570 |
> |
deathRow[0] = 1L; // set bit 0 |
1571 |
> |
for (i = beg + 1; i < end; i++) |
1572 |
> |
if (filter.test(elementAt(es, i))) |
1573 |
> |
setBit(deathRow, i - beg); |
1574 |
> |
if (modCount != expectedModCount) |
1575 |
|
throw new ConcurrentModificationException(); |
1576 |
+ |
modCount++; |
1577 |
+ |
int w = beg; |
1578 |
+ |
for (i = beg; i < end; i++) |
1579 |
+ |
if (isClear(deathRow, i - beg)) |
1580 |
+ |
es[w++] = es[i]; |
1581 |
+ |
shiftTailOverGap(es, w, end); |
1582 |
+ |
// checkInvariants(); |
1583 |
+ |
return true; |
1584 |
+ |
} else { |
1585 |
+ |
if (modCount != expectedModCount) |
1586 |
+ |
throw new ConcurrentModificationException(); |
1587 |
+ |
// checkInvariants(); |
1588 |
+ |
return false; |
1589 |
|
} |
1590 |
|
} |
1591 |
+ |
|
1592 |
+ |
@Override |
1593 |
+ |
public void replaceAll(UnaryOperator<E> operator) { |
1594 |
+ |
Objects.requireNonNull(operator); |
1595 |
+ |
final int expectedModCount = modCount; |
1596 |
+ |
final Object[] es = elementData; |
1597 |
+ |
final int size = this.size; |
1598 |
+ |
for (int i = 0; modCount == expectedModCount && i < size; i++) |
1599 |
+ |
es[i] = operator.apply(elementAt(es, i)); |
1600 |
+ |
if (modCount != expectedModCount) |
1601 |
+ |
throw new ConcurrentModificationException(); |
1602 |
+ |
modCount++; |
1603 |
+ |
// checkInvariants(); |
1604 |
+ |
} |
1605 |
+ |
|
1606 |
+ |
@Override |
1607 |
+ |
@SuppressWarnings("unchecked") |
1608 |
+ |
public void sort(Comparator<? super E> c) { |
1609 |
+ |
final int expectedModCount = modCount; |
1610 |
+ |
Arrays.sort((E[]) elementData, 0, size, c); |
1611 |
+ |
if (modCount != expectedModCount) |
1612 |
+ |
throw new ConcurrentModificationException(); |
1613 |
+ |
modCount++; |
1614 |
+ |
// checkInvariants(); |
1615 |
+ |
} |
1616 |
+ |
|
1617 |
+ |
void checkInvariants() { |
1618 |
+ |
// assert size >= 0; |
1619 |
+ |
// assert size == elementData.length || elementData[size] == null; |
1620 |
+ |
} |
1621 |
|
} |