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.43 by jsr166, Mon Nov 14 22:46:22 2016 UTC vs.
Revision 1.58 by jsr166, Sat May 5 18:29:53 2018 UTC

#	Line 1 | Line 1
1		/*
2	<	* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
2	>	* Copyright (c) 1997, 2018, 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
#	Line 28 | Line 28 | package java.util;
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 {@code List} interface.  Implements
#	Line 91 | Line 92 | import java.util.function.UnaryOperator;
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
#	Line 515 | Line 516 | public class ArrayList<E> extends Abstra
516		*/
517		public E remove(int index) {
518		Objects.checkIndex(index, size);
519	+	final Object[] es = elementData;
520
521	<	modCount++;
522	<	E oldValue = elementData(index);
521	<
522	<	int numMoved = size - index - 1;
523	<	if (numMoved > 0)
524	<	System.arraycopy(elementData, index+1, elementData, index,
525	<	numMoved);
526	<	elementData[--size] = null; // clear to let GC do its work
521	>	@SuppressWarnings("unchecked") E oldValue = (E) es[index];
522	>	fastRemove(es, index);
523
524		// checkInvariants();
525		return oldValue;
#	Line 543 | Line 539 | public class ArrayList<E> extends Abstra
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		/**
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);
572	<	elementData[--size] = null; // clear to 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		/**
#	Line 578 | Line 576 | public class ArrayList<E> extends Abstra
576		*/
577		public void clear() {
578		modCount++;
579	<	Arrays.fill(elementData, 0, size, null);
580	<	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		/**
#	Line 669 | Line 668 | public class ArrayList<E> extends Abstra
668		outOfBoundsMsg(fromIndex, toIndex));
669		}
670		modCount++;
671	<	final Object[] es = elementData;
673	<	final int oldSize = size;
674	<	System.arraycopy(es, toIndex, es, fromIndex, oldSize - toIndex);
675	<	Arrays.fill(es, size -= (toIndex - fromIndex), oldSize, null);
671	>	shiftTailOverGap(elementData, fromIndex, toIndex);
672		// checkInvariants();
673		}
674
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		/**
683		* A version of rangeCheck used by add and addAll.
684		*/
#	Line 743 | Line 746 | public class ArrayList<E> extends Abstra
746		final int from, final int end) {
747		Objects.requireNonNull(c);
748		final Object[] es = elementData;
746	–	final boolean modified;
749		int r;
750		// Optimize for initial run of survivors
751	<	for (r = from; r < end && c.contains(es[r]) == complement; r++)
752	<	;
753	<	if (modified = (r < end)) {
754	<	int w = r++;
755	<	try {
756	<	for (Object e; r < end; r++)
757	<	if (c.contains(e = es[r]) == complement)
758	<	es[w++] = e;
759	<	} catch (Throwable ex) {
760	<	// Preserve behavioral compatibility with AbstractCollection,
761	<	// even if c.contains() throws.
762	<	System.arraycopy(es, r, es, w, end - r);
763	<	w += end - r;
764	<	throw ex;
765	<	} finally {
766	<	final int oldSize = size, deleted = end - w;
767	<	modCount += deleted;
768	<	System.arraycopy(es, end, es, w, oldSize - end);
769	<	Arrays.fill(es, size -= deleted, oldSize, null);
770	<	}
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 (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	>	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		// checkInvariants();
773	<	return modified;
773	>	return true;
774		}
775
776		/**
777	<	* Save the state of the {@code ArrayList} 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	+	* @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 {@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 size as capacity for behavioural compatibility with clone()
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.
#	Line 799 | Line 803 | public class ArrayList<E> extends Abstra
803		}
804
805		/**
806	<	* Reconstitute the {@code ArrayList} 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 {
#	Line 813 | Line 821 | public class ArrayList<E> extends Abstra
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.
#	Line 912 | Line 921 | public class ArrayList<E> extends Abstra
921		}
922
923		@Override
924	<	@SuppressWarnings("unchecked")
925	<	public void forEachRemaining(Consumer<? super E> consumer) {
917	<	Objects.requireNonNull(consumer);
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	<	return;
930	<	}
931	<	final Object[] elementData = ArrayList.this.elementData;
932	<	if (i >= elementData.length) {
933	<	throw new ConcurrentModificationException();
934	<	}
935	<	while (i != size && modCount == expectedModCount) {
936	<	consumer.accept((E) elementData[i++]);
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		}
930	–	// update once at end of iteration to reduce heap write traffic
931	–	cursor = i;
932	–	lastRet = i - 1;
933	–	checkForComodification();
939		}
940
941		final void checkForComodification() {
#	Line 1117 | Line 1122 | public class ArrayList<E> extends Abstra
1122		return true;
1123		}
1124
1125	+	public void replaceAll(UnaryOperator<E> operator) {
1126	+	root.replaceAllRange(operator, offset, offset + size);
1127	+	}
1128	+
1129		public boolean removeAll(Collection<?> c) {
1130		return batchRemove(c, false);
1131		}
#	Line 1144 | Line 1153 | public class ArrayList<E> extends Abstra
1153		return modified;
1154		}
1155
1156	+	public Object[] toArray() {
1157	+	checkForComodification();
1158	+	return Arrays.copyOfRange(root.elementData, offset, offset + size);
1159	+	}
1160	+
1161	+	@SuppressWarnings("unchecked")
1162	+	public <T> T[] toArray(T[] a) {
1163	+	checkForComodification();
1164	+	if (a.length < size)
1165	+	return (T[]) Arrays.copyOfRange(
1166	+	root.elementData, offset, offset + size, a.getClass());
1167	+	System.arraycopy(root.elementData, offset, a, 0, size);
1168	+	if (a.length > size)
1169	+	a[size] = null;
1170	+	return a;
1171	+	}
1172	+
1173		public Iterator<E> iterator() {
1174		return listIterator();
1175		}
#	Line 1191 | Line 1217 | public class ArrayList<E> extends Abstra
1217		return (E) elementData[offset + (lastRet = i)];
1218		}
1219
1220	<	@SuppressWarnings("unchecked")
1221	<	public void forEachRemaining(Consumer<? super E> consumer) {
1196	<	Objects.requireNonNull(consumer);
1220	>	public void forEachRemaining(Consumer<? super E> action) {
1221	>	Objects.requireNonNull(action);
1222		final int size = SubList.this.size;
1223		int i = cursor;
1224	<	if (i >= size) {
1225	<	return;
1226	<	}
1227	<	final Object[] elementData = root.elementData;
1228	<	if (offset + i >= elementData.length) {
1229	<	throw new ConcurrentModificationException();
1230	<	}
1231	<	while (i != size && modCount == expectedModCount) {
1232	<	consumer.accept((E) elementData[offset + (i++)]);
1224	>	if (i < size) {
1225	>	final Object[] es = root.elementData;
1226	>	if (offset + i >= es.length)
1227	>	throw new ConcurrentModificationException();
1228	>	for (; i < size && modCount == expectedModCount; i++)
1229	>	action.accept(elementAt(es, offset + i));
1230	>	// update once at end to reduce heap write traffic
1231	>	cursor = i;
1232	>	lastRet = i - 1;
1233	>	checkForComodification();
1234		}
1209	–	// update once at end of iteration to reduce heap write traffic
1210	–	cursor = i;
1211	–	lastRet = i - 1;
1212	–	checkForComodification();
1235		}
1236
1237		public int nextIndex() {
#	Line 1299 | Line 1321 | public class ArrayList<E> extends Abstra
1321		public Spliterator<E> spliterator() {
1322		checkForComodification();
1323
1324	<	// ArrayListSpliterator is not used because late-binding logic
1325	<	// is different here
1304	<	return new Spliterator<>() {
1324	>	// ArrayListSpliterator not used here due to late-binding
1325	>	return new Spliterator<E>() {
1326		private int index = offset; // current index, modified on advance/split
1327		private int fence = -1; // -1 until used; then one past last index
1328		private int expectedModCount; // initialized when fence set
#	Line 1315 | Line 1336 | public class ArrayList<E> extends Abstra
1336		return hi;
1337		}
1338
1339	<	public ArrayListSpliterator<E> trySplit() {
1339	>	public ArrayList<E>.ArrayListSpliterator trySplit() {
1340		int hi = getFence(), lo = index, mid = (lo + hi) >>> 1;
1341	<	// ArrayListSpliterator could be used here as the source is already bound
1341	>	// ArrayListSpliterator can be used here as the source is already bound
1342		return (lo >= mid) ? null : // divide range in half unless too small
1343	<	new ArrayListSpliterator<>(root, lo, index = mid,
1323	<	expectedModCount);
1343	>	root.new ArrayListSpliterator(lo, index = mid, expectedModCount);
1344		}
1345
1346		public boolean tryAdvance(Consumer<? super E> action) {
#	Line 1362 | Line 1382 | public class ArrayList<E> extends Abstra
1382		}
1383
1384		public long estimateSize() {
1385	<	return (long) (getFence() - index);
1385	>	return getFence() - index;
1386		}
1387
1388		public int characteristics() {
#	Line 1372 | Line 1392 | public class ArrayList<E> extends Abstra
1392		}
1393		}
1394
1395	+	/**
1396	+	* @throws NullPointerException {@inheritDoc}
1397	+	*/
1398		@Override
1399		public void forEach(Consumer<? super E> action) {
1400		Objects.requireNonNull(action);
#	Line 1399 | Line 1422 | public class ArrayList<E> extends Abstra
1422		*/
1423		@Override
1424		public Spliterator<E> spliterator() {
1425	<	return new ArrayListSpliterator<>(this, 0, -1, 0);
1425	>	return new ArrayListSpliterator(0, -1, 0);
1426		}
1427
1428		/** Index-based split-by-two, lazily initialized Spliterator */
1429	<	static final class ArrayListSpliterator<E> implements Spliterator<E> {
1429	>	final class ArrayListSpliterator implements Spliterator<E> {
1430
1431		/*
1432		* If ArrayLists were immutable, or structurally immutable (no
#	Line 1437 | Line 1460 | public class ArrayList<E> extends Abstra
1460		* these streamlinings.
1461		*/
1462
1440	–	private final ArrayList<E> list;
1463		private int index; // current index, modified on advance/split
1464		private int fence; // -1 until used; then one past last index
1465		private int expectedModCount; // initialized when fence set
1466
1467	<	/** Create new spliterator covering the given range */
1468	<	ArrayListSpliterator(ArrayList<E> list, int origin, int fence,
1447	<	int expectedModCount) {
1448	<	this.list = list; // OK if null unless traversed
1467	>	/** Creates new spliterator covering the given range. */
1468	>	ArrayListSpliterator(int origin, int fence, int expectedModCount) {
1469		this.index = origin;
1470		this.fence = fence;
1471		this.expectedModCount = expectedModCount;
#	Line 1453 | Line 1473 | public class ArrayList<E> extends Abstra
1473
1474		private int getFence() { // initialize fence to size on first use
1475		int hi; // (a specialized variant appears in method forEach)
1456	–	ArrayList<E> lst;
1476		if ((hi = fence) < 0) {
1477	<	if ((lst = list) == null)
1478	<	hi = fence = 0;
1460	<	else {
1461	<	expectedModCount = lst.modCount;
1462	<	hi = fence = lst.size;
1463	<	}
1477	>	expectedModCount = modCount;
1478	>	hi = fence = size;
1479		}
1480		return hi;
1481		}
1482
1483	<	public ArrayListSpliterator<E> trySplit() {
1483	>	public ArrayListSpliterator trySplit() {
1484		int hi = getFence(), lo = index, mid = (lo + hi) >>> 1;
1485		return (lo >= mid) ? null : // divide range in half unless too small
1486	<	new ArrayListSpliterator<>(list, lo, index = mid,
1472	<	expectedModCount);
1486	>	new ArrayListSpliterator(lo, index = mid, expectedModCount);
1487		}
1488
1489		public boolean tryAdvance(Consumer<? super E> action) {
#	Line 1478 | Line 1492 | public class ArrayList<E> extends Abstra
1492		int hi = getFence(), i = index;
1493		if (i < hi) {
1494		index = i + 1;
1495	<	@SuppressWarnings("unchecked") E e = (E)list.elementData[i];
1495	>	@SuppressWarnings("unchecked") E e = (E)elementData[i];
1496		action.accept(e);
1497	<	if (list.modCount != expectedModCount)
1497	>	if (modCount != expectedModCount)
1498		throw new ConcurrentModificationException();
1499		return true;
1500		}
#	Line 1489 | Line 1503 | public class ArrayList<E> extends Abstra
1503
1504		public void forEachRemaining(Consumer<? super E> action) {
1505		int i, hi, mc; // hoist accesses and checks from loop
1506	<	ArrayList<E> lst; Object[] a;
1506	>	Object[] a;
1507		if (action == null)
1508		throw new NullPointerException();
1509	<	if ((lst = list) != null && (a = lst.elementData) != null) {
1509	>	if ((a = elementData) != null) {
1510		if ((hi = fence) < 0) {
1511	<	mc = lst.modCount;
1512	<	hi = lst.size;
1511	>	mc = modCount;
1512	>	hi = size;
1513		}
1514		else
1515		mc = expectedModCount;
#	Line 1504 | Line 1518 | public class ArrayList<E> extends Abstra
1518		@SuppressWarnings("unchecked") E e = (E) a[i];
1519		action.accept(e);
1520		}
1521	<	if (lst.modCount == mc)
1521	>	if (modCount == mc)
1522		return;
1523		}
1524		}
#	Line 1512 | Line 1526 | public class ArrayList<E> extends Abstra
1526		}
1527
1528		public long estimateSize() {
1529	<	return (long) (getFence() - index);
1529	>	return getFence() - index;
1530		}
1531
1532		public int characteristics() {
#	Line 1532 | Line 1546 | public class ArrayList<E> extends Abstra
1546		return (bits[i >> 6] & (1L << i)) == 0;
1547		}
1548
1549	+	/**
1550	+	* @throws NullPointerException {@inheritDoc}
1551	+	*/
1552		@Override
1553		public boolean removeIf(Predicate<? super E> filter) {
1554		return removeIf(filter, 0, size);
#	Line 1560 | Line 1577 | public class ArrayList<E> extends Abstra
1577		setBit(deathRow, i - beg);
1578		if (modCount != expectedModCount)
1579		throw new ConcurrentModificationException();
1563	–	expectedModCount++;
1580		modCount++;
1581		int w = beg;
1582		for (i = beg; i < end; i++)
1583		if (isClear(deathRow, i - beg))
1584		es[w++] = es[i];
1585	<	final int oldSize = size;
1570	<	System.arraycopy(es, end, es, w, oldSize - end);
1571	<	Arrays.fill(es, size -= (end - w), oldSize, null);
1585	>	shiftTailOverGap(es, w, end);
1586		// checkInvariants();
1587		return true;
1588		} else {
#	Line 1581 | Line 1595 | public class ArrayList<E> extends Abstra
1595
1596		@Override
1597		public void replaceAll(UnaryOperator<E> operator) {
1598	+	replaceAllRange(operator, 0, size);
1599	+	}
1600	+
1601	+	private void replaceAllRange(UnaryOperator<E> operator, int from, int to) {
1602		Objects.requireNonNull(operator);
1603		final int expectedModCount = modCount;
1604		final Object[] es = elementData;
1605	<	final int size = this.size;
1588	<	for (int i = 0; modCount == expectedModCount && i < size; i++)
1605	>	for (int i = from; modCount == expectedModCount && i < to; i++)
1606		es[i] = operator.apply(elementAt(es, i));
1607		if (modCount != expectedModCount)
1608		throw new ConcurrentModificationException();
1592	–	modCount++;
1609		// checkInvariants();
1610		}
1611

Diff Legend

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