ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/main/java/util/Vector.java
(Generate patch)

Comparing jsr166/src/main/java/util/Vector.java (file contents):
Revision 1.11 by jsr166, Thu Apr 20 21:49:36 2006 UTC vs.
Revision 1.31 by jsr166, Fri Nov 4 02:56:17 2016 UTC

# Line 1 | Line 1
1   /*
2 < * @(#)Vector.java      1.103 05/12/06
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 < * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
6 < * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
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.  Oracle designates this
8 > * particular file as subject to the "Classpath" exception as provided
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
13 > * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
14 > * version 2 for more details (a copy is included in the LICENSE file that
15 > * accompanied this code).
16 > *
17 > * You should have received a copy of the GNU General Public License version
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 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</code> class implements a growable array of
33 > * The {@code Vector} class implements a growable array of
34   * objects. Like an array, it contains components that can be
35   * accessed using an integer index. However, the size of a
36 < * <code>Vector</code> can grow or shrink as needed to accommodate
37 < * adding and removing items after the <code>Vector</code> has been created.
36 > * {@code Vector} can grow or shrink as needed to accommodate
37 > * adding and removing items after the {@code Vector} has been created.
38   *
39   * <p>Each vector tries to optimize storage management by maintaining a
40 < * <code>capacity</code> and a <code>capacityIncrement</code>. The
41 < * <code>capacity</code> is always at least as large as the vector
40 > * {@code capacity} and a {@code capacityIncrement}. The
41 > * {@code capacity} is always at least as large as the vector
42   * size; it is usually larger because as components are added to the
43   * vector, the vector's storage increases in chunks the size of
44 < * <code>capacityIncrement</code>. An application can increase the
44 > * {@code capacityIncrement}. An application can increase the
45   * capacity of a vector before inserting a large number of
46   * components; this reduces the amount of incremental reallocation.
47   *
48 < * <p>The Iterators returned by Vector's iterator and listIterator
49 < * methods are <em>fail-fast</em>: if the Vector is structurally modified
50 < * at any time after the Iterator is created, in any way except through the
51 < * Iterator's own remove or add methods, the Iterator will throw a
52 < * ConcurrentModificationException.  Thus, in the face of concurrent
53 < * modification, the Iterator fails quickly and cleanly, rather than risking
54 < * arbitrary, non-deterministic behavior at an undetermined time in the future.
55 < * The Enumerations returned by Vector's elements method are <em>not</em>
56 < * 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
52 > * created, in any way except through the iterator's own
53 > * {@link ListIterator#remove() remove} or
54 > * {@link ListIterator#add(Object) add} methods, the iterator will throw a
55 > * {@link ConcurrentModificationException}.  Thus, in the face of
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; 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
65   * presence of unsynchronized concurrent modification.  Fail-fast iterators
66 < * throw <tt>ConcurrentModificationException</tt> on a best-effort basis.
66 > * throw {@code ConcurrentModificationException} on a best-effort basis.
67   * Therefore, it would be wrong to write a program that depended on this
68   * exception for its correctness:  <i>the fail-fast behavior of iterators
69   * should be used only to detect bugs.</i>
70   *
71   * <p>As of the Java 2 platform v1.2, this class was retrofitted to
72   * implement the {@link List} interface, making it a member of the
73 < * <a href="{@docRoot}/../guide/collections/index.html"> Java
74 < * Collections Framework</a>.  Unlike the new collection
75 < * implementations, {@code Vector} is synchronized.
73 > * <a href="{@docRoot}/../technotes/guides/collections/index.html">
74 > * Java Collections Framework</a>.  Unlike the new collection
75 > * implementations, {@code Vector} is synchronized.  If a thread-safe
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
52 * @version 1.103, 12/06/05
83   * @see Collection
54 * @see List
55 * @see ArrayList
84   * @see LinkedList
85 < * @since   JDK1.0
85 > * @since   1.0
86   */
87   public class Vector<E>
88      extends AbstractList<E>
# Line 63 | Line 91 | public class Vector<E>
91      /**
92       * The array buffer into which the components of the vector are
93       * stored. The capacity of the vector is the length of this array buffer,
94 <     * and is at least large enough to contain all the vector's elements.<p>
94 >     * and is at least large enough to contain all the vector's elements.
95       *
96 <     * Any array elements following the last element in the Vector are null.
96 >     * <p>Any array elements following the last element in the Vector are null.
97       *
98       * @serial
99       */
100      protected Object[] elementData;
101  
102      /**
103 <     * The number of valid components in this <tt>Vector</tt> object.
104 <     * Components <tt>elementData[0]</tt> through
105 <     * <tt>elementData[elementCount-1]</tt> are the actual items.
103 >     * The number of valid components in this {@code Vector} object.
104 >     * Components {@code elementData[0]} through
105 >     * {@code elementData[elementCount-1]} are the actual items.
106       *
107       * @serial
108       */
# Line 100 | Line 128 | public class Vector<E>
128       * @param   initialCapacity     the initial capacity of the vector
129       * @param   capacityIncrement   the amount by which the capacity is
130       *                              increased when the vector overflows
131 <     * @exception IllegalArgumentException if the specified initial capacity
132 <     *               is negative
131 >     * @throws IllegalArgumentException if the specified initial capacity
132 >     *         is negative
133       */
134      public Vector(int initialCapacity, int capacityIncrement) {
135 <        super();
135 >        super();
136          if (initialCapacity < 0)
137              throw new IllegalArgumentException("Illegal Capacity: "+
138                                                 initialCapacity);
139 <        this.elementData = new Object[initialCapacity];
140 <        this.capacityIncrement = capacityIncrement;
139 >        this.elementData = new Object[initialCapacity];
140 >        this.capacityIncrement = capacityIncrement;
141      }
142  
143      /**
# Line 117 | Line 145 | public class Vector<E>
145       * with its capacity increment equal to zero.
146       *
147       * @param   initialCapacity   the initial capacity of the vector
148 <     * @exception IllegalArgumentException if the specified initial capacity
149 <     *               is negative
148 >     * @throws IllegalArgumentException if the specified initial capacity
149 >     *         is negative
150       */
151      public Vector(int initialCapacity) {
152 <        this(initialCapacity, 0);
152 >        this(initialCapacity, 0);
153      }
154  
155      /**
156       * Constructs an empty vector so that its internal data array
157 <     * has size <tt>10</tt> and its standard capacity increment is
157 >     * has size {@code 10} and its standard capacity increment is
158       * zero.
159       */
160      public Vector() {
161 <        this(10);
161 >        this(10);
162      }
163  
164      /**
# Line 144 | Line 172 | public class Vector<E>
172       * @since   1.2
173       */
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)
178 <        if (elementData.getClass() != Object[].class)
179 <            elementData = Arrays.copyOf(elementData, elementCount, Object[].class);
175 >        elementData = c.toArray();
176 >        elementCount = elementData.length;
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      }
182  
183      /**
184       * Copies the components of this vector into the specified array.
185 <     * The item at index <tt>k</tt> in this vector is copied into
186 <     * component <tt>k</tt> of <tt>anArray</tt>.
185 >     * The item at index {@code k} in this vector is copied into
186 >     * component {@code k} of {@code anArray}.
187       *
188       * @param  anArray the array into which the components get copied
189       * @throws NullPointerException if the given array is null
# Line 165 | Line 194 | public class Vector<E>
194       * @see #toArray(Object[])
195       */
196      public synchronized void copyInto(Object[] anArray) {
197 <        System.arraycopy(elementData, 0, anArray, 0, elementCount);
197 >        System.arraycopy(elementData, 0, anArray, 0, elementCount);
198      }
199  
200      /**
201       * Trims the capacity of this vector to be the vector's current
202       * size. If the capacity of this vector is larger than its current
203       * size, then the capacity is changed to equal the size by replacing
204 <     * its internal data array, kept in the field <tt>elementData</tt>,
204 >     * its internal data array, kept in the field {@code elementData},
205       * with a smaller one. An application can use this operation to
206       * minimize the storage of a vector.
207       */
208      public synchronized void trimToSize() {
209 <        modCount++;
210 <        int oldCapacity = elementData.length;
211 <        if (elementCount < oldCapacity) {
209 >        modCount++;
210 >        int oldCapacity = elementData.length;
211 >        if (elementCount < oldCapacity) {
212              elementData = Arrays.copyOf(elementData, elementCount);
213 <        }
213 >        }
214      }
215  
216      /**
# Line 190 | Line 219 | public class Vector<E>
219       * the minimum capacity argument.
220       *
221       * <p>If the current capacity of this vector is less than
222 <     * <tt>minCapacity</tt>, then its capacity is increased by replacing its
223 <     * internal data array, kept in the field <tt>elementData</tt>, with a
222 >     * {@code minCapacity}, then its capacity is increased by replacing its
223 >     * internal data array, kept in the field {@code elementData}, with a
224       * larger one.  The size of the new data array will be the old size plus
225 <     * <tt>capacityIncrement</tt>, unless the value of
226 <     * <tt>capacityIncrement</tt> is less than or equal to zero, in which case
225 >     * {@code capacityIncrement}, unless the value of
226 >     * {@code capacityIncrement} is less than or equal to zero, in which case
227       * the new capacity will be twice the old capacity; but if this new size
228 <     * is still smaller than <tt>minCapacity</tt>, then the new capacity will
229 <     * be <tt>minCapacity</tt>.
228 >     * is still smaller than {@code minCapacity}, then the new capacity will
229 >     * be {@code minCapacity}.
230       *
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 >     * 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 >     * @param minCapacity the desired minimum capacity
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));
259 >    }
260 >
261 >    private Object[] grow() {
262 >        return grow(elementCount + 1);
263      }
264  
265      /**
266 <     * This implements the unsynchronized semantics of ensureCapacity.
267 <     * Synchronized methods in this class can internally call this
268 <     * method for ensuring capacity without incurring the cost of an
269 <     * extra synchronization.
270 <     *
271 <     * @see java.util.Vector#ensureCapacity(int)
272 <     */
273 <    private void ensureCapacityHelper(int minCapacity) {
274 <        int oldCapacity = elementData.length;
275 <        if (minCapacity > oldCapacity) {
276 <            Object[] oldData = elementData;
277 <            int newCapacity = (capacityIncrement > 0) ?
278 <                (oldCapacity + capacityIncrement) : (oldCapacity * 2);
279 <            if (newCapacity < minCapacity) {
280 <                newCapacity = minCapacity;
281 <            }
282 <            elementData = Arrays.copyOf(elementData, newCapacity);
283 <        }
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      /**
297       * Sets the size of this vector. If the new size is greater than the
298 <     * current size, new <code>null</code> items are added to the end of
298 >     * current size, new {@code null} items are added to the end of
299       * the vector. If the new size is less than the current size, all
300 <     * components at index <code>newSize</code> and greater are discarded.
300 >     * components at index {@code newSize} and greater are discarded.
301       *
302 <     * @param   newSize   the new size of this vector
303 <     * @throws  ArrayIndexOutOfBoundsException if new size is negative
302 >     * @param  newSize   the new size of this vector
303 >     * @throws ArrayIndexOutOfBoundsException if the new size is negative
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++) {
311 <                elementData[i] = null;
246 <            }
247 <        }
248 <        elementCount = newSize;
306 >        modCount++;
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  
314      /**
315       * Returns the current capacity of this vector.
316       *
317       * @return  the current capacity (the length of its internal
318 <     *          data array, kept in the field <tt>elementData</tt>
318 >     *          data array, kept in the field {@code elementData}
319       *          of this vector)
320       */
321      public synchronized int capacity() {
322 <        return elementData.length;
322 >        return elementData.length;
323      }
324  
325      /**
# Line 265 | Line 328 | public class Vector<E>
328       * @return  the number of components in this vector
329       */
330      public synchronized int size() {
331 <        return elementCount;
331 >        return elementCount;
332      }
333  
334      /**
335       * Tests if this vector has no components.
336       *
337 <     * @return  <code>true</code> if and only if this vector has
337 >     * @return  {@code true} if and only if this vector has
338       *          no components, that is, its size is zero;
339 <     *          <code>false</code> otherwise.
339 >     *          {@code false} otherwise.
340       */
341      public synchronized boolean isEmpty() {
342 <        return elementCount == 0;
342 >        return elementCount == 0;
343      }
344  
345      /**
346       * Returns an enumeration of the components of this vector. The
347 <     * returned <tt>Enumeration</tt> object will generate all items in
348 <     * this vector. The first item generated is the item at index <tt>0</tt>,
349 <     * then the item at index <tt>1</tt>, and so on.
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. 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
289     * @see     Enumeration
354       * @see     Iterator
355       */
356      public Enumeration<E> elements() {
357 <        return new Enumeration<E>() {
358 <            int count = 0;
357 >        return new Enumeration<E>() {
358 >            int count = 0;
359  
360 <            public boolean hasMoreElements() {
361 <                return count < elementCount;
362 <            }
363 <
364 <            public E nextElement() {
365 <                synchronized (Vector.this) {
366 <                    if (count < elementCount) {
367 <                        return (E)elementData[count++];
368 <                    }
369 <                }
370 <                throw new NoSuchElementException("Vector Enumeration");
371 <            }
372 <        };
360 >            public boolean hasMoreElements() {
361 >                return count < elementCount;
362 >            }
363 >
364 >            public E nextElement() {
365 >                synchronized (Vector.this) {
366 >                    if (count < elementCount) {
367 >                        return elementData(count++);
368 >                    }
369 >                }
370 >                throw new NoSuchElementException("Vector Enumeration");
371 >            }
372 >        };
373      }
374  
375      /**
376 <     * Returns <tt>true</tt> if this vector contains the specified element.
377 <     * More formally, returns <tt>true</tt> if and only if this vector
378 <     * contains at least one element <tt>e</tt> such that
379 <     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>.
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 >     * {@code Objects.equals(o, e)}.
380       *
381       * @param o element whose presence in this vector is to be tested
382 <     * @return <tt>true</tt> if this vector contains the specified element
382 >     * @return {@code true} if this vector contains the specified element
383       */
384      public boolean contains(Object o) {
385 <        return indexOf(o, 0) >= 0;
385 >        return indexOf(o, 0) >= 0;
386      }
387  
388      /**
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 <tt>i</tt> such that
392 <     * <tt>(o==null&nbsp;?&nbsp;get(i)==null&nbsp;:&nbsp;o.equals(get(i)))</tt>,
391 >     * More formally, returns the lowest index {@code i} such that
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 333 | Line 397 | public class Vector<E>
397       *         this vector, or -1 if this vector does not contain the element
398       */
399      public int indexOf(Object o) {
400 <        return indexOf(o, 0);
400 >        return indexOf(o, 0);
401      }
402  
403      /**
404       * Returns the index of the first occurrence of the specified element in
405 <     * this vector, searching forwards from <tt>index</tt>, or returns -1 if
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 <tt>i</tt> 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>,
407 >     * More formally, returns the lowest index {@code i} such that
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
412       * @param index index to start searching from
413       * @return the index of the first occurrence of the element in
414 <     *         this vector at position <tt>index</tt> or later in the vector;
415 <     *         <tt>-1</tt> if the element is not found.
414 >     *         this vector at position {@code index} or later in the vector;
415 >     *         {@code -1} if the element is not found.
416       * @throws IndexOutOfBoundsException if the specified index is negative
417       * @see     Object#equals(Object)
418       */
419      public synchronized int indexOf(Object o, int index) {
420 <        if (o == null) {
421 <            for (int i = index ; i < elementCount ; i++)
422 <                if (elementData[i]==null)
423 <                    return i;
424 <        } else {
425 <            for (int i = index ; i < elementCount ; i++)
426 <                if (o.equals(elementData[i]))
427 <                    return i;
428 <        }
429 <        return -1;
420 >        if (o == null) {
421 >            for (int i = index ; i < elementCount ; i++)
422 >                if (elementData[i]==null)
423 >                    return i;
424 >        } else {
425 >            for (int i = index ; i < elementCount ; i++)
426 >                if (o.equals(elementData[i]))
427 >                    return i;
428 >        }
429 >        return -1;
430      }
431  
432      /**
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 <tt>i</tt> such that
436 <     * <tt>(o==null&nbsp;?&nbsp;get(i)==null&nbsp;:&nbsp;o.equals(get(i)))</tt>,
435 >     * More formally, returns the highest index {@code i} such that
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 377 | Line 441 | public class Vector<E>
441       *         this vector, or -1 if this vector does not contain the element
442       */
443      public synchronized int lastIndexOf(Object o) {
444 <        return lastIndexOf(o, elementCount-1);
444 >        return lastIndexOf(o, elementCount-1);
445      }
446  
447      /**
448       * Returns the index of the last occurrence of the specified element in
449 <     * this vector, searching backwards from <tt>index</tt>, or returns -1 if
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 <tt>i</tt> 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>,
451 >     * More formally, returns the highest index {@code i} such that
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
456       * @param index index to start searching backwards from
457       * @return the index of the last occurrence of the element at position
458 <     *         less than or equal to <tt>index</tt> in this vector;
458 >     *         less than or equal to {@code index} in this vector;
459       *         -1 if the element is not found.
460       * @throws IndexOutOfBoundsException if the specified index is greater
461       *         than or equal to the current size of this vector
# Line 400 | Line 464 | public class Vector<E>
464          if (index >= elementCount)
465              throw new IndexOutOfBoundsException(index + " >= "+ elementCount);
466  
467 <        if (o == null) {
468 <            for (int i = index; i >= 0; i--)
469 <                if (elementData[i]==null)
470 <                    return i;
471 <        } else {
472 <            for (int i = index; i >= 0; i--)
473 <                if (o.equals(elementData[i]))
474 <                    return i;
475 <        }
476 <        return -1;
467 >        if (o == null) {
468 >            for (int i = index; i >= 0; i--)
469 >                if (elementData[i]==null)
470 >                    return i;
471 >        } else {
472 >            for (int i = index; i >= 0; i--)
473 >                if (o.equals(elementData[i]))
474 >                    return i;
475 >        }
476 >        return -1;
477      }
478  
479      /**
480 <     * Returns the component at the specified index.<p>
480 >     * Returns the component at the specified index.
481       *
482 <     * This method is identical in functionality to the get method
483 <     * (which is part of the List interface).
482 >     * <p>This method is identical in functionality to the {@link #get(int)}
483 >     * method (which is part of the {@link List} interface).
484       *
485       * @param      index   an index into this vector
486       * @return     the component at the specified index
487 <     * @exception  ArrayIndexOutOfBoundsException  if the <tt>index</tt>
488 <     *             is negative or not less than the current size of this
425 <     *             <tt>Vector</tt> object.
426 <     * @see        #get(int)
427 <     * @see        List
487 >     * @throws ArrayIndexOutOfBoundsException if the index is out of range
488 >     *         ({@code index < 0 || index >= size()})
489       */
490      public synchronized E elementAt(int index) {
491 <        if (index >= elementCount) {
492 <            throw new ArrayIndexOutOfBoundsException(index + " >= " + elementCount);
493 <        }
491 >        if (index >= elementCount) {
492 >            throw new ArrayIndexOutOfBoundsException(index + " >= " + elementCount);
493 >        }
494  
495 <        return (E)elementData[index];
495 >        return elementData(index);
496      }
497  
498      /**
499 <     * Returns the first component (the item at index <tt>0</tt>) of
499 >     * Returns the first component (the item at index {@code 0}) of
500       * this vector.
501       *
502       * @return     the first component of this vector
503 <     * @exception  NoSuchElementException  if this vector has no components
503 >     * @throws NoSuchElementException if this vector has no components
504       */
505      public synchronized E firstElement() {
506 <        if (elementCount == 0) {
507 <            throw new NoSuchElementException();
508 <        }
509 <        return (E)elementData[0];
506 >        if (elementCount == 0) {
507 >            throw new NoSuchElementException();
508 >        }
509 >        return elementData(0);
510      }
511  
512      /**
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>.
517 <     * @exception  NoSuchElementException  if this vector is empty
516 >     *          {@code size() - 1}
517 >     * @throws NoSuchElementException if this vector is empty
518       */
519      public synchronized E lastElement() {
520 <        if (elementCount == 0) {
521 <            throw new NoSuchElementException();
522 <        }
523 <        return (E)elementData[elementCount - 1];
520 >        if (elementCount == 0) {
521 >            throw new NoSuchElementException();
522 >        }
523 >        return elementData(elementCount - 1);
524      }
525  
526      /**
527 <     * Sets the component at the specified <code>index</code> of this
527 >     * Sets the component at the specified {@code index} of this
528       * vector to be the specified object. The previous component at that
529 <     * position is discarded.<p>
529 >     * position is discarded.
530       *
531 <     * The index must be a value greater than or equal to <code>0</code>
532 <     * and less than the current size of the vector. <p>
531 >     * <p>The index must be a value greater than or equal to {@code 0}
532 >     * and less than the current size of the vector.
533       *
534 <     * This method is identical in functionality to the set method
535 <     * (which is part of the List interface). Note that the set method reverses
536 <     * the order of the parameters, to more closely match array usage.  Note
537 <     * also that the set method returns the old value that was stored at the
538 <     * specified position.
534 >     * <p>This method is identical in functionality to the
535 >     * {@link #set(int, Object) set(int, E)}
536 >     * method (which is part of the {@link List} interface). Note that the
537 >     * {@code set} method reverses the order of the parameters, to more closely
538 >     * match array usage.  Note also that the {@code set} method returns the
539 >     * old value that was stored at the specified position.
540       *
541       * @param      obj     what the component is to be set to
542       * @param      index   the specified index
543 <     * @exception  ArrayIndexOutOfBoundsException  if the index was invalid
544 <     * @see        #size()
483 <     * @see        List
484 <     * @see        #set(int, java.lang.Object)
543 >     * @throws ArrayIndexOutOfBoundsException if the index is out of range
544 >     *         ({@code index < 0 || index >= size()})
545       */
546      public synchronized void setElementAt(E obj, int index) {
547 <        if (index >= elementCount) {
548 <            throw new ArrayIndexOutOfBoundsException(index + " >= " +
549 <                                                     elementCount);
550 <        }
551 <        elementData[index] = obj;
547 >        if (index >= elementCount) {
548 >            throw new ArrayIndexOutOfBoundsException(index + " >= " +
549 >                                                     elementCount);
550 >        }
551 >        elementData[index] = obj;
552      }
553  
554      /**
555       * Deletes the component at the specified index. Each component in
556       * this vector with an index greater or equal to the specified
557 <     * <code>index</code> is shifted downward to have an index one
557 >     * {@code index} is shifted downward to have an index one
558       * smaller than the value it had previously. The size of this vector
559 <     * is decreased by <tt>1</tt>.<p>
559 >     * is decreased by {@code 1}.
560       *
561 <     * The index must be a value greater than or equal to <code>0</code>
562 <     * and less than the current size of the vector. <p>
561 >     * <p>The index must be a value greater than or equal to {@code 0}
562 >     * and less than the current size of the vector.
563       *
564 <     * This method is identical in functionality to the remove method
565 <     * (which is part of the List interface).  Note that the remove method
566 <     * returns the old value that was stored at the specified position.
564 >     * <p>This method is identical in functionality to the {@link #remove(int)}
565 >     * method (which is part of the {@link List} interface).  Note that the
566 >     * {@code remove} method returns the old value that was stored at the
567 >     * specified position.
568       *
569       * @param      index   the index of the object to remove
570 <     * @exception  ArrayIndexOutOfBoundsException  if the index was invalid
571 <     * @see        #size()
511 <     * @see        #remove(int)
512 <     * @see        List
570 >     * @throws ArrayIndexOutOfBoundsException if the index is out of range
571 >     *         ({@code index < 0 || index >= size()})
572       */
573      public synchronized void removeElementAt(int index) {
574 <        modCount++;
575 <        if (index >= elementCount) {
576 <            throw new ArrayIndexOutOfBoundsException(index + " >= " +
577 <                                                     elementCount);
578 <        }
579 <        else if (index < 0) {
580 <            throw new ArrayIndexOutOfBoundsException(index);
581 <        }
582 <        int j = elementCount - index - 1;
583 <        if (j > 0) {
584 <            System.arraycopy(elementData, index + 1, elementData, index, j);
585 <        }
586 <        elementCount--;
587 <        elementData[elementCount] = null; /* to let gc do its work */
574 >        if (index >= elementCount) {
575 >            throw new ArrayIndexOutOfBoundsException(index + " >= " +
576 >                                                     elementCount);
577 >        }
578 >        else if (index < 0) {
579 >            throw new ArrayIndexOutOfBoundsException(index);
580 >        }
581 >        int j = elementCount - index - 1;
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      }
589  
590      /**
591       * Inserts the specified object as a component in this vector at the
592 <     * specified <code>index</code>. Each component in this vector with
593 <     * an index greater or equal to the specified <code>index</code> is
592 >     * specified {@code index}. Each component in this vector with
593 >     * an index greater or equal to the specified {@code index} is
594       * shifted upward to have an index one greater than the value it had
595 <     * previously. <p>
595 >     * previously.
596       *
597 <     * The index must be a value greater than or equal to <code>0</code>
597 >     * <p>The index must be a value greater than or equal to {@code 0}
598       * and less than or equal to the current size of the vector. (If the
599       * index is equal to the current size of the vector, the new element
600 <     * is appended to the Vector.)<p>
600 >     * is appended to the Vector.)
601       *
602 <     * This method is identical in functionality to the add(Object, int) method
603 <     * (which is part of the List interface). Note that the add method reverses
604 <     * the order of the parameters, to more closely match array usage.
602 >     * <p>This method is identical in functionality to the
603 >     * {@link #add(int, Object) add(int, E)}
604 >     * method (which is part of the {@link List} interface).  Note that the
605 >     * {@code add} method reverses the order of the parameters, to more closely
606 >     * match array usage.
607       *
608       * @param      obj     the component to insert
609       * @param      index   where to insert the new component
610 <     * @exception  ArrayIndexOutOfBoundsException  if the index was invalid
611 <     * @see        #size()
551 <     * @see        #add(int, Object)
552 <     * @see        List
610 >     * @throws ArrayIndexOutOfBoundsException if the index is out of range
611 >     *         ({@code index < 0 || index > size()})
612       */
613      public synchronized void insertElementAt(E obj, int index) {
614 <        modCount++;
615 <        if (index > elementCount) {
616 <            throw new ArrayIndexOutOfBoundsException(index
617 <                                                     + " > " + elementCount);
618 <        }
619 <        ensureCapacityHelper(elementCount + 1);
620 <        System.arraycopy(elementData, index, elementData, index + 1, elementCount - index);
621 <        elementData[index] = obj;
622 <        elementCount++;
614 >        if (index > elementCount) {
615 >            throw new ArrayIndexOutOfBoundsException(index
616 >                                                     + " > " + elementCount);
617 >        }
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 = s + 1;
628      }
629  
630      /**
631       * Adds the specified component to the end of this vector,
632       * increasing its size by one. The capacity of this vector is
633 <     * increased if its size becomes greater than its capacity. <p>
633 >     * increased if its size becomes greater than its capacity.
634       *
635 <     * This method is identical in functionality to the add(Object) method
636 <     * (which is part of the List interface).
635 >     * <p>This method is identical in functionality to the
636 >     * {@link #add(Object) add(E)}
637 >     * method (which is part of the {@link List} interface).
638       *
639       * @param   obj   the component to be added
575     * @see        #add(Object)
576     * @see        List
640       */
641      public synchronized void addElement(E obj) {
642 <        modCount++;
643 <        ensureCapacityHelper(elementCount + 1);
581 <        elementData[elementCount++] = obj;
642 >        modCount++;
643 >        add(obj, elementData, elementCount);
644      }
645  
646      /**
# Line 586 | Line 648 | public class Vector<E>
648       * from this vector. If the object is found in this vector, each
649       * component in the vector with an index greater or equal to the
650       * object's index is shifted downward to have an index one smaller
651 <     * than the value it had previously.<p>
651 >     * than the value it had previously.
652       *
653 <     * This method is identical in functionality to the remove(Object)
654 <     * method (which is part of the List interface).
653 >     * <p>This method is identical in functionality to the
654 >     * {@link #remove(Object)} method (which is part of the
655 >     * {@link List} interface).
656       *
657       * @param   obj   the component to be removed
658 <     * @return  <code>true</code> if the argument was a component of this
659 <     *          vector; <code>false</code> otherwise.
597 <     * @see     List#remove(Object)
598 <     * @see     List
658 >     * @return  {@code true} if the argument was a component of this
659 >     *          vector; {@code false} otherwise.
660       */
661      public synchronized boolean removeElement(Object obj) {
662 <        modCount++;
663 <        int i = indexOf(obj);
664 <        if (i >= 0) {
665 <            removeElementAt(i);
666 <            return true;
667 <        }
668 <        return false;
662 >        modCount++;
663 >        int i = indexOf(obj);
664 >        if (i >= 0) {
665 >            removeElementAt(i);
666 >            return true;
667 >        }
668 >        return false;
669      }
670  
671      /**
672 <     * Removes all components from this vector and sets its size to zero.<p>
672 >     * Removes all components from this vector and sets its size to zero.
673       *
674 <     * This method is identical in functionality to the clear method
675 <     * (which is part of the List interface).
615 <     *
616 <     * @see     #clear
617 <     * @see     List
674 >     * <p>This method is identical in functionality to the {@link #clear}
675 >     * method (which is part of the {@link List} interface).
676       */
677      public synchronized void removeAllElements() {
678 <        modCount++;
679 <        // Let gc do its work
680 <        for (int i = 0; i < elementCount; i++)
623 <            elementData[i] = null;
678 >        // Let gc do its work
679 >        for (int i = 0; i < elementCount; i++)
680 >            elementData[i] = null;
681  
682 <        elementCount = 0;
682 >        modCount++;
683 >        elementCount = 0;
684      }
685  
686      /**
687       * Returns a clone of this vector. The copy will contain a
688       * reference to a clone of the internal data array, not a reference
689 <     * to the original internal data array of this <tt>Vector</tt> object.
689 >     * to the original internal data array of this {@code Vector} object.
690       *
691       * @return  a clone of this vector
692       */
693      public synchronized Object clone() {
694 <        try {
695 <            Vector<E> v = (Vector<E>) super.clone();
696 <            v.elementData = Arrays.copyOf(elementData, elementCount);
697 <            v.modCount = 0;
698 <            return v;
699 <        } catch (CloneNotSupportedException e) {
700 <            // this shouldn't happen, since we are Cloneable
701 <            throw new InternalError();
702 <        }
694 >        try {
695 >            @SuppressWarnings("unchecked")
696 >                Vector<E> v = (Vector<E>) super.clone();
697 >            v.elementData = Arrays.copyOf(elementData, elementCount);
698 >            v.modCount = 0;
699 >            return v;
700 >        } catch (CloneNotSupportedException e) {
701 >            // this shouldn't happen, since we are Cloneable
702 >            throw new InternalError(e);
703 >        }
704      }
705  
706      /**
# Line 659 | Line 718 | public class Vector<E>
718       * correct order; the runtime type of the returned array is that of the
719       * specified array.  If the Vector fits in the specified array, it is
720       * returned therein.  Otherwise, a new array is allocated with the runtime
721 <     * type of the specified array and the size of this Vector.<p>
721 >     * type of the specified array and the size of this Vector.
722       *
723 <     * If the Vector fits in the specified array with room to spare
723 >     * <p>If the Vector fits in the specified array with room to spare
724       * (i.e., the array has more elements than the Vector),
725       * the element in the array immediately following the end of the
726       * Vector is set to null.  (This is useful in determining the length
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.
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 <     * @exception ArrayStoreException 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       */
742 +    @SuppressWarnings("unchecked")
743      public synchronized <T> T[] toArray(T[] a) {
744          if (a.length < elementCount)
745              return (T[]) Arrays.copyOf(elementData, elementCount, a.getClass());
746  
747 <        System.arraycopy(elementData, 0, a, 0, elementCount);
747 >        System.arraycopy(elementData, 0, a, 0, elementCount);
748  
749          if (a.length > elementCount)
750              a[elementCount] = null;
# Line 691 | Line 754 | public class Vector<E>
754  
755      // Positional Access Operations
756  
757 +    @SuppressWarnings("unchecked")
758 +    E elementData(int index) {
759 +        return (E) elementData[index];
760 +    }
761 +
762      /**
763       * Returns the element at the specified position in this Vector.
764       *
765       * @param index index of the element to return
766       * @return object at the specified index
767 <     * @exception ArrayIndexOutOfBoundsException index is out of range (index
768 <     *            &lt; 0 || index &gt;= size())
767 >     * @throws ArrayIndexOutOfBoundsException if the index is out of range
768 >     *            ({@code index < 0 || index >= size()})
769       * @since 1.2
770       */
771      public synchronized E get(int index) {
772 <        if (index >= elementCount)
773 <            throw new ArrayIndexOutOfBoundsException(index);
772 >        if (index >= elementCount)
773 >            throw new ArrayIndexOutOfBoundsException(index);
774  
775 <        return (E)elementData[index];
775 >        return elementData(index);
776      }
777  
778      /**
# Line 714 | Line 782 | public class Vector<E>
782       * @param index index of the element to replace
783       * @param element element to be stored at the specified position
784       * @return the element previously at the specified position
785 <     * @exception ArrayIndexOutOfBoundsException index out of range
786 <     *            (index &lt; 0 || index &gt;= size())
785 >     * @throws ArrayIndexOutOfBoundsException if the index is out of range
786 >     *         ({@code index < 0 || index >= size()})
787       * @since 1.2
788       */
789      public synchronized E set(int index, E element) {
790 <        if (index >= elementCount)
791 <            throw new ArrayIndexOutOfBoundsException(index);
790 >        if (index >= elementCount)
791 >            throw new ArrayIndexOutOfBoundsException(index);
792 >
793 >        E oldValue = elementData(index);
794 >        elementData[index] = element;
795 >        return oldValue;
796 >    }
797  
798 <        Object oldValue = elementData[index];
799 <        elementData[index] = element;
800 <        return (E)oldValue;
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
814 <     * @return <tt>true</tt> (as specified by {@link Collection#add})
814 >     * @return {@code true} (as specified by {@link Collection#add})
815       * @since 1.2
816       */
817      public synchronized boolean add(E e) {
818 <        modCount++;
819 <        ensureCapacityHelper(elementCount + 1);
740 <        elementData[elementCount++] = e;
818 >        modCount++;
819 >        add(e, elementData, elementCount);
820          return true;
821      }
822  
# Line 745 | 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)))</code> (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 763 | Line 842 | public class Vector<E>
842       *
843       * @param index index at which the specified element is to be inserted
844       * @param element element to be inserted
845 <     * @exception ArrayIndexOutOfBoundsException index is out of range
846 <     *            (index &lt; 0 || index &gt; size())
845 >     * @throws ArrayIndexOutOfBoundsException if the index is out of range
846 >     *         ({@code index < 0 || index > size()})
847       * @since 1.2
848       */
849      public void add(int index, E element) {
# Line 776 | 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       *
779     * @exception ArrayIndexOutOfBoundsException index out of range (index
780     *            &lt; 0 || index &gt;= 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) {
865 <        modCount++;
866 <        if (index >= elementCount)
867 <            throw new ArrayIndexOutOfBoundsException(index);
868 <        Object oldValue = elementData[index];
869 <
870 <        int numMoved = elementCount - index - 1;
871 <        if (numMoved > 0)
872 <            System.arraycopy(elementData, index+1, elementData, index,
873 <                             numMoved);
874 <        elementData[--elementCount] = null; // Let gc do its work
865 >        modCount++;
866 >        if (index >= elementCount)
867 >            throw new ArrayIndexOutOfBoundsException(index);
868 >        E oldValue = elementData(index);
869 >
870 >        int numMoved = elementCount - index - 1;
871 >        if (numMoved > 0)
872 >            System.arraycopy(elementData, index+1, elementData, index,
873 >                             numMoved);
874 >        elementData[--elementCount] = null; // Let gc do its work
875  
876 <        return (E)oldValue;
876 >        return oldValue;
877      }
878  
879      /**
# Line 816 | Line 895 | public class Vector<E>
895       * @param   c a collection whose elements will be tested for containment
896       *          in this Vector
897       * @return true if this Vector contains all of the elements in the
898 <     *         specified collection
898 >     *         specified collection
899       * @throws NullPointerException if the specified collection is null
900       */
901      public synchronized boolean containsAll(Collection<?> c) {
# Line 832 | Line 911 | public class Vector<E>
911       * specified Collection is this Vector, and this Vector is nonempty.)
912       *
913       * @param c elements to be inserted into this Vector
914 <     * @return <tt>true</tt> if this Vector changed as a result of the call
914 >     * @return {@code true} if this Vector changed as a result of the call
915       * @throws NullPointerException if the specified collection is null
916       * @since 1.2
917       */
918 <    public synchronized boolean addAll(Collection<? extends E> c) {
840 <        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 854 | 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 874 | 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; r++)
996 >            if (filter.test((E) es[r]))
997 >                break;
998 >        if (modified = (r < size)) {
999 >            expectedModCount++;
1000 >            modCount++;
1001 >            int w = r++;
1002 >            try {
1003 >                for (E e; r < size; r++)
1004 >                    if (!filter.test(e = (E) es[r]))
1005 >                        es[w++] = e;
1006 >            } catch (Throwable ex) {
1007 >                // copy remaining elements
1008 >                System.arraycopy(es, r, es, w, size - r);
1009 >                w += size - r;
1010 >                throw ex;
1011 >            } finally {
1012 >                Arrays.fill(es, elementCount = w, size, null);
1013 >            }
1014 >        }
1015 >        if (modCount != expectedModCount)
1016 >            throw new ConcurrentModificationException();
1017 >        return modified;
1018      }
1019  
1020      /**
# Line 895 | Line 1028 | public class Vector<E>
1028       * @param index index at which to insert the first element from the
1029       *              specified collection
1030       * @param c elements to be inserted into this Vector
1031 <     * @return <tt>true</tt> if this Vector changed as a result of the call
1032 <     * @exception ArrayIndexOutOfBoundsException index out of range (index
1033 <     *            &lt; 0 || index &gt; size())
1031 >     * @return {@code true} if this Vector changed as a result of the call
1032 >     * @throws ArrayIndexOutOfBoundsException if the index is out of range
1033 >     *         ({@code index < 0 || index > size()})
1034       * @throws NullPointerException if the specified collection is null
1035       * @since 1.2
1036       */
1037      public synchronized boolean addAll(int index, Collection<? extends E> c) {
1038 <        modCount++;
1039 <        if (index < 0 || index > elementCount)
907 <            throw new ArrayIndexOutOfBoundsException(index);
1038 >        if (index < 0 || index > elementCount)
1039 >            throw new ArrayIndexOutOfBoundsException(index);
1040  
1041          Object[] a = c.toArray();
1042 <        int numNew = a.length;
1043 <        ensureCapacityHelper(elementCount + numNew);
1044 <
1045 <        int numMoved = elementCount - index;
1046 <        if (numMoved > 0)
1047 <            System.arraycopy(elementData, index, elementData, index + numNew,
1048 <                             numMoved);
1049 <
1042 >        modCount++;
1043 >        int numNew = a.length;
1044 >        if (numNew == 0)
1045 >            return false;
1046 >        Object[] elementData = this.elementData;
1047 >        final int s = elementCount;
1048 >        if (numNew > elementData.length - s)
1049 >            elementData = grow(s + numNew);
1050 >
1051 >        int numMoved = s - index;
1052 >        if (numMoved > 0)
1053 >            System.arraycopy(elementData, index,
1054 >                             elementData, index + numNew,
1055 >                             numMoved);
1056          System.arraycopy(a, 0, elementData, index, numNew);
1057 <        elementCount += numNew;
1058 <        return numNew != 0;
1057 >        elementCount = s + numNew;
1058 >        return true;
1059      }
1060  
1061      /**
1062       * Compares the specified Object with this Vector for equality.  Returns
1063       * true if and only if the specified Object is also a List, both Lists
1064       * have the same size, and all corresponding pairs of elements in the two
1065 <     * Lists are <em>equal</em>.  (Two elements <code>e1</code> and
1066 <     * <code>e2</code> are <em>equal</em> if <code>(e1==null ? e2==null :
1067 <     * e1.equals(e2))</code>.)  In other words, two Lists are defined to be
1065 >     * Lists are <em>equal</em>.  (Two elements {@code e1} and
1066 >     * {@code e2} are <em>equal</em> if {@code Objects.equals(e1, e2)}.)
1067 >     * In other words, two Lists are defined to be
1068       * equal if they contain the same elements in the same order.
1069       *
1070       * @param o the Object to be compared for equality with this Vector
# Line 952 | Line 1090 | public class Vector<E>
1090      }
1091  
1092      /**
1093 <     * Removes from this List all of the elements whose index is between
1094 <     * fromIndex, inclusive and toIndex, exclusive.  Shifts any succeeding
1095 <     * elements to the left (reduces their index).
1096 <     * This call shortens the Vector by (toIndex - fromIndex) elements.  (If
1097 <     * toIndex==fromIndex, this operation has no effect.)
1093 >     * Returns a view of the portion of this List between fromIndex,
1094 >     * inclusive, and toIndex, exclusive.  (If fromIndex and toIndex are
1095 >     * equal, the returned List is empty.)  The returned List is backed by this
1096 >     * List, so changes in the returned List are reflected in this List, and
1097 >     * vice-versa.  The returned List supports all of the optional List
1098 >     * operations supported by this List.
1099 >     *
1100 >     * <p>This method eliminates the need for explicit range operations (of
1101 >     * the sort that commonly exist for arrays).  Any operation that expects
1102 >     * a List can be used as a range operation by operating on a subList view
1103 >     * instead of a whole List.  For example, the following idiom
1104 >     * removes a range of elements from a List:
1105 >     * <pre>
1106 >     *      list.subList(from, to).clear();
1107 >     * </pre>
1108 >     * Similar idioms may be constructed for indexOf and lastIndexOf,
1109 >     * and all of the algorithms in the Collections class can be applied to
1110 >     * a subList.
1111       *
1112 <     * @param fromIndex index of first element to be removed
1113 <     * @param toIndex index after last element to be removed
1112 >     * <p>The semantics of the List returned by this method become undefined if
1113 >     * the backing list (i.e., this List) is <i>structurally modified</i> in
1114 >     * any way other than via the returned List.  (Structural modifications are
1115 >     * those that change the size of the List, or otherwise perturb it in such
1116 >     * a fashion that iterations in progress may yield incorrect results.)
1117 >     *
1118 >     * @param fromIndex low endpoint (inclusive) of the subList
1119 >     * @param toIndex high endpoint (exclusive) of the subList
1120 >     * @return a view of the specified range within this List
1121 >     * @throws IndexOutOfBoundsException if an endpoint index value is out of range
1122 >     *         {@code (fromIndex < 0 || toIndex > size)}
1123 >     * @throws IllegalArgumentException if the endpoint indices are out of order
1124 >     *         {@code (fromIndex > toIndex)}
1125 >     */
1126 >    public synchronized List<E> subList(int fromIndex, int toIndex) {
1127 >        return Collections.synchronizedList(super.subList(fromIndex, toIndex),
1128 >                                            this);
1129 >    }
1130 >
1131 >    /**
1132 >     * Removes from this list all of the elements whose index is between
1133 >     * {@code fromIndex}, inclusive, and {@code toIndex}, exclusive.
1134 >     * Shifts any succeeding elements to the left (reduces their index).
1135 >     * This call shortens the list by {@code (toIndex - fromIndex)} elements.
1136 >     * (If {@code toIndex==fromIndex}, this operation has no effect.)
1137       */
1138      protected synchronized void removeRange(int fromIndex, int toIndex) {
1139 <        modCount++;
966 <        int numMoved = elementCount - toIndex;
1139 >        int numMoved = elementCount - toIndex;
1140          System.arraycopy(elementData, toIndex, elementData, fromIndex,
1141                           numMoved);
1142  
1143 <        // Let gc do its work
1144 <        int newElementCount = elementCount - (toIndex-fromIndex);
1145 <        while (elementCount != newElementCount)
1146 <            elementData[--elementCount] = null;
1143 >        // Let gc do its work
1144 >        modCount++;
1145 >        int newElementCount = elementCount - (toIndex-fromIndex);
1146 >        while (elementCount != newElementCount)
1147 >            elementData[--elementCount] = null;
1148      }
1149  
1150      /**
1151 <     * Save the state of the <tt>Vector</tt> instance to a stream (that
1152 <     * is, serialize it).  This method is present merely for synchronization.
1153 <     * It just calls the default writeObject method.
1151 >     * Save the state of the {@code Vector} instance to a stream (that
1152 >     * is, serialize it).
1153 >     * This method performs synchronization to ensure the consistency
1154 >     * of the serialized data.
1155       */
1156 <    private synchronized void writeObject(java.io.ObjectOutputStream s)
1157 <        throws java.io.IOException
1158 <    {
1159 <        s.defaultWriteObject();
1156 >    private void writeObject(java.io.ObjectOutputStream s)
1157 >            throws java.io.IOException {
1158 >        final java.io.ObjectOutputStream.PutField fields = s.putFields();
1159 >        final Object[] data;
1160 >        synchronized (this) {
1161 >            fields.put("capacityIncrement", capacityIncrement);
1162 >            fields.put("elementCount", elementCount);
1163 >            data = elementData.clone();
1164 >        }
1165 >        fields.put("elementData", data);
1166 >        s.writeFields();
1167      }
1168  
1169      /**
1170 <     * Returns a list-iterator of the elements in this list (in proper
1170 >     * Returns a list iterator over the elements in this list (in proper
1171       * sequence), starting at the specified position in the list.
1172 <     * Obeys the general contract of {@link List#listIterator(int)}.
1172 >     * The specified index indicates the first element that would be
1173 >     * returned by an initial call to {@link ListIterator#next next}.
1174 >     * An initial call to {@link ListIterator#previous previous} would
1175 >     * return the element with the specified index minus one.
1176 >     *
1177 >     * <p>The returned list iterator is <a href="#fail-fast"><i>fail-fast</i></a>.
1178       *
992     * <p>The list-iterator is <i>fail-fast</i>: if the list is structurally
993     * modified at any time after the Iterator is created, in any way except
994     * through the list-iterator's own {@code remove} or {@code add}
995     * methods, the list-iterator will throw a
996     * {@code ConcurrentModificationException}.  Thus, in the face of
997     * concurrent modification, the iterator fails quickly and cleanly, rather
998     * than risking arbitrary, non-deterministic behavior at an undetermined
999     * time in the future.
1000     *
1001     * @param index index of the first element to be returned from the
1002     *        list-iterator (by a call to {@link ListIterator#next})
1003     * @return a list-iterator of the elements in this list (in proper
1004     *         sequence), starting at the specified position in the list
1179       * @throws IndexOutOfBoundsException {@inheritDoc}
1180       */
1181      public synchronized ListIterator<E> listIterator(int index) {
1182 <        if (index < 0 || index > elementCount)
1182 >        if (index < 0 || index > elementCount)
1183              throw new IndexOutOfBoundsException("Index: "+index);
1184 <        return new VectorIterator(index, elementCount);
1184 >        return new ListItr(index);
1185      }
1186  
1187      /**
1188 <     * {@inheritDoc}
1188 >     * Returns a list iterator over the elements in this list (in proper
1189 >     * sequence).
1190 >     *
1191 >     * <p>The returned list iterator is <a href="#fail-fast"><i>fail-fast</i></a>.
1192 >     *
1193 >     * @see #listIterator(int)
1194       */
1195      public synchronized ListIterator<E> listIterator() {
1196 <        return new VectorIterator(0, elementCount);
1196 >        return new ListItr(0);
1197      }
1198  
1199      /**
1200       * Returns an iterator over the elements in this list in proper sequence.
1201       *
1202 +     * <p>The returned iterator is <a href="#fail-fast"><i>fail-fast</i></a>.
1203 +     *
1204       * @return an iterator over the elements in this list in proper sequence
1205       */
1206      public synchronized Iterator<E> iterator() {
1207 <        return new VectorIterator(0, elementCount);
1207 >        return new Itr();
1208      }
1209  
1210      /**
1211 <     * Helper method to access array elements under synchronization by
1031 <     * iterators. The caller performs index check with respect to
1032 <     * expected bounds, so errors accessing the element are reported
1033 <     * as ConcurrentModificationExceptions.
1211 >     * An optimized version of AbstractList.Itr
1212       */
1213 <    final synchronized Object iteratorGet(int index, int expectedModCount) {
1214 <        if (modCount == expectedModCount) {
1215 <            try {
1216 <                return elementData[index];
1039 <            } catch(IndexOutOfBoundsException fallThrough) {
1040 <            }
1041 <        }
1042 <        throw new ConcurrentModificationException();
1043 <    }
1213 >    private class Itr implements Iterator<E> {
1214 >        int cursor;       // index of next element to return
1215 >        int lastRet = -1; // index of last element returned; -1 if no such
1216 >        int expectedModCount = modCount;
1217  
1218 <    /**
1219 <     * Streamlined specialization of AbstractList version of iterator.
1220 <     * Locally perfroms bounds checks, but relies on outer Vector
1221 <     * to access elements under synchronization.
1049 <     */
1050 <    private final class VectorIterator implements ListIterator<E> {
1051 <        int cursor;              // Index of next element to return;
1052 <        int fence;               // Upper bound on cursor (cache of size())
1053 <        int lastRet;             // Index of last element, or -1 if no such
1054 <        int expectedModCount;    // To check for CME
1055 <
1056 <        VectorIterator(int index, int fence) {
1057 <            this.cursor = index;
1058 <            this.fence = fence;
1059 <            this.lastRet = -1;
1060 <            this.expectedModCount = Vector.this.modCount;
1061 <        }
1062 <
1063 <        public boolean hasNext() {
1064 <            return cursor < fence;
1065 <        }
1066 <
1067 <        public boolean hasPrevious() {
1068 <            return cursor > 0;
1069 <        }
1070 <
1071 <        public int nextIndex() {
1072 <            return cursor;
1073 <        }
1074 <
1075 <        public int previousIndex() {
1076 <            return cursor - 1;
1077 <        }
1078 <
1079 <        public E next() {
1080 <            int i = cursor;
1081 <            if (i >= fence)
1082 <                throw new NoSuchElementException();
1083 <            Object next = Vector.this.iteratorGet(i, expectedModCount);
1084 <            lastRet = i;
1085 <            cursor = i + 1;
1086 <            return (E)next;
1087 <        }
1088 <
1089 <        public E previous() {
1090 <            int i = cursor - 1;
1091 <            if (i < 0)
1092 <                throw new NoSuchElementException();
1093 <            Object prev = Vector.this.iteratorGet(i, expectedModCount);
1094 <            lastRet = i;
1095 <            cursor = i;
1096 <            return (E)prev;
1218 >        public boolean hasNext() {
1219 >            // Racy but within spec, since modifications are checked
1220 >            // within or after synchronization in next/previous
1221 >            return cursor != elementCount;
1222          }
1223  
1224 <        public void set(E e) {
1225 <            if (lastRet < 0)
1226 <                throw new IllegalStateException();
1102 <            if (Vector.this.modCount != expectedModCount)
1103 <                throw new ConcurrentModificationException();
1104 <            try {
1105 <                Vector.this.set(lastRet, e);
1106 <                expectedModCount = Vector.this.modCount;
1107 <            } catch (IndexOutOfBoundsException ex) {
1108 <                throw new ConcurrentModificationException();
1109 <            }
1110 <        }
1111 <
1112 <        public void remove() {
1113 <            int i = lastRet;
1114 <            if (i < 0)
1115 <                throw new IllegalStateException();
1116 <            if (Vector.this.modCount != expectedModCount)
1117 <                throw new ConcurrentModificationException();
1118 <            try {
1119 <                Vector.this.remove(i);
1120 <                if (i < cursor)
1121 <                    cursor--;
1122 <                lastRet = -1;
1123 <                fence = Vector.this.size();
1124 <                expectedModCount = Vector.this.modCount;
1125 <            } catch (IndexOutOfBoundsException ex) {
1126 <                throw new ConcurrentModificationException();
1127 <            }
1128 <        }
1129 <
1130 <        public void add(E e) {
1131 <            if (Vector.this.modCount != expectedModCount)
1132 <                throw new ConcurrentModificationException();
1133 <            try {
1224 >        public E next() {
1225 >            synchronized (Vector.this) {
1226 >                checkForComodification();
1227                  int i = cursor;
1228 <                Vector.this.add(i, e);
1228 >                if (i >= elementCount)
1229 >                    throw new NoSuchElementException();
1230                  cursor = i + 1;
1231 <                lastRet = -1;
1138 <                fence = Vector.this.size();
1139 <                expectedModCount = Vector.this.modCount;
1140 <            } catch (IndexOutOfBoundsException ex) {
1141 <                throw new ConcurrentModificationException();
1142 <            }
1143 <        }
1144 <    }
1145 <
1146 <    /**
1147 <     * Returns a view of the portion of this List between fromIndex,
1148 <     * inclusive, and toIndex, exclusive.  (If fromIndex and toIndex are
1149 <     * equal, the returned List is empty.)  The returned List is backed by this
1150 <     * List, so changes in the returned List are reflected in this List, and
1151 <     * vice-versa.  The returned List supports all of the optional List
1152 <     * operations supported by this List.<p>
1153 <     *
1154 <     * This method eliminates the need for explicit range operations (of
1155 <     * the sort that commonly exist for arrays).   Any operation that expects
1156 <     * a List can be used as a range operation by operating on a subList view
1157 <     * instead of a whole List.  For example, the following idiom
1158 <     * removes a range of elements from a List:
1159 <     * <pre>
1160 <     *      list.subList(from, to).clear();
1161 <     * </pre>
1162 <     * Similar idioms may be constructed for indexOf and lastIndexOf,
1163 <     * and all of the algorithms in the Collections class can be applied to
1164 <     * a subList.<p>
1165 <     *
1166 <     * The semantics of the List returned by this method become undefined if
1167 <     * the backing list (i.e., this List) is <i>structurally modified</i> in
1168 <     * any way other than via the returned List.  (Structural modifications are
1169 <     * those that change the size of the List, or otherwise perturb it in such
1170 <     * a fashion that iterations in progress may yield incorrect results.)
1171 <     *
1172 <     * @param fromIndex low endpoint (inclusive) of the subList
1173 <     * @param toIndex high endpoint (exclusive) of the subList
1174 <     * @return a view of the specified range within this List
1175 <     * @throws IndexOutOfBoundsException endpoint index value out of range
1176 <     *         <code>(fromIndex &lt; 0 || toIndex &gt; size)</code>
1177 <     * @throws IllegalArgumentException endpoint indices out of order
1178 <     *         <code>(fromIndex &gt; toIndex)</code>
1179 <     */
1180 <    public synchronized List<E> subList(int fromIndex, int toIndex) {
1181 <        return new VectorSubList(this, this, fromIndex, fromIndex, toIndex);
1182 <    }
1183 <
1184 <    /**
1185 <     * This class specializes the AbstractList version of SubList to
1186 <     * avoid the double-indirection penalty that would arise using a
1187 <     * synchronized wrapper, as well as to avoid some unnecessary
1188 <     * checks in sublist iterators.
1189 <     */
1190 <    private static final class VectorSubList<E> extends AbstractList<E> implements RandomAccess {
1191 <        final Vector<E> base;             // base list
1192 <        final AbstractList<E> parent;     // Creating list
1193 <        final int baseOffset;             // index wrt Vector
1194 <        final int parentOffset;           // index wrt parent
1195 <        int length;                       // length of sublist
1196 <
1197 <        VectorSubList(Vector<E> base, AbstractList<E> parent, int baseOffset,
1198 <                     int fromIndex, int toIndex) {
1199 <            if (fromIndex < 0)
1200 <                throw new IndexOutOfBoundsException("fromIndex = " + fromIndex);
1201 <            if (toIndex > parent.size())
1202 <                throw new IndexOutOfBoundsException("toIndex = " + toIndex);
1203 <            if (fromIndex > toIndex)
1204 <                throw new IllegalArgumentException("fromIndex(" + fromIndex +
1205 <                                                   ") > toIndex(" + toIndex + ")");
1206 <
1207 <            this.base = base;
1208 <            this.parent = parent;
1209 <            this.baseOffset = baseOffset;
1210 <            this.parentOffset = fromIndex;
1211 <            this.length = toIndex - fromIndex;
1212 <            modCount = base.modCount;
1213 <        }
1214 <
1215 <        /**
1216 <         * Returns an IndexOutOfBoundsException with nicer message
1217 <         */
1218 <        private IndexOutOfBoundsException indexError(int index) {
1219 <            return new IndexOutOfBoundsException("Index: " + index +
1220 <                                                 ", Size: " + length);
1221 <        }
1222 <
1223 <        public E set(int index, E element) {
1224 <            synchronized(base) {
1225 <                if (index < 0 || index >= length)
1226 <                    throw indexError(index);
1227 <                if (base.modCount != modCount)
1228 <                    throw new ConcurrentModificationException();
1229 <                return base.set(index + baseOffset, element);
1231 >                return elementData(lastRet = i);
1232              }
1233          }
1234  
1235 <        public E get(int index) {
1236 <            synchronized(base) {
1237 <                if (index < 0 || index >= length)
1238 <                    throw indexError(index);
1239 <                if (base.modCount != modCount)
1240 <                    throw new ConcurrentModificationException();
1241 <                return base.get(index + baseOffset);
1235 >        public void remove() {
1236 >            if (lastRet == -1)
1237 >                throw new IllegalStateException();
1238 >            synchronized (Vector.this) {
1239 >                checkForComodification();
1240 >                Vector.this.remove(lastRet);
1241 >                expectedModCount = modCount;
1242              }
1243 +            cursor = lastRet;
1244 +            lastRet = -1;
1245          }
1246  
1247 <        public int size() {
1248 <            synchronized(base) {
1249 <                if (base.modCount != modCount)
1247 >        @Override
1248 >        public void forEachRemaining(Consumer<? super E> action) {
1249 >            Objects.requireNonNull(action);
1250 >            synchronized (Vector.this) {
1251 >                final int size = elementCount;
1252 >                int i = cursor;
1253 >                if (i >= size) {
1254 >                    return;
1255 >                }
1256 >        @SuppressWarnings("unchecked")
1257 >                final E[] elementData = (E[]) Vector.this.elementData;
1258 >                if (i >= elementData.length) {
1259                      throw new ConcurrentModificationException();
1260 <                return length;
1260 >                }
1261 >                while (i != size && modCount == expectedModCount) {
1262 >                    action.accept(elementData[i++]);
1263 >                }
1264 >                // update once at end of iteration to reduce heap write traffic
1265 >                cursor = i;
1266 >                lastRet = i - 1;
1267 >                checkForComodification();
1268              }
1269          }
1270  
1271 <        public void add(int index, E element) {
1272 <            synchronized(base) {
1273 <                if (index < 0 || index > length)
1254 <                    throw indexError(index);
1255 <                if (base.modCount != modCount)
1256 <                    throw new ConcurrentModificationException();
1257 <                parent.add(index + parentOffset, element);
1258 <                length++;
1259 <                modCount = base.modCount;
1260 <            }
1271 >        final void checkForComodification() {
1272 >            if (modCount != expectedModCount)
1273 >                throw new ConcurrentModificationException();
1274          }
1275 +    }
1276  
1277 <        public E remove(int index) {
1278 <            synchronized(base) {
1279 <                if (index < 0 || index >= length)
1280 <                    throw indexError(index);
1281 <                if (base.modCount != modCount)
1282 <                    throw new ConcurrentModificationException();
1283 <                E result = parent.remove(index + parentOffset);
1270 <                length--;
1271 <                modCount = base.modCount;
1272 <                return result;
1273 <            }
1277 >    /**
1278 >     * An optimized version of AbstractList.ListItr
1279 >     */
1280 >    final class ListItr extends Itr implements ListIterator<E> {
1281 >        ListItr(int index) {
1282 >            super();
1283 >            cursor = index;
1284          }
1285  
1286 <        protected void removeRange(int fromIndex, int toIndex) {
1287 <            synchronized(base) {
1278 <                if (base.modCount != modCount)
1279 <                    throw new ConcurrentModificationException();
1280 <                parent.removeRange(fromIndex + parentOffset,
1281 <                                   toIndex + parentOffset);
1282 <                length -= (toIndex-fromIndex);
1283 <                modCount = base.modCount;
1284 <            }
1286 >        public boolean hasPrevious() {
1287 >            return cursor != 0;
1288          }
1289  
1290 <        public boolean addAll(Collection<? extends E> c) {
1291 <            return addAll(length, c);
1290 >        public int nextIndex() {
1291 >            return cursor;
1292          }
1293  
1294 <        public boolean addAll(int index, Collection<? extends E> c) {
1295 <            synchronized(base) {
1296 <                if (index < 0 || index > length)
1294 <                    throw indexError(index);
1295 <                int cSize = c.size();
1296 <                if (cSize==0)
1297 <                    return false;
1294 >        public int previousIndex() {
1295 >            return cursor - 1;
1296 >        }
1297  
1298 <                if (base.modCount != modCount)
1299 <                    throw new ConcurrentModificationException();
1300 <                parent.addAll(parentOffset + index, c);
1301 <                modCount = base.modCount;
1302 <                length += cSize;
1303 <                return true;
1298 >        public E previous() {
1299 >            synchronized (Vector.this) {
1300 >                checkForComodification();
1301 >                int i = cursor - 1;
1302 >                if (i < 0)
1303 >                    throw new NoSuchElementException();
1304 >                cursor = i;
1305 >                return elementData(lastRet = i);
1306              }
1307          }
1308  
1309 <        public boolean equals(Object o) {
1310 <            synchronized(base) {return super.equals(o);}
1309 >        public void set(E e) {
1310 >            if (lastRet == -1)
1311 >                throw new IllegalStateException();
1312 >            synchronized (Vector.this) {
1313 >                checkForComodification();
1314 >                Vector.this.set(lastRet, e);
1315 >            }
1316          }
1317  
1318 <        public int hashCode() {
1319 <            synchronized(base) {return super.hashCode();}
1318 >        public void add(E e) {
1319 >            int i = cursor;
1320 >            synchronized (Vector.this) {
1321 >                checkForComodification();
1322 >                Vector.this.add(i, e);
1323 >                expectedModCount = modCount;
1324 >            }
1325 >            cursor = i + 1;
1326 >            lastRet = -1;
1327          }
1328 +    }
1329  
1330 <        public int indexOf(Object o) {
1331 <            synchronized(base) {return super.indexOf(o);}
1330 >    @Override
1331 >    public synchronized void forEach(Consumer<? super E> action) {
1332 >        Objects.requireNonNull(action);
1333 >        final int expectedModCount = modCount;
1334 >        @SuppressWarnings("unchecked")
1335 >        final E[] elementData = (E[]) this.elementData;
1336 >        final int elementCount = this.elementCount;
1337 >        for (int i=0; modCount == expectedModCount && i < elementCount; i++) {
1338 >            action.accept(elementData[i]);
1339          }
1340 <
1341 <        public int lastIndexOf(Object o) {
1321 <            synchronized(base) {return super.lastIndexOf(o);}
1340 >        if (modCount != expectedModCount) {
1341 >            throw new ConcurrentModificationException();
1342          }
1343 +    }
1344  
1345 <        public List<E> subList(int fromIndex, int toIndex) {
1346 <            return new VectorSubList(base, this, fromIndex + baseOffset,
1347 <                                     fromIndex, toIndex);
1345 >    @Override
1346 >    @SuppressWarnings("unchecked")
1347 >    public synchronized void replaceAll(UnaryOperator<E> operator) {
1348 >        Objects.requireNonNull(operator);
1349 >        final int expectedModCount = modCount;
1350 >        final int size = elementCount;
1351 >        for (int i=0; modCount == expectedModCount && i < size; i++) {
1352 >            elementData[i] = operator.apply((E) elementData[i]);
1353          }
1354 <
1355 <        public Iterator<E> iterator() {
1330 <            synchronized(base) {
1331 <                return new VectorSubListIterator(this, 0);
1332 <            }
1354 >        if (modCount != expectedModCount) {
1355 >            throw new ConcurrentModificationException();
1356          }
1357 +        modCount++;
1358 +    }
1359  
1360 <        public synchronized ListIterator<E> listIterator() {
1361 <            synchronized(base) {
1362 <                return new VectorSubListIterator(this, 0);
1363 <            }
1360 >    @SuppressWarnings("unchecked")
1361 >    @Override
1362 >    public synchronized void sort(Comparator<? super E> c) {
1363 >        final int expectedModCount = modCount;
1364 >        Arrays.sort((E[]) elementData, 0, elementCount, c);
1365 >        if (modCount != expectedModCount) {
1366 >            throw new ConcurrentModificationException();
1367          }
1368 +        modCount++;
1369 +    }
1370  
1371 <        public ListIterator<E> listIterator(int index) {
1372 <            synchronized(base) {
1373 <                if (index < 0 || index > length)
1374 <                    throw indexError(index);
1375 <                return new VectorSubListIterator(this, index);
1376 <            }
1371 >    /**
1372 >     * Creates a <em><a href="Spliterator.html#binding">late-binding</a></em>
1373 >     * and <em>fail-fast</em> {@link Spliterator} over the elements in this
1374 >     * list.
1375 >     *
1376 >     * <p>The {@code Spliterator} reports {@link Spliterator#SIZED},
1377 >     * {@link Spliterator#SUBSIZED}, and {@link Spliterator#ORDERED}.
1378 >     * Overriding implementations should document the reporting of additional
1379 >     * characteristic values.
1380 >     *
1381 >     * @return a {@code Spliterator} over the elements in this list
1382 >     * @since 1.8
1383 >     */
1384 >    @Override
1385 >    public Spliterator<E> spliterator() {
1386 >        return new VectorSpliterator<>(this, null, 0, -1, 0);
1387 >    }
1388 >
1389 >    /** Similar to ArrayList Spliterator */
1390 >    static final class VectorSpliterator<E> implements Spliterator<E> {
1391 >        private final Vector<E> list;
1392 >        private Object[] array;
1393 >        private int index; // current index, modified on advance/split
1394 >        private int fence; // -1 until used; then one past last index
1395 >        private int expectedModCount; // initialized when fence set
1396 >
1397 >        /** Create new spliterator covering the given  range */
1398 >        VectorSpliterator(Vector<E> list, Object[] array, int origin, int fence,
1399 >                          int expectedModCount) {
1400 >            this.list = list;
1401 >            this.array = array;
1402 >            this.index = origin;
1403 >            this.fence = fence;
1404 >            this.expectedModCount = expectedModCount;
1405          }
1406  
1407 <        /**
1408 <         * Same idea as VectorIterator, except routing structural
1409 <         * change operations through the sublist.
1410 <         */
1411 <        private static final class VectorSubListIterator<E> implements ListIterator<E> {
1412 <            final Vector<E> base;         // base list
1413 <            final VectorSubList<E> outer; // Sublist creating this iteraor
1356 <            final int offset;             // cursor offset wrt base
1357 <            int cursor;                   // Current index
1358 <            int fence;                    // Upper bound on cursor
1359 <            int lastRet;                  // Index of returned element, or -1
1360 <            int expectedModCount;         // Expected modCount of base Vector
1361 <
1362 <            VectorSubListIterator(VectorSubList<E> list, int index) {
1363 <                this.lastRet = -1;
1364 <                this.cursor = index;
1365 <                this.outer = list;
1366 <                this.offset = list.baseOffset;
1367 <                this.fence = list.length;
1368 <                this.base = list.base;
1369 <                this.expectedModCount = base.modCount;
1370 <            }
1371 <
1372 <            public boolean hasNext() {
1373 <                return cursor < fence;
1374 <            }
1375 <
1376 <            public boolean hasPrevious() {
1377 <                return cursor > 0;
1378 <            }
1379 <
1380 <            public int nextIndex() {
1381 <                return cursor;
1382 <            }
1383 <
1384 <            public int previousIndex() {
1385 <                return cursor - 1;
1386 <            }
1387 <
1388 <            public E next() {
1389 <                int i = cursor;
1390 <                if (cursor >= fence)
1391 <                    throw new NoSuchElementException();
1392 <                Object next = base.iteratorGet(i + offset, expectedModCount);
1393 <                lastRet = i;
1394 <                cursor = i + 1;
1395 <                return (E)next;
1396 <            }
1397 <
1398 <            public E previous() {
1399 <                int i = cursor - 1;
1400 <                if (i < 0)
1401 <                    throw new NoSuchElementException();
1402 <                Object prev = base.iteratorGet(i + offset, expectedModCount);
1403 <                lastRet = i;
1404 <                cursor = i;
1405 <                return (E)prev;
1406 <            }
1407 <
1408 <            public void set(E e) {
1409 <                if (lastRet < 0)
1410 <                    throw new IllegalStateException();
1411 <                if (base.modCount != expectedModCount)
1412 <                    throw new ConcurrentModificationException();
1413 <                try {
1414 <                    outer.set(lastRet, e);
1415 <                    expectedModCount = base.modCount;
1416 <                } catch (IndexOutOfBoundsException ex) {
1417 <                    throw new ConcurrentModificationException();
1407 >        private int getFence() { // initialize on first use
1408 >            int hi;
1409 >            if ((hi = fence) < 0) {
1410 >                synchronized (list) {
1411 >                    array = list.elementData;
1412 >                    expectedModCount = list.modCount;
1413 >                    hi = fence = list.elementCount;
1414                  }
1415              }
1416 +            return hi;
1417 +        }
1418  
1419 <            public void remove() {
1420 <                int i = lastRet;
1421 <                if (i < 0)
1422 <                    throw new IllegalStateException();
1423 <                if (base.modCount != expectedModCount)
1419 >        public Spliterator<E> trySplit() {
1420 >            int hi = getFence(), lo = index, mid = (lo + hi) >>> 1;
1421 >            return (lo >= mid) ? null :
1422 >                new VectorSpliterator<>(list, array, lo, index = mid,
1423 >                                        expectedModCount);
1424 >        }
1425 >
1426 >        @SuppressWarnings("unchecked")
1427 >        public boolean tryAdvance(Consumer<? super E> action) {
1428 >            int i;
1429 >            if (action == null)
1430 >                throw new NullPointerException();
1431 >            if (getFence() > (i = index)) {
1432 >                index = i + 1;
1433 >                action.accept((E)array[i]);
1434 >                if (list.modCount != expectedModCount)
1435                      throw new ConcurrentModificationException();
1436 <                try {
1428 <                    outer.remove(i);
1429 <                    if (i < cursor)
1430 <                        cursor--;
1431 <                    lastRet = -1;
1432 <                    fence = outer.length;
1433 <                    expectedModCount = base.modCount;
1434 <                } catch (IndexOutOfBoundsException ex) {
1435 <                    throw new ConcurrentModificationException();
1436 <                }
1436 >                return true;
1437              }
1438 +            return false;
1439 +        }
1440  
1441 <            public void add(E e) {
1442 <                if (base.modCount != expectedModCount)
1443 <                    throw new ConcurrentModificationException();
1444 <                try {
1445 <                    int i = cursor;
1446 <                    outer.add(i, e);
1447 <                    cursor = i + 1;
1448 <                    lastRet = -1;
1449 <                    fence = outer.length;
1450 <                    expectedModCount = base.modCount;
1451 <                } catch (IndexOutOfBoundsException ex) {
1452 <                    throw new ConcurrentModificationException();
1441 >        @SuppressWarnings("unchecked")
1442 >        public void forEachRemaining(Consumer<? super E> action) {
1443 >            int i, hi; // hoist accesses and checks from loop
1444 >            Vector<E> lst; Object[] a;
1445 >            if (action == null)
1446 >                throw new NullPointerException();
1447 >            if ((lst = list) != null) {
1448 >                if ((hi = fence) < 0) {
1449 >                    synchronized (lst) {
1450 >                        expectedModCount = lst.modCount;
1451 >                        a = array = lst.elementData;
1452 >                        hi = fence = lst.elementCount;
1453 >                    }
1454 >                }
1455 >                else
1456 >                    a = array;
1457 >                if (a != null && (i = index) >= 0 && (index = hi) <= a.length) {
1458 >                    while (i < hi)
1459 >                        action.accept((E) a[i++]);
1460 >                    if (lst.modCount == expectedModCount)
1461 >                        return;
1462                  }
1463              }
1464 +            throw new ConcurrentModificationException();
1465          }
1454    }
1455 }
1456
1466  
1467 +        public long estimateSize() {
1468 +            return getFence() - index;
1469 +        }
1470  
1471 +        public int characteristics() {
1472 +            return Spliterator.ORDERED | Spliterator.SIZED | Spliterator.SUBSIZED;
1473 +        }
1474 +    }
1475 + }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines