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.50 by jsr166, Sat May 5 18:29:53 2018 UTC vs.
Revision 1.56 by jsr166, Fri Aug 30 18:05:39 2019 UTC

#	Line 1 | Line 1
1		/*
2	<	* Copyright (c) 1994, 2018, 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 32 | Line 32 | 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 73 | 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}/java/util/package-summary.html#CollectionsFramework">
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 122 | Line 124 | public class Vector<E>
124		protected int capacityIncrement;
125
126		/** use serialVersionUID from JDK 1.0.2 for interoperability */
127	+	// OPENJDK @java.io.Serial
128		private static final long serialVersionUID = -2767605614048989439L;
129
130		/**
#	Line 242 | Line 245 | public class Vector<E>
245		}
246
247		/**
245	–	* The maximum size of array to allocate (unless necessary).
246	–	* Some VMs reserve some header words in an array.
247	–	* Attempts to allocate larger arrays may result in
248	–	* OutOfMemoryError: Requested array size exceeds VM limit
249	–	*/
250	–	private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
251	–
252	–	/**
248		* Increases the capacity to ensure that it can hold at least the
249		* number of elements specified by the minimum capacity argument.
250		*
#	Line 257 | Line 252 | public class Vector<E>
252		* @throws OutOfMemoryError if minCapacity is less than zero
253		*/
254		private Object[] grow(int minCapacity) {
255	<	return elementData = Arrays.copyOf(elementData,
256	<	newCapacity(minCapacity));
255	>	int oldCapacity = elementData.length;
256	>	int newCapacity = ArraysSupport.newLength(oldCapacity,
257	>	minCapacity - oldCapacity, /* minimum growth */
258	>	capacityIncrement > 0 ? capacityIncrement : oldCapacity
259	>	/* preferred growth */);
260	>	return elementData = Arrays.copyOf(elementData, newCapacity);
261		}
262
263		private Object[] grow() {
#	Line 266 | Line 265 | public class Vector<E>
265		}
266
267		/**
269	–	* Returns a capacity at least as large as the given minimum capacity.
270	–	* Will not return a capacity greater than MAX_ARRAY_SIZE unless
271	–	* the given minimum capacity is greater than MAX_ARRAY_SIZE.
272	–	*
273	–	* @param minCapacity the desired minimum capacity
274	–	* @throws OutOfMemoryError if minCapacity is less than zero
275	–	*/
276	–	private int newCapacity(int minCapacity) {
277	–	// overflow-conscious code
278	–	int oldCapacity = elementData.length;
279	–	int newCapacity = oldCapacity + ((capacityIncrement > 0) ?
280	–	capacityIncrement : oldCapacity);
281	–	if (newCapacity - minCapacity <= 0) {
282	–	if (minCapacity < 0) // overflow
283	–	throw new OutOfMemoryError();
284	–	return minCapacity;
285	–	}
286	–	return (newCapacity - MAX_ARRAY_SIZE <= 0)
287	–	? newCapacity
288	–	: hugeCapacity(minCapacity);
289	–	}
290	–
291	–	private static int hugeCapacity(int minCapacity) {
292	–	if (minCapacity < 0) // overflow
293	–	throw new OutOfMemoryError();
294	–	return (minCapacity > MAX_ARRAY_SIZE) ?
295	–	Integer.MAX_VALUE :
296	–	MAX_ARRAY_SIZE;
297	–	}
298	–
299	–	/**
268		* Sets the size of this vector. If the new size is greater than the
269		* current size, new {@code null} items are added to the end of
270		* the vector. If the new size is less than the current size, all
#	Line 1190 | Line 1158 | public class Vector<E>
1158		* @throws ClassNotFoundException if the stream contains data
1159		*         of a non-existing class
1160		*/
1161	+	// OPENJDK @java.io.Serial
1162		private void readObject(ObjectInputStream in)
1163		throws IOException, ClassNotFoundException {
1164		ObjectInputStream.GetField gfields = in.readFields();
#	Line 1211 | Line 1180 | public class Vector<E>
1180		* @param s the stream
1181		* @throws java.io.IOException if an I/O error occurs
1182		*/
1183	+	// OPENJDK @java.io.Serial
1184		private void writeObject(java.io.ObjectOutputStream s)
1185		throws java.io.IOException {
1186		final java.io.ObjectOutputStream.PutField fields = s.putFields();
#	Line 1411 | Line 1381 | public class Vector<E>
1381		es[i] = operator.apply(elementAt(es, i));
1382		if (modCount != expectedModCount)
1383		throw new ConcurrentModificationException();
1384	+	// TODO(8203662): remove increment of modCount from ...
1385	+	modCount++;
1386		// checkInvariants();
1387		}
1388

Diff Legend

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