ViewVC Help

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

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

Comparing jsr166/src/main/java/util/Vector.java (file contents):
Revision 1.25 by jsr166, Mon May 19 00:28:21 2008 UTC vs.
Revision 1.32 by jsr166, Sat Nov 12 20:51:59 2016 UTC

#	Line 1 | Line 1
1		/*
2	<	* Copyright 1994-2007 Sun Microsystems, Inc.  All Rights Reserved.
2	>	* Copyright (c) 1994, 2013, 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 18 | Line 18
18		* 2 along with this work; if not, write to the Free Software Foundation,
19		* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
20		*
21	<	* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
22	<	* CA 95054 USA or visit www.sun.com if you need additional information or
23	<	* have any questions.
21	>	* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
22	>	* or visit www.oracle.com if you need additional information or have any
23	>	* questions.
24		*/
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		* The {@code Vector} class implements a growable array of
34		* objects. Like an array, it contains components that can be
#	Line 41 | Line 45 | package java.util;
45		* capacity of a vector before inserting a large number of
46		* components; this reduces the amount of incremental reallocation.
47		*
48	<	* <p><a name="fail-fast"/>
48	>	* <p id="fail-fast">
49		* The iterators returned by this class's {@link #iterator() iterator} and
50		* {@link #listIterator(int) listIterator} methods are <em>fail-fast</em>:
51		* if the vector is structurally modified at any time after the iterator is
#	Line 52 | Line 56 | package java.util;
56		* concurrent modification, the iterator fails quickly and cleanly, rather
57		* than risking arbitrary, non-deterministic behavior at an undetermined
58		* time in the future.  The {@link Enumeration Enumerations} returned by
59	<	* the {@link #elements() elements} method are <em>not</em> fail-fast.
59	>	* the {@link #elements() elements} method are <em>not</em> fail-fast; if the
60	>	* Vector is structurally modified at any time after the enumeration is
61	>	* created then the results of enumerating are undefined.
62		*
63		* <p>Note that the fail-fast behavior of an iterator cannot be guaranteed
64		* as it is, generally speaking, impossible to make any hard guarantees in the
#	Line 70 | Line 76 | package java.util;
76		* implementation is not needed, it is recommended to use {@link
77		* ArrayList} in place of {@code Vector}.
78		*
79	+	* @param <E> Type of component elements
80	+	*
81		* @author  Lee Boynton
82		* @author  Jonathan Payne
83		* @see Collection
84		* @see LinkedList
85	<	* @since   JDK1.0
85	>	* @since   1.0
86		*/
87		public class Vector<E>
88		extends AbstractList<E>
#	Line 166 | Line 174 | public class Vector<E>
174		public Vector(Collection<? extends E> c) {
175		elementData = c.toArray();
176		elementCount = elementData.length;
177	<	// c.toArray might (incorrectly) not return Object[] (see 6260652)
177	>	// defend against c.toArray (incorrectly) not returning Object[]
178	>	// (see e.g. https://bugs.openjdk.java.net/browse/JDK-6260652)
179		if (elementData.getClass() != Object[].class)
180		elementData = Arrays.copyOf(elementData, elementCount, Object[].class);
181		}
#	Line 222 | Line 231 | public class Vector<E>
231		* @param minCapacity the desired minimum capacity
232		*/
233		public synchronized void ensureCapacity(int minCapacity) {
234	<	modCount++;
235	<	ensureCapacityHelper(minCapacity);
234	>	if (minCapacity > 0) {
235	>	modCount++;
236	>	if (minCapacity > elementData.length)
237	>	grow(minCapacity);
238	>	}
239		}
240
241		/**
242	<	* This implements the unsynchronized semantics of ensureCapacity.
243	<	* Synchronized methods in this class can internally call this
244	<	* method for ensuring capacity without incurring the cost of an
245	<	* extra synchronization.
242	>	* The maximum size of array to allocate (unless necessary).
243	>	* Some VMs reserve some header words in an array.
244	>	* Attempts to allocate larger arrays may result in
245	>	* OutOfMemoryError: Requested array size exceeds VM limit
246	>	*/
247	>	private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
248	>
249	>	/**
250	>	* Increases the capacity to ensure that it can hold at least the
251	>	* number of elements specified by the minimum capacity argument.
252		*
253	<	* @see #ensureCapacity(int)
253	>	* @param minCapacity the desired minimum capacity
254	>	* @throws OutOfMemoryError if minCapacity is less than zero
255		*/
256	<	private void ensureCapacityHelper(int minCapacity) {
256	>	private Object[] grow(int minCapacity) {
257	>	return elementData = Arrays.copyOf(elementData,
258	>	newCapacity(minCapacity));
259	>	}
260	>
261	>	private Object[] grow() {
262	>	return grow(elementCount + 1);
263	>	}
264	>
265	>	/**
266	>	* Returns a capacity at least as large as the given minimum capacity.
267	>	* Will not return a capacity greater than MAX_ARRAY_SIZE unless
268	>	* the given minimum capacity is greater than MAX_ARRAY_SIZE.
269	>	*
270	>	* @param minCapacity the desired minimum capacity
271	>	* @throws OutOfMemoryError if minCapacity is less than zero
272	>	*/
273	>	private int newCapacity(int minCapacity) {
274	>	// overflow-conscious code
275		int oldCapacity = elementData.length;
276	<	if (minCapacity > oldCapacity) {
277	<	Object[] oldData = elementData;
278	<	int newCapacity = (capacityIncrement > 0) ?
279	<	(oldCapacity + capacityIncrement) : (oldCapacity * 2);
280	<	if (newCapacity < minCapacity) {
281	<	newCapacity = minCapacity;
282	<	}
283	<	elementData = Arrays.copyOf(elementData, newCapacity);
284	<	}
276	>	int newCapacity = oldCapacity + ((capacityIncrement > 0) ?
277	>	capacityIncrement : oldCapacity);
278	>	if (newCapacity - minCapacity <= 0) {
279	>	if (minCapacity < 0) // overflow
280	>	throw new OutOfMemoryError();
281	>	return minCapacity;
282	>	}
283	>	return (newCapacity - MAX_ARRAY_SIZE <= 0)
284	>	? newCapacity
285	>	: hugeCapacity(minCapacity);
286	>	}
287	>
288	>	private static int hugeCapacity(int minCapacity) {
289	>	if (minCapacity < 0) // overflow
290	>	throw new OutOfMemoryError();
291	>	return (minCapacity > MAX_ARRAY_SIZE) ?
292	>	Integer.MAX_VALUE :
293	>	MAX_ARRAY_SIZE;
294		}
295
296		/**
#	Line 258 | Line 304 | public class Vector<E>
304		*/
305		public synchronized void setSize(int newSize) {
306		modCount++;
307	<	if (newSize > elementCount) {
308	<	ensureCapacityHelper(newSize);
309	<	} else {
310	<	for (int i = newSize ; i < elementCount ; i++) {
265	<	elementData[i] = null;
266	<	}
267	<	}
307	>	if (newSize > elementData.length)
308	>	grow(newSize);
309	>	for (int i = newSize; i < elementCount; i++)
310	>	elementData[i] = null;
311		elementCount = newSize;
312		}
313
#	Line 303 | Line 346 | public class Vector<E>
346		* Returns an enumeration of the components of this vector. The
347		* returned {@code Enumeration} object will generate all items in
348		* this vector. The first item generated is the item at index {@code 0},
349	<	* then the item at index {@code 1}, and so on.
349	>	* then the item at index {@code 1}, and so on. If the vector is
350	>	* structurally modified while enumerating over the elements then the
351	>	* results of enumerating are undefined.
352		*
353		* @return  an enumeration of the components of this vector
354		* @see     Iterator
#	Line 331 | Line 376 | public class Vector<E>
376		* Returns {@code true} if this vector contains the specified element.
377		* More formally, returns {@code true} if and only if this vector
378		* contains at least one element {@code e} such that
379	<	* <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>.
379	>	* {@code Objects.equals(o, e)}.
380		*
381		* @param o element whose presence in this vector is to be tested
382		* @return {@code true} if this vector contains the specified element
#	Line 344 | Line 389 | public class Vector<E>
389		* Returns the index of the first occurrence of the specified element
390		* in this vector, or -1 if this vector does not contain the element.
391		* More formally, returns the lowest index {@code i} such that
392	<	* <tt>(o==null&nbsp;?&nbsp;get(i)==null&nbsp;:&nbsp;o.equals(get(i)))</tt>,
392	>	* {@code Objects.equals(o, get(i))},
393		* or -1 if there is no such index.
394		*
395		* @param o element to search for
#	Line 360 | Line 405 | public class Vector<E>
405		* this vector, searching forwards from {@code index}, or returns -1 if
406		* the element is not found.
407		* More formally, returns the lowest index {@code i} such that
408	<	* <tt>(i&nbsp;&gt;=&nbsp;index&nbsp;&amp;&amp;&nbsp;(o==null&nbsp;?&nbsp;get(i)==null&nbsp;:&nbsp;o.equals(get(i))))</tt>,
408	>	* {@code (i >= index && Objects.equals(o, get(i)))},
409		* or -1 if there is no such index.
410		*
411		* @param o element to search for
#	Line 388 | Line 433 | public class Vector<E>
433		* Returns the index of the last occurrence of the specified element
434		* in this vector, or -1 if this vector does not contain the element.
435		* More formally, returns the highest index {@code i} such that
436	<	* <tt>(o==null&nbsp;?&nbsp;get(i)==null&nbsp;:&nbsp;o.equals(get(i)))</tt>,
436	>	* {@code Objects.equals(o, get(i))},
437		* or -1 if there is no such index.
438		*
439		* @param o element to search for
#	Line 404 | Line 449 | public class Vector<E>
449		* this vector, searching backwards from {@code index}, or returns -1 if
450		* the element is not found.
451		* More formally, returns the highest index {@code i} such that
452	<	* <tt>(i&nbsp;&lt;=&nbsp;index&nbsp;&amp;&amp;&nbsp;(o==null&nbsp;?&nbsp;get(i)==null&nbsp;:&nbsp;o.equals(get(i))))</tt>,
452	>	* {@code (i <= index && Objects.equals(o, get(i)))},
453		* or -1 if there is no such index.
454		*
455		* @param o element to search for
#	Line 468 | Line 513 | public class Vector<E>
513		* Returns the last component of the vector.
514		*
515		* @return  the last component of the vector, i.e., the component at index
516	<	*          <code>size()&nbsp;-&nbsp;1</code>.
516	>	*          {@code size() - 1}
517		* @throws NoSuchElementException if this vector is empty
518		*/
519		public synchronized E lastElement() {
#	Line 526 | Line 571 | public class Vector<E>
571		*         ({@code index < 0 || index >= size()})
572		*/
573		public synchronized void removeElementAt(int index) {
529	–	modCount++;
574		if (index >= elementCount) {
575		throw new ArrayIndexOutOfBoundsException(index + " >= " +
576		elementCount);
#	Line 538 | Line 582 | public class Vector<E>
582		if (j > 0) {
583		System.arraycopy(elementData, index + 1, elementData, index, j);
584		}
585	+	modCount++;
586		elementCount--;
587		elementData[elementCount] = null; /* to let gc do its work */
588		}
#	Line 566 | Line 611 | public class Vector<E>
611		*         ({@code index < 0 || index > size()})
612		*/
613		public synchronized void insertElementAt(E obj, int index) {
569	–	modCount++;
614		if (index > elementCount) {
615		throw new ArrayIndexOutOfBoundsException(index
616		+ " > " + elementCount);
617		}
618	<	ensureCapacityHelper(elementCount + 1);
619	<	System.arraycopy(elementData, index, elementData, index + 1, elementCount - index);
618	>	modCount++;
619	>	final int s = elementCount;
620	>	Object[] elementData = this.elementData;
621	>	if (s == elementData.length)
622	>	elementData = grow();
623	>	System.arraycopy(elementData, index,
624	>	elementData, index + 1,
625	>	s - index);
626		elementData[index] = obj;
627	<	elementCount++;
627	>	elementCount = s + 1;
628		}
629
630		/**
#	Line 590 | Line 640 | public class Vector<E>
640		*/
641		public synchronized void addElement(E obj) {
642		modCount++;
643	<	ensureCapacityHelper(elementCount + 1);
594	<	elementData[elementCount++] = obj;
643	>	add(obj, elementData, elementCount);
644		}
645
646		/**
#	Line 626 | Line 675 | public class Vector<E>
675		* method (which is part of the {@link List} interface).
676		*/
677		public synchronized void removeAllElements() {
629	–	modCount++;
678		// Let gc do its work
679		for (int i = 0; i < elementCount; i++)
680		elementData[i] = null;
681
682	+	modCount++;
683		elementCount = 0;
684		}
685
#	Line 650 | Line 699 | public class Vector<E>
699		return v;
700		} catch (CloneNotSupportedException e) {
701		// this shouldn't happen, since we are Cloneable
702	<	throw new InternalError();
702	>	throw new InternalError(e);
703		}
704		}
705
#	Line 678 | Line 727 | public class Vector<E>
727		* of the Vector <em>only</em> if the caller knows that the Vector
728		* does not contain any null elements.)
729		*
730	+	* @param <T> type of array elements. The same type as {@code <E>} or a
731	+	* supertype of {@code <E>}.
732		* @param a the array into which the elements of the Vector are to
733		*          be stored, if it is big enough; otherwise, a new array of the
734		*          same runtime type is allocated for this purpose.
735		* @return an array containing the elements of the Vector
736	<	* @throws ArrayStoreException if the runtime type of a is not a supertype
737	<	* of the runtime type of every element in this Vector
736	>	* @throws ArrayStoreException if the runtime type of a, {@code <T>}, is not
737	>	* a supertype of the runtime type, {@code <E>}, of every element in this
738	>	* Vector
739		* @throws NullPointerException if the given array is null
740		* @since 1.2
741		*/
#	Line 744 | Line 796 | public class Vector<E>
796		}
797
798		/**
799	+	* This helper method split out from add(E) to keep method
800	+	* bytecode size under 35 (the -XX:MaxInlineSize default value),
801	+	* which helps when add(E) is called in a C1-compiled loop.
802	+	*/
803	+	private void add(E e, Object[] elementData, int s) {
804	+	if (s == elementData.length)
805	+	elementData = grow();
806	+	elementData[s] = e;
807	+	elementCount = s + 1;
808	+	}
809	+
810	+	/**
811		* Appends the specified element to the end of this Vector.
812		*
813		* @param e element to be appended to this Vector
#	Line 752 | Line 816 | public class Vector<E>
816		*/
817		public synchronized boolean add(E e) {
818		modCount++;
819	<	ensureCapacityHelper(elementCount + 1);
756	<	elementData[elementCount++] = e;
819	>	add(e, elementData, elementCount);
820		return true;
821		}
822
#	Line 761 | Line 824 | public class Vector<E>
824		* Removes the first occurrence of the specified element in this Vector
825		* If the Vector does not contain the element, it is unchanged.  More
826		* formally, removes the element with the lowest index i such that
827	<	* {@code (o==null ? get(i)==null : o.equals(get(i)))} (if such
827	>	* {@code Objects.equals(o, get(i))} (if such
828		* an element exists).
829		*
830		* @param o element to be removed from this Vector, if present
#	Line 792 | Line 855 | public class Vector<E>
855		* Shifts any subsequent elements to the left (subtracts one from their
856		* indices).  Returns the element that was removed from the Vector.
857		*
795	–	* @throws ArrayIndexOutOfBoundsException if the index is out of range
796	–	*         ({@code index < 0 || index >= size()})
858		* @param index the index of the element to be removed
859		* @return element that was removed
860	+	* @throws ArrayIndexOutOfBoundsException if the index is out of range
861	+	*         ({@code index < 0 || index >= size()})
862		* @since 1.2
863		*/
864		public synchronized E remove(int index) {
#	Line 852 | Line 915 | public class Vector<E>
915		* @throws NullPointerException if the specified collection is null
916		* @since 1.2
917		*/
918	<	public synchronized boolean addAll(Collection<? extends E> c) {
856	<	modCount++;
918	>	public boolean addAll(Collection<? extends E> c) {
919		Object[] a = c.toArray();
920	+	modCount++;
921		int numNew = a.length;
922	<	ensureCapacityHelper(elementCount + numNew);
923	<	System.arraycopy(a, 0, elementData, elementCount, numNew);
924	<	elementCount += numNew;
925	<	return numNew != 0;
922	>	if (numNew == 0)
923	>	return false;
924	>	synchronized (this) {
925	>	Object[] elementData = this.elementData;
926	>	final int s = elementCount;
927	>	if (numNew > elementData.length - s)
928	>	elementData = grow(s + numNew);
929	>	System.arraycopy(a, 0, elementData, s, numNew);
930	>	elementCount = s + numNew;
931	>	return true;
932	>	}
933		}
934
935		/**
#	Line 870 | Line 940 | public class Vector<E>
940		* @return true if this Vector changed as a result of the call
941		* @throws ClassCastException if the types of one or more elements
942		*         in this vector are incompatible with the specified
943	<	*         collection (optional)
943	>	*         collection
944	>	* (<a href="Collection.html#optional-restrictions">optional</a>)
945		* @throws NullPointerException if this vector contains one or more null
946		*         elements and the specified collection does not support null
947	<	*         elements (optional), or if the specified collection is null
947	>	*         elements
948	>	* (<a href="Collection.html#optional-restrictions">optional</a>),
949	>	*         or if the specified collection is null
950		* @since 1.2
951		*/
952	<	public synchronized boolean removeAll(Collection<?> c) {
953	<	return super.removeAll(c);
952	>	public boolean removeAll(Collection<?> c) {
953	>	Objects.requireNonNull(c);
954	>	return bulkRemove(e -> c.contains(e));
955		}
956
957		/**
#	Line 890 | Line 964 | public class Vector<E>
964		* @return true if this Vector changed as a result of the call
965		* @throws ClassCastException if the types of one or more elements
966		*         in this vector are incompatible with the specified
967	<	*         collection (optional)
967	>	*         collection
968	>	* (<a href="Collection.html#optional-restrictions">optional</a>)
969		* @throws NullPointerException if this vector contains one or more null
970		*         elements and the specified collection does not support null
971	<	*         elements (optional), or if the specified collection is null
971	>	*         elements
972	>	*         (<a href="Collection.html#optional-restrictions">optional</a>),
973	>	*         or if the specified collection is null
974		* @since 1.2
975		*/
976	<	public synchronized boolean retainAll(Collection<?> c)  {
977	<	return super.retainAll(c);
976	>	public boolean retainAll(Collection<?> c) {
977	>	Objects.requireNonNull(c);
978	>	return bulkRemove(e -> !c.contains(e));
979	>	}
980	>
981	>	@Override
982	>	public boolean removeIf(Predicate<? super E> filter) {
983	>	Objects.requireNonNull(filter);
984	>	return bulkRemove(filter);
985	>	}
986	>
987	>	@SuppressWarnings("unchecked")
988	>	private synchronized boolean bulkRemove(Predicate<? super E> filter) {
989	>	int expectedModCount = modCount;
990	>	final Object[] es = elementData;
991	>	final int size = elementCount;
992	>	final boolean modified;
993	>	int r;
994	>	// Optimize for initial run of survivors
995	>	for (r = 0; r < size && !filter.test((E) es[r]); r++)
996	>	;
997	>	if (modified = (r < size)) {
998	>	expectedModCount++;
999	>	modCount++;
1000	>	int w = r++;
1001	>	try {
1002	>	for (E e; r < size; r++)
1003	>	if (!filter.test(e = (E) es[r]))
1004	>	es[w++] = e;
1005	>	} catch (Throwable ex) {
1006	>	// copy remaining elements
1007	>	System.arraycopy(es, r, es, w, size - r);
1008	>	w += size - r;
1009	>	throw ex;
1010	>	} finally {
1011	>	Arrays.fill(es, elementCount = w, size, null);
1012	>	}
1013	>	}
1014	>	if (modCount != expectedModCount)
1015	>	throw new ConcurrentModificationException();
1016	>	return modified;
1017		}
1018
1019		/**
#	Line 918 | Line 1034 | public class Vector<E>
1034		* @since 1.2
1035		*/
1036		public synchronized boolean addAll(int index, Collection<? extends E> c) {
921	–	modCount++;
1037		if (index < 0 || index > elementCount)
1038		throw new ArrayIndexOutOfBoundsException(index);
1039
1040		Object[] a = c.toArray();
1041	+	modCount++;
1042		int numNew = a.length;
1043	<	ensureCapacityHelper(elementCount + numNew);
1043	>	if (numNew == 0)
1044	>	return false;
1045	>	Object[] elementData = this.elementData;
1046	>	final int s = elementCount;
1047	>	if (numNew > elementData.length - s)
1048	>	elementData = grow(s + numNew);
1049
1050	<	int numMoved = elementCount - index;
1050	>	int numMoved = s - index;
1051		if (numMoved > 0)
1052	<	System.arraycopy(elementData, index, elementData, index + numNew,
1052	>	System.arraycopy(elementData, index,
1053	>	elementData, index + numNew,
1054		numMoved);
933	–
1055		System.arraycopy(a, 0, elementData, index, numNew);
1056	<	elementCount += numNew;
1057	<	return numNew != 0;
1056	>	elementCount = s + numNew;
1057	>	return true;
1058		}
1059
1060		/**
#	Line 941 | Line 1062 | public class Vector<E>
1062		* true if and only if the specified Object is also a List, both Lists
1063		* have the same size, and all corresponding pairs of elements in the two
1064		* Lists are <em>equal</em>.  (Two elements {@code e1} and
1065	<	* {@code e2} are <em>equal</em> if {@code (e1==null ? e2==null :
1066	<	* e1.equals(e2))}.)  In other words, two Lists are defined to be
1065	>	* {@code e2} are <em>equal</em> if {@code Objects.equals(e1, e2)}.)
1066	>	* In other words, two Lists are defined to be
1067		* equal if they contain the same elements in the same order.
1068		*
1069		* @param o the Object to be compared for equality with this Vector
#	Line 1014 | Line 1135 | public class Vector<E>
1135		* (If {@code toIndex==fromIndex}, this operation has no effect.)
1136		*/
1137		protected synchronized void removeRange(int fromIndex, int toIndex) {
1017	–	modCount++;
1138		int numMoved = elementCount - toIndex;
1139		System.arraycopy(elementData, toIndex, elementData, fromIndex,
1140		numMoved);
1141
1142		// Let gc do its work
1143	+	modCount++;
1144		int newElementCount = elementCount - (toIndex-fromIndex);
1145		while (elementCount != newElementCount)
1146		elementData[--elementCount] = null;
#	Line 1027 | Line 1148 | public class Vector<E>
1148
1149		/**
1150		* Save the state of the {@code Vector} instance to a stream (that
1151	<	* is, serialize it).  This method is present merely for synchronization.
1152	<	* It just calls the default writeObject method.
1153	<	*/
1154	<	private synchronized void writeObject(java.io.ObjectOutputStream s)
1155	<	throws java.io.IOException
1156	<	{
1157	<	s.defaultWriteObject();
1151	>	* is, serialize it).
1152	>	* This method performs synchronization to ensure the consistency
1153	>	* of the serialized data.
1154	>	*/
1155	>	private void writeObject(java.io.ObjectOutputStream s)
1156	>	throws java.io.IOException {
1157	>	final java.io.ObjectOutputStream.PutField fields = s.putFields();
1158	>	final Object[] data;
1159	>	synchronized (this) {
1160	>	fields.put("capacityIncrement", capacityIncrement);
1161	>	fields.put("elementCount", elementCount);
1162	>	data = elementData.clone();
1163	>	}
1164	>	fields.put("elementData", data);
1165	>	s.writeFields();
1166		}
1167
1168		/**
#	Line 1114 | Line 1243 | public class Vector<E>
1243		lastRet = -1;
1244		}
1245
1246	+	@Override
1247	+	public void forEachRemaining(Consumer<? super E> action) {
1248	+	Objects.requireNonNull(action);
1249	+	synchronized (Vector.this) {
1250	+	final int size = elementCount;
1251	+	int i = cursor;
1252	+	if (i >= size) {
1253	+	return;
1254	+	}
1255	+	@SuppressWarnings("unchecked")
1256	+	final E[] elementData = (E[]) Vector.this.elementData;
1257	+	if (i >= elementData.length) {
1258	+	throw new ConcurrentModificationException();
1259	+	}
1260	+	while (i != size && modCount == expectedModCount) {
1261	+	action.accept(elementData[i++]);
1262	+	}
1263	+	// update once at end of iteration to reduce heap write traffic
1264	+	cursor = i;
1265	+	lastRet = i - 1;
1266	+	checkForComodification();
1267	+	}
1268	+	}
1269	+
1270		final void checkForComodification() {
1271		if (modCount != expectedModCount)
1272		throw new ConcurrentModificationException();
#	Line 1172 | Line 1325 | public class Vector<E>
1325		lastRet = -1;
1326		}
1327		}
1328	+
1329	+	@Override
1330	+	public synchronized void forEach(Consumer<? super E> action) {
1331	+	Objects.requireNonNull(action);
1332	+	final int expectedModCount = modCount;
1333	+	@SuppressWarnings("unchecked")
1334	+	final E[] elementData = (E[]) this.elementData;
1335	+	final int elementCount = this.elementCount;
1336	+	for (int i=0; modCount == expectedModCount && i < elementCount; i++) {
1337	+	action.accept(elementData[i]);
1338	+	}
1339	+	if (modCount != expectedModCount) {
1340	+	throw new ConcurrentModificationException();
1341	+	}
1342	+	}
1343	+
1344	+	@Override
1345	+	@SuppressWarnings("unchecked")
1346	+	public synchronized void replaceAll(UnaryOperator<E> operator) {
1347	+	Objects.requireNonNull(operator);
1348	+	final int expectedModCount = modCount;
1349	+	final int size = elementCount;
1350	+	for (int i=0; modCount == expectedModCount && i < size; i++) {
1351	+	elementData[i] = operator.apply((E) elementData[i]);
1352	+	}
1353	+	if (modCount != expectedModCount) {
1354	+	throw new ConcurrentModificationException();
1355	+	}
1356	+	modCount++;
1357	+	}
1358	+
1359	+	@SuppressWarnings("unchecked")
1360	+	@Override
1361	+	public synchronized void sort(Comparator<? super E> c) {
1362	+	final int expectedModCount = modCount;
1363	+	Arrays.sort((E[]) elementData, 0, elementCount, c);
1364	+	if (modCount != expectedModCount) {
1365	+	throw new ConcurrentModificationException();
1366	+	}
1367	+	modCount++;
1368	+	}
1369	+
1370	+	/**
1371	+	* Creates a <em><a href="Spliterator.html#binding">late-binding</a></em>
1372	+	* and <em>fail-fast</em> {@link Spliterator} over the elements in this
1373	+	* list.
1374	+	*
1375	+	* <p>The {@code Spliterator} reports {@link Spliterator#SIZED},
1376	+	* {@link Spliterator#SUBSIZED}, and {@link Spliterator#ORDERED}.
1377	+	* Overriding implementations should document the reporting of additional
1378	+	* characteristic values.
1379	+	*
1380	+	* @return a {@code Spliterator} over the elements in this list
1381	+	* @since 1.8
1382	+	*/
1383	+	@Override
1384	+	public Spliterator<E> spliterator() {
1385	+	return new VectorSpliterator<>(this, null, 0, -1, 0);
1386	+	}
1387	+
1388	+	/** Similar to ArrayList Spliterator */
1389	+	static final class VectorSpliterator<E> implements Spliterator<E> {
1390	+	private final Vector<E> list;
1391	+	private Object[] array;
1392	+	private int index; // current index, modified on advance/split
1393	+	private int fence; // -1 until used; then one past last index
1394	+	private int expectedModCount; // initialized when fence set
1395	+
1396	+	/** Create new spliterator covering the given  range */
1397	+	VectorSpliterator(Vector<E> list, Object[] array, int origin, int fence,
1398	+	int expectedModCount) {
1399	+	this.list = list;
1400	+	this.array = array;
1401	+	this.index = origin;
1402	+	this.fence = fence;
1403	+	this.expectedModCount = expectedModCount;
1404	+	}
1405	+
1406	+	private int getFence() { // initialize on first use
1407	+	int hi;
1408	+	if ((hi = fence) < 0) {
1409	+	synchronized (list) {
1410	+	array = list.elementData;
1411	+	expectedModCount = list.modCount;
1412	+	hi = fence = list.elementCount;
1413	+	}
1414	+	}
1415	+	return hi;
1416	+	}
1417	+
1418	+	public Spliterator<E> trySplit() {
1419	+	int hi = getFence(), lo = index, mid = (lo + hi) >>> 1;
1420	+	return (lo >= mid) ? null :
1421	+	new VectorSpliterator<>(list, array, lo, index = mid,
1422	+	expectedModCount);
1423	+	}
1424	+
1425	+	@SuppressWarnings("unchecked")
1426	+	public boolean tryAdvance(Consumer<? super E> action) {
1427	+	int i;
1428	+	if (action == null)
1429	+	throw new NullPointerException();
1430	+	if (getFence() > (i = index)) {
1431	+	index = i + 1;
1432	+	action.accept((E)array[i]);
1433	+	if (list.modCount != expectedModCount)
1434	+	throw new ConcurrentModificationException();
1435	+	return true;
1436	+	}
1437	+	return false;
1438	+	}
1439	+
1440	+	@SuppressWarnings("unchecked")
1441	+	public void forEachRemaining(Consumer<? super E> action) {
1442	+	int i, hi; // hoist accesses and checks from loop
1443	+	Vector<E> lst; Object[] a;
1444	+	if (action == null)
1445	+	throw new NullPointerException();
1446	+	if ((lst = list) != null) {
1447	+	if ((hi = fence) < 0) {
1448	+	synchronized (lst) {
1449	+	expectedModCount = lst.modCount;
1450	+	a = array = lst.elementData;
1451	+	hi = fence = lst.elementCount;
1452	+	}
1453	+	}
1454	+	else
1455	+	a = array;
1456	+	if (a != null && (i = index) >= 0 && (index = hi) <= a.length) {
1457	+	while (i < hi)
1458	+	action.accept((E) a[i++]);
1459	+	if (lst.modCount == expectedModCount)
1460	+	return;
1461	+	}
1462	+	}
1463	+	throw new ConcurrentModificationException();
1464	+	}
1465	+
1466	+	public long estimateSize() {
1467	+	return getFence() - index;
1468	+	}
1469	+
1470	+	public int characteristics() {
1471	+	return Spliterator.ORDERED | Spliterator.SIZED | Spliterator.SUBSIZED;
1472	+	}
1473	+	}
1474		}

Diff Legend

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