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 |
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 |
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 |
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 |
|
/** |
245 |
|
} |
246 |
|
|
247 |
|
/** |
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 |
– |
/** |
248 |
|
* Increases the capacity to ensure that it can hold at least the |
249 |
|
* number of elements specified by the minimum capacity argument. |
250 |
|
* |
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() { |
265 |
|
} |
266 |
|
|
267 |
|
/** |
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 |
– |
/** |
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 |
277 |
|
modCount++; |
278 |
|
if (newSize > elementData.length) |
279 |
|
grow(newSize); |
280 |
< |
for (int i = newSize; i < elementCount; i++) |
281 |
< |
elementData[i] = null; |
280 |
> |
final Object[] es = elementData; |
281 |
> |
for (int to = elementCount, i = newSize; i < to; i++) |
282 |
> |
es[i] = null; |
283 |
|
elementCount = newSize; |
284 |
|
} |
285 |
|
|
648 |
|
* method (which is part of the {@link List} interface). |
649 |
|
*/ |
650 |
|
public synchronized void removeAllElements() { |
651 |
< |
Arrays.fill(elementData, 0, elementCount, null); |
651 |
> |
final Object[] es = elementData; |
652 |
> |
for (int to = elementCount, i = elementCount = 0; i < to; i++) |
653 |
> |
es[i] = null; |
654 |
|
modCount++; |
681 |
– |
elementCount = 0; |
655 |
|
} |
656 |
|
|
657 |
|
/** |
957 |
|
return bulkRemove(e -> !c.contains(e)); |
958 |
|
} |
959 |
|
|
960 |
+ |
/** |
961 |
+ |
* @throws NullPointerException {@inheritDoc} |
962 |
+ |
*/ |
963 |
|
@Override |
964 |
|
public boolean removeIf(Predicate<? super E> filter) { |
965 |
|
Objects.requireNonNull(filter); |
998 |
|
setBit(deathRow, i - beg); |
999 |
|
if (modCount != expectedModCount) |
1000 |
|
throw new ConcurrentModificationException(); |
1025 |
– |
expectedModCount++; |
1001 |
|
modCount++; |
1002 |
|
int w = beg; |
1003 |
|
for (i = beg; i < end; i++) |
1004 |
|
if (isClear(deathRow, i - beg)) |
1005 |
|
es[w++] = es[i]; |
1006 |
< |
Arrays.fill(es, elementCount = w, end, null); |
1006 |
> |
for (i = elementCount = w; i < end; i++) |
1007 |
> |
es[i] = null; |
1008 |
|
// checkInvariants(); |
1009 |
|
return true; |
1010 |
|
} else { |
1135 |
|
* (If {@code toIndex==fromIndex}, this operation has no effect.) |
1136 |
|
*/ |
1137 |
|
protected synchronized void removeRange(int fromIndex, int toIndex) { |
1162 |
– |
final Object[] es = elementData; |
1163 |
– |
final int oldSize = elementCount; |
1164 |
– |
System.arraycopy(es, toIndex, es, fromIndex, oldSize - toIndex); |
1165 |
– |
|
1138 |
|
modCount++; |
1139 |
< |
Arrays.fill(es, elementCount -= (toIndex - fromIndex), oldSize, null); |
1139 |
> |
shiftTailOverGap(elementData, fromIndex, toIndex); |
1140 |
|
// checkInvariants(); |
1141 |
|
} |
1142 |
|
|
1143 |
+ |
/** Erases the gap from lo to hi, by sliding down following elements. */ |
1144 |
+ |
private void shiftTailOverGap(Object[] es, int lo, int hi) { |
1145 |
+ |
System.arraycopy(es, hi, es, lo, elementCount - hi); |
1146 |
+ |
for (int to = elementCount, i = (elementCount -= hi - lo); i < to; i++) |
1147 |
+ |
es[i] = null; |
1148 |
+ |
} |
1149 |
+ |
|
1150 |
+ |
/** |
1151 |
+ |
* Loads a {@code Vector} instance from a stream |
1152 |
+ |
* (that is, deserializes it). |
1153 |
+ |
* This method performs checks to ensure the consistency |
1154 |
+ |
* of the fields. |
1155 |
+ |
* |
1156 |
+ |
* @param in the stream |
1157 |
+ |
* @throws java.io.IOException if an I/O error occurs |
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(); |
1165 |
+ |
int count = gfields.get("elementCount", 0); |
1166 |
+ |
Object[] data = (Object[])gfields.get("elementData", null); |
1167 |
+ |
if (count < 0 || data == null || count > data.length) { |
1168 |
+ |
throw new StreamCorruptedException("Inconsistent vector internals"); |
1169 |
+ |
} |
1170 |
+ |
elementCount = count; |
1171 |
+ |
elementData = data.clone(); |
1172 |
+ |
} |
1173 |
+ |
|
1174 |
|
/** |
1175 |
|
* Saves the state of the {@code Vector} instance to a stream |
1176 |
|
* (that is, serializes it). |
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(); |
1352 |
|
} |
1353 |
|
} |
1354 |
|
|
1355 |
+ |
/** |
1356 |
+ |
* @throws NullPointerException {@inheritDoc} |
1357 |
+ |
*/ |
1358 |
|
@Override |
1359 |
|
public synchronized void forEach(Consumer<? super E> action) { |
1360 |
|
Objects.requireNonNull(action); |
1368 |
|
// checkInvariants(); |
1369 |
|
} |
1370 |
|
|
1371 |
+ |
/** |
1372 |
+ |
* @throws NullPointerException {@inheritDoc} |
1373 |
+ |
*/ |
1374 |
|
@Override |
1375 |
|
public synchronized void replaceAll(UnaryOperator<E> operator) { |
1376 |
|
Objects.requireNonNull(operator); |
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 |
|
} |
1422 |
|
private int fence; // -1 until used; then one past last index |
1423 |
|
private int expectedModCount; // initialized when fence set |
1424 |
|
|
1425 |
< |
/** Create new spliterator covering the given range */ |
1425 |
> |
/** Creates new spliterator covering the given range. */ |
1426 |
|
VectorSpliterator(Object[] array, int origin, int fence, |
1427 |
|
int expectedModCount) { |
1428 |
|
this.array = array; |
1451 |
|
|
1452 |
|
@SuppressWarnings("unchecked") |
1453 |
|
public boolean tryAdvance(Consumer<? super E> action) { |
1454 |
+ |
Objects.requireNonNull(action); |
1455 |
|
int i; |
1444 |
– |
if (action == null) |
1445 |
– |
throw new NullPointerException(); |
1456 |
|
if (getFence() > (i = index)) { |
1457 |
|
index = i + 1; |
1458 |
|
action.accept((E)array[i]); |
1465 |
|
|
1466 |
|
@SuppressWarnings("unchecked") |
1467 |
|
public void forEachRemaining(Consumer<? super E> action) { |
1468 |
< |
if (action == null) |
1459 |
< |
throw new NullPointerException(); |
1468 |
> |
Objects.requireNonNull(action); |
1469 |
|
final int hi = getFence(); |
1470 |
|
final Object[] a = array; |
1471 |
|
int i; |