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.44 by jsr166, Sat Dec 24 19:32:07 2016 UTC vs.
Revision 1.58 by jsr166, Fri Jul 24 20:57:26 2020 UTC

#	Line 1 | Line 1
1		/*
2	<	* Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
2	>	* Copyright (c) 1994, 2019, 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 25 | Line 25
25
26		package java.util;
27
28	+	import java.io.IOException;
29	+	import java.io.ObjectInputStream;
30	+	import java.io.StreamCorruptedException;
31		import java.util.function.Consumer;
32		import java.util.function.Predicate;
33		import java.util.function.UnaryOperator;
34
35	+	import jdk.internal.util.ArraysSupport;
36	+
37		/**
38		* The {@code Vector} class implements a growable array of
39		* objects. Like an array, it contains components that can be
#	Line 70 | Line 75 | import java.util.function.UnaryOperator;
75		*
76		* <p>As of the Java 2 platform v1.2, this class was retrofitted to
77		* implement the {@link List} interface, making it a member of the
78	<	* <a href="{@docRoot}/../technotes/guides/collections/index.html">
78	>	* <a href="{@docRoot}/java.base/java/util/package-summary.html#CollectionsFramework">
79		* Java Collections Framework</a>.  Unlike the new collection
80		* implementations, {@code Vector} is synchronized.  If a thread-safe
81		* implementation is not needed, it is recommended to use {@link
#	Line 97 | Line 102 | public class Vector<E>
102		*
103		* @serial
104		*/
105	+	@SuppressWarnings("serial") // Conditionally serializable
106		protected Object[] elementData;
107
108		/**
#	Line 119 | Line 125 | public class Vector<E>
125		protected int capacityIncrement;
126
127		/** use serialVersionUID from JDK 1.0.2 for interoperability */
128	+	// OPENJDK @java.io.Serial
129		private static final long serialVersionUID = -2767605614048989439L;
130
131		/**
#	Line 172 | Line 179 | public class Vector<E>
179		* @since   1.2
180		*/
181		public Vector(Collection<? extends E> c) {
182	<	elementData = c.toArray();
183	<	elementCount = elementData.length;
184	<	// defend against c.toArray (incorrectly) not returning Object[]
185	<	// (see e.g. https://bugs.openjdk.java.net/browse/JDK-6260652)
186	<	if (elementData.getClass() != Object[].class)
187	<	elementData = Arrays.copyOf(elementData, elementCount, Object[].class);
182	>	Object[] a = c.toArray();
183	>	elementCount = a.length;
184	>	if (c.getClass() == ArrayList.class) {
185	>	elementData = a;
186	>	} else {
187	>	elementData = Arrays.copyOf(a, elementCount, Object[].class);
188	>	}
189		}
190
191		/**
#	Line 239 | Line 247 | public class Vector<E>
247		}
248
249		/**
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		*
#	Line 254 | Line 254 | public class Vector<E>
254		* @throws OutOfMemoryError if minCapacity is less than zero
255		*/
256		private Object[] grow(int minCapacity) {
257	<	return elementData = Arrays.copyOf(elementData,
258	<	newCapacity(minCapacity));
257	>	int oldCapacity = elementData.length;
258	>	int newCapacity = ArraysSupport.newLength(oldCapacity,
259	>	minCapacity - oldCapacity, /* minimum growth */
260	>	capacityIncrement > 0 ? capacityIncrement : oldCapacity
261	>	/* preferred growth */);
262	>	return elementData = Arrays.copyOf(elementData, newCapacity);
263		}
264
265		private Object[] grow() {
#	Line 263 | Line 267 | public class Vector<E>
267		}
268
269		/**
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	–	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	–	/**
270		* Sets the size of this vector. If the new size is greater than the
271		* current size, new {@code null} items are added to the end of
272		* the vector. If the new size is less than the current size, all
#	Line 307 | Line 280 | public class Vector<E>
280		if (newSize > elementData.length)
281		grow(newSize);
282		final Object[] es = elementData;
283	<	for (int to = elementCount, i = elementCount = newSize; i < to; i++)
283	>	for (int to = elementCount, i = newSize; i < to; i++)
284		es[i] = null;
285	+	elementCount = newSize;
286		}
287
288		/**
#	Line 1026 | Line 1000 | public class Vector<E>
1000		setBit(deathRow, i - beg);
1001		if (modCount != expectedModCount)
1002		throw new ConcurrentModificationException();
1029	–	expectedModCount++;
1003		modCount++;
1004		int w = beg;
1005		for (i = beg; i < end; i++)
#	Line 1177 | Line 1150 | public class Vector<E>
1150		}
1151
1152		/**
1153	+	* Loads a {@code Vector} instance from a stream
1154	+	* (that is, deserializes it).
1155	+	* This method performs checks to ensure the consistency
1156	+	* of the fields.
1157	+	*
1158	+	* @param in the stream
1159	+	* @throws java.io.IOException if an I/O error occurs
1160	+	* @throws ClassNotFoundException if the stream contains data
1161	+	*         of a non-existing class
1162	+	*/
1163	+	// OPENJDK @java.io.Serial
1164	+	private void readObject(ObjectInputStream in)
1165	+	throws IOException, ClassNotFoundException {
1166	+	ObjectInputStream.GetField gfields = in.readFields();
1167	+	int count = gfields.get("elementCount", 0);
1168	+	Object[] data = (Object[])gfields.get("elementData", null);
1169	+	if (count < 0 || data == null || count > data.length) {
1170	+	throw new StreamCorruptedException("Inconsistent vector internals");
1171	+	}
1172	+	elementCount = count;
1173	+	elementData = data.clone();
1174	+	}
1175	+
1176	+	/**
1177		* Saves the state of the {@code Vector} instance to a stream
1178		* (that is, serializes it).
1179		* This method performs synchronization to ensure the consistency
#	Line 1185 | Line 1182 | public class Vector<E>
1182		* @param s the stream
1183		* @throws java.io.IOException if an I/O error occurs
1184		*/
1185	+	// OPENJDK @java.io.Serial
1186		private void writeObject(java.io.ObjectOutputStream s)
1187		throws java.io.IOException {
1188		final java.io.ObjectOutputStream.PutField fields = s.putFields();
#	Line 1385 | Line 1383 | public class Vector<E>
1383		es[i] = operator.apply(elementAt(es, i));
1384		if (modCount != expectedModCount)
1385		throw new ConcurrentModificationException();
1386	+	// TODO(8203662): remove increment of modCount from ...
1387		modCount++;
1388		// checkInvariants();
1389		}

Diff Legend

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