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.2 by jsr166, Sat Nov 26 03:12:10 2005 UTC vs.
Revision 1.44 by jsr166, Sat Dec 24 19:32:07 2016 UTC

# Line 1 | Line 1
1   /*
2 < * %W% %E%
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 2005 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 < import java.util.*; // for javadoc (till 6280605 is fixed)
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.<p>
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 < * 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
39 > * <p>Each vector tries to optimize storage management by maintaining a
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. <p>
26 < *
27 < * As of the Java 2 platform v1.2, this class has been retrofitted to
28 < * implement List, so that it becomes a part of Java's collection framework.
29 < * Unlike the new collection implementations, Vector is synchronized.<p>
46 > * components; this reduces the amount of incremental reallocation.
47   *
48 < * 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><p>
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}/../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 < * This class is a member of the
50 < * <a href="{@docRoot}/../guide/collections/index.html">
51 < * Java Collections Framework</a>.
79 > * @param <E> Type of component elements
80   *
81   * @author  Lee Boynton
82   * @author  Jonathan Payne
55 * @version %I%, %G%
83   * @see Collection
57 * @see List
58 * @see ArrayList
84   * @see LinkedList
85 < * @since   JDK1.0
85 > * @since   1.0
86   */
87   public class Vector<E>
88      extends AbstractList<E>
# Line 66 | 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 103 | 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 120 | 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 147 | Line 172 | public class Vector<E>
172       * @since   1.2
173       */
174      public Vector(Collection<? extends E> c) {
175 <        Object[] a = c.toArray();
176 <        elementCount = a.length;
177 <        // If c.toArray incorrectly doesn't return Object[], copy it.
178 <        if (a.getClass() == Object[].class)
179 <            elementData = a;
180 <        else
156 <            elementData = Arrays.copyOf(a, a.length, 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 170 | 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 195 | 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;
251 <            }
252 <        }
253 <        elementCount = newSize;
306 >        modCount++;
307 >        if (newSize > elementData.length)
308 >            grow(newSize);
309 >        final Object[] es = elementData;
310 >        for (int to = elementCount, i = elementCount = newSize; i < to; i++)
311 >            es[i] = null;
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 270 | 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
294     * @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 338 | 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 382 | 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 405 | 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
430 <     *             <tt>Vector</tt> object.
431 <     * @see        #get(int)
432 <     * @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()
488 <     * @see        List
489 <     * @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()
516 <     * @see        #remove(int)
517 <     * @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 >        // checkInvariants();
589      }
590  
591      /**
592       * Inserts the specified object as a component in this vector at the
593 <     * specified <code>index</code>. Each component in this vector with
594 <     * an index greater or equal to the specified <code>index</code> is
593 >     * specified {@code index}. Each component in this vector with
594 >     * an index greater or equal to the specified {@code index} is
595       * shifted upward to have an index one greater than the value it had
596 <     * previously. <p>
596 >     * previously.
597       *
598 <     * The index must be a value greater than or equal to <code>0</code>
598 >     * <p>The index must be a value greater than or equal to {@code 0}
599       * and less than or equal to the current size of the vector. (If the
600       * index is equal to the current size of the vector, the new element
601 <     * is appended to the Vector.)<p>
601 >     * is appended to the Vector.)
602       *
603 <     * This method is identical in functionality to the add(Object, int) method
604 <     * (which is part of the List interface). Note that the add method reverses
605 <     * the order of the parameters, to more closely match array usage.
603 >     * <p>This method is identical in functionality to the
604 >     * {@link #add(int, Object) add(int, E)}
605 >     * method (which is part of the {@link List} interface).  Note that the
606 >     * {@code add} method reverses the order of the parameters, to more closely
607 >     * match array usage.
608       *
609       * @param      obj     the component to insert
610       * @param      index   where to insert the new component
611 <     * @exception  ArrayIndexOutOfBoundsException  if the index was invalid
612 <     * @see        #size()
556 <     * @see        #add(int, Object)
557 <     * @see        List
611 >     * @throws ArrayIndexOutOfBoundsException if the index is out of range
612 >     *         ({@code index < 0 || index > size()})
613       */
614      public synchronized void insertElementAt(E obj, int index) {
615 <        modCount++;
616 <        if (index > elementCount) {
617 <            throw new ArrayIndexOutOfBoundsException(index
618 <                                                     + " > " + elementCount);
619 <        }
620 <        ensureCapacityHelper(elementCount + 1);
621 <        System.arraycopy(elementData, index, elementData, index + 1, elementCount - index);
622 <        elementData[index] = obj;
623 <        elementCount++;
615 >        if (index > elementCount) {
616 >            throw new ArrayIndexOutOfBoundsException(index
617 >                                                     + " > " + elementCount);
618 >        }
619 >        modCount++;
620 >        final int s = elementCount;
621 >        Object[] elementData = this.elementData;
622 >        if (s == elementData.length)
623 >            elementData = grow();
624 >        System.arraycopy(elementData, index,
625 >                         elementData, index + 1,
626 >                         s - index);
627 >        elementData[index] = obj;
628 >        elementCount = s + 1;
629      }
630  
631      /**
632       * Adds the specified component to the end of this vector,
633       * increasing its size by one. The capacity of this vector is
634 <     * increased if its size becomes greater than its capacity. <p>
634 >     * increased if its size becomes greater than its capacity.
635       *
636 <     * This method is identical in functionality to the add(Object) method
637 <     * (which is part of the List interface).
636 >     * <p>This method is identical in functionality to the
637 >     * {@link #add(Object) add(E)}
638 >     * method (which is part of the {@link List} interface).
639       *
640       * @param   obj   the component to be added
580     * @see        #add(Object)
581     * @see        List
641       */
642      public synchronized void addElement(E obj) {
643 <        modCount++;
644 <        ensureCapacityHelper(elementCount + 1);
586 <        elementData[elementCount++] = obj;
643 >        modCount++;
644 >        add(obj, elementData, elementCount);
645      }
646  
647      /**
# Line 591 | Line 649 | public class Vector<E>
649       * from this vector. If the object is found in this vector, each
650       * component in the vector with an index greater or equal to the
651       * object's index is shifted downward to have an index one smaller
652 <     * than the value it had previously.<p>
652 >     * than the value it had previously.
653       *
654 <     * This method is identical in functionality to the remove(Object)
655 <     * method (which is part of the List interface).
654 >     * <p>This method is identical in functionality to the
655 >     * {@link #remove(Object)} method (which is part of the
656 >     * {@link List} interface).
657       *
658       * @param   obj   the component to be removed
659 <     * @return  <code>true</code> if the argument was a component of this
660 <     *          vector; <code>false</code> otherwise.
602 <     * @see     List#remove(Object)
603 <     * @see     List
659 >     * @return  {@code true} if the argument was a component of this
660 >     *          vector; {@code false} otherwise.
661       */
662      public synchronized boolean removeElement(Object obj) {
663 <        modCount++;
664 <        int i = indexOf(obj);
665 <        if (i >= 0) {
666 <            removeElementAt(i);
667 <            return true;
668 <        }
669 <        return false;
663 >        modCount++;
664 >        int i = indexOf(obj);
665 >        if (i >= 0) {
666 >            removeElementAt(i);
667 >            return true;
668 >        }
669 >        return false;
670      }
671  
672      /**
673 <     * Removes all components from this vector and sets its size to zero.<p>
673 >     * Removes all components from this vector and sets its size to zero.
674       *
675 <     * This method is identical in functionality to the clear method
676 <     * (which is part of the List interface).
620 <     *
621 <     * @see     #clear
622 <     * @see     List
675 >     * <p>This method is identical in functionality to the {@link #clear}
676 >     * method (which is part of the {@link List} interface).
677       */
678      public synchronized void removeAllElements() {
679 +        final Object[] es = elementData;
680 +        for (int to = elementCount, i = elementCount = 0; i < to; i++)
681 +            es[i] = null;
682          modCount++;
626        // Let gc do its work
627        for (int i = 0; i < elementCount; i++)
628            elementData[i] = null;
629
630        elementCount = 0;
683      }
684  
685      /**
686       * Returns a clone of this vector. The copy will contain a
687       * reference to a clone of the internal data array, not a reference
688 <     * to the original internal data array of this <tt>Vector</tt> object.
688 >     * to the original internal data array of this {@code Vector} object.
689       *
690       * @return  a clone of this vector
691       */
692      public synchronized Object clone() {
693 <        try {
694 <            Vector<E> v = (Vector<E>) super.clone();
695 <            v.elementData = Arrays.copyOf(elementData, elementCount);
696 <            v.modCount = 0;
697 <            return v;
698 <        } catch (CloneNotSupportedException e) {
699 <            // this shouldn't happen, since we are Cloneable
700 <            throw new InternalError();
701 <        }
693 >        try {
694 >            @SuppressWarnings("unchecked")
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(e);
702 >        }
703      }
704  
705      /**
# Line 664 | Line 717 | public class Vector<E>
717       * correct order; the runtime type of the returned array is that of the
718       * specified array.  If the Vector fits in the specified array, it is
719       * returned therein.  Otherwise, a new array is allocated with the runtime
720 <     * type of the specified array and the size of this Vector.<p>
720 >     * type of the specified array and the size of this Vector.
721       *
722 <     * If the Vector fits in the specified array with room to spare
722 >     * <p>If the Vector fits in the specified array with room to spare
723       * (i.e., the array has more elements than the Vector),
724       * the element in the array immediately following the end of the
725       * Vector is set to null.  (This is useful in determining the length
726       * of the Vector <em>only</em> if the caller knows that the Vector
727       * does not contain any null elements.)
728       *
729 +     * @param <T> type of array elements. The same type as {@code <E>} or a
730 +     * supertype of {@code <E>}.
731       * @param a the array into which the elements of the Vector are to
732 <     *          be stored, if it is big enough; otherwise, a new array of the
733 <     *          same runtime type is allocated for this purpose.
732 >     *          be stored, if it is big enough; otherwise, a new array of the
733 >     *          same runtime type is allocated for this purpose.
734       * @return an array containing the elements of the Vector
735 <     * @exception ArrayStoreException the runtime type of a is not a supertype
736 <     * of the runtime type of every element in this Vector
735 >     * @throws ArrayStoreException if the runtime type of a, {@code <T>}, is not
736 >     * a supertype of the runtime type, {@code <E>}, of every element in this
737 >     * Vector
738       * @throws NullPointerException if the given array is null
739       * @since 1.2
740       */
741 +    @SuppressWarnings("unchecked")
742      public synchronized <T> T[] toArray(T[] a) {
743          if (a.length < elementCount)
744              return (T[]) Arrays.copyOf(elementData, elementCount, a.getClass());
745  
746 <        System.arraycopy(elementData, 0, a, 0, elementCount);
746 >        System.arraycopy(elementData, 0, a, 0, elementCount);
747  
748          if (a.length > elementCount)
749              a[elementCount] = null;
# Line 696 | Line 753 | public class Vector<E>
753  
754      // Positional Access Operations
755  
756 +    @SuppressWarnings("unchecked")
757 +    E elementData(int index) {
758 +        return (E) elementData[index];
759 +    }
760 +
761 +    @SuppressWarnings("unchecked")
762 +    static <E> E elementAt(Object[] es, int index) {
763 +        return (E) es[index];
764 +    }
765 +
766      /**
767       * Returns the element at the specified position in this Vector.
768       *
769       * @param index index of the element to return
770       * @return object at the specified index
771 <     * @exception ArrayIndexOutOfBoundsException index is out of range (index
772 <     *            &lt; 0 || index &gt;= size())
771 >     * @throws ArrayIndexOutOfBoundsException if the index is out of range
772 >     *            ({@code index < 0 || index >= size()})
773       * @since 1.2
774       */
775      public synchronized E get(int index) {
776 <        if (index >= elementCount)
777 <            throw new ArrayIndexOutOfBoundsException(index);
776 >        if (index >= elementCount)
777 >            throw new ArrayIndexOutOfBoundsException(index);
778  
779 <        return (E)elementData[index];
779 >        return elementData(index);
780      }
781  
782      /**
# Line 719 | Line 786 | public class Vector<E>
786       * @param index index of the element to replace
787       * @param element element to be stored at the specified position
788       * @return the element previously at the specified position
789 <     * @exception ArrayIndexOutOfBoundsException index out of range
790 <     *            (index &lt; 0 || index &gt;= size())
789 >     * @throws ArrayIndexOutOfBoundsException if the index is out of range
790 >     *         ({@code index < 0 || index >= size()})
791       * @since 1.2
792       */
793      public synchronized E set(int index, E element) {
794 <        if (index >= elementCount)
795 <            throw new ArrayIndexOutOfBoundsException(index);
794 >        if (index >= elementCount)
795 >            throw new ArrayIndexOutOfBoundsException(index);
796  
797 <        Object oldValue = elementData[index];
798 <        elementData[index] = element;
799 <        return (E)oldValue;
797 >        E oldValue = elementData(index);
798 >        elementData[index] = element;
799 >        return oldValue;
800 >    }
801 >
802 >    /**
803 >     * This helper method split out from add(E) to keep method
804 >     * bytecode size under 35 (the -XX:MaxInlineSize default value),
805 >     * which helps when add(E) is called in a C1-compiled loop.
806 >     */
807 >    private void add(E e, Object[] elementData, int s) {
808 >        if (s == elementData.length)
809 >            elementData = grow();
810 >        elementData[s] = e;
811 >        elementCount = s + 1;
812 >        // checkInvariants();
813      }
814  
815      /**
816       * Appends the specified element to the end of this Vector.
817       *
818       * @param e element to be appended to this Vector
819 <     * @return <tt>true</tt> (as specified by {@link Collection#add})
819 >     * @return {@code true} (as specified by {@link Collection#add})
820       * @since 1.2
821       */
822      public synchronized boolean add(E e) {
823 <        modCount++;
824 <        ensureCapacityHelper(elementCount + 1);
745 <        elementData[elementCount++] = e;
823 >        modCount++;
824 >        add(e, elementData, elementCount);
825          return true;
826      }
827  
# Line 750 | Line 829 | public class Vector<E>
829       * Removes the first occurrence of the specified element in this Vector
830       * If the Vector does not contain the element, it is unchanged.  More
831       * formally, removes the element with the lowest index i such that
832 <     * <code>(o==null ? get(i)==null : o.equals(get(i)))</code> (if such
832 >     * {@code Objects.equals(o, get(i))} (if such
833       * an element exists).
834       *
835       * @param o element to be removed from this Vector, if present
# Line 768 | Line 847 | public class Vector<E>
847       *
848       * @param index index at which the specified element is to be inserted
849       * @param element element to be inserted
850 <     * @exception ArrayIndexOutOfBoundsException index is out of range
851 <     *            (index &lt; 0 || index &gt; size())
850 >     * @throws ArrayIndexOutOfBoundsException if the index is out of range
851 >     *         ({@code index < 0 || index > size()})
852       * @since 1.2
853       */
854      public void add(int index, E element) {
# Line 781 | Line 860 | public class Vector<E>
860       * Shifts any subsequent elements to the left (subtracts one from their
861       * indices).  Returns the element that was removed from the Vector.
862       *
784     * @exception ArrayIndexOutOfBoundsException index out of range (index
785     *            &lt; 0 || index &gt;= size())
863       * @param index the index of the element to be removed
864       * @return element that was removed
865 +     * @throws ArrayIndexOutOfBoundsException if the index is out of range
866 +     *         ({@code index < 0 || index >= size()})
867       * @since 1.2
868       */
869      public synchronized E remove(int index) {
870 <        modCount++;
871 <        if (index >= elementCount)
872 <            throw new ArrayIndexOutOfBoundsException(index);
873 <        Object oldValue = elementData[index];
795 <
796 <        int numMoved = elementCount - index - 1;
797 <        if (numMoved > 0)
798 <            System.arraycopy(elementData, index+1, elementData, index,
799 <                             numMoved);
800 <        elementData[--elementCount] = null; // Let gc do its work
870 >        modCount++;
871 >        if (index >= elementCount)
872 >            throw new ArrayIndexOutOfBoundsException(index);
873 >        E oldValue = elementData(index);
874  
875 <        return (E)oldValue;
875 >        int numMoved = elementCount - index - 1;
876 >        if (numMoved > 0)
877 >            System.arraycopy(elementData, index+1, elementData, index,
878 >                             numMoved);
879 >        elementData[--elementCount] = null; // Let gc do its work
880 >
881 >        // checkInvariants();
882 >        return oldValue;
883      }
884  
885      /**
# Line 821 | Line 901 | public class Vector<E>
901       * @param   c a collection whose elements will be tested for containment
902       *          in this Vector
903       * @return true if this Vector contains all of the elements in the
904 <     *         specified collection
904 >     *         specified collection
905       * @throws NullPointerException if the specified collection is null
906       */
907      public synchronized boolean containsAll(Collection<?> c) {
# Line 837 | Line 917 | public class Vector<E>
917       * specified Collection is this Vector, and this Vector is nonempty.)
918       *
919       * @param c elements to be inserted into this Vector
920 <     * @return <tt>true</tt> if this Vector changed as a result of the call
920 >     * @return {@code true} if this Vector changed as a result of the call
921       * @throws NullPointerException if the specified collection is null
922       * @since 1.2
923       */
924 <    public synchronized boolean addAll(Collection<? extends E> c) {
845 <        modCount++;
924 >    public boolean addAll(Collection<? extends E> c) {
925          Object[] a = c.toArray();
926 +        modCount++;
927          int numNew = a.length;
928 <        ensureCapacityHelper(elementCount + numNew);
929 <        System.arraycopy(a, 0, elementData, elementCount, numNew);
930 <        elementCount += numNew;
931 <        return numNew != 0;
928 >        if (numNew == 0)
929 >            return false;
930 >        synchronized (this) {
931 >            Object[] elementData = this.elementData;
932 >            final int s = elementCount;
933 >            if (numNew > elementData.length - s)
934 >                elementData = grow(s + numNew);
935 >            System.arraycopy(a, 0, elementData, s, numNew);
936 >            elementCount = s + numNew;
937 >            // checkInvariants();
938 >            return true;
939 >        }
940      }
941  
942      /**
# Line 859 | Line 947 | public class Vector<E>
947       * @return true if this Vector changed as a result of the call
948       * @throws ClassCastException if the types of one or more elements
949       *         in this vector are incompatible with the specified
950 <     *         collection (optional)
950 >     *         collection
951 >     * (<a href="Collection.html#optional-restrictions">optional</a>)
952       * @throws NullPointerException if this vector contains one or more null
953       *         elements and the specified collection does not support null
954 <     *         elements (optional), or if the specified collection is null
954 >     *         elements
955 >     * (<a href="Collection.html#optional-restrictions">optional</a>),
956 >     *         or if the specified collection is null
957       * @since 1.2
958       */
959 <    public synchronized boolean removeAll(Collection<?> c) {
960 <        return super.removeAll(c);
959 >    public boolean removeAll(Collection<?> c) {
960 >        Objects.requireNonNull(c);
961 >        return bulkRemove(e -> c.contains(e));
962      }
963  
964      /**
# Line 879 | Line 971 | public class Vector<E>
971       * @return true if this Vector changed as a result of the call
972       * @throws ClassCastException if the types of one or more elements
973       *         in this vector are incompatible with the specified
974 <     *         collection (optional)
974 >     *         collection
975 >     * (<a href="Collection.html#optional-restrictions">optional</a>)
976       * @throws NullPointerException if this vector contains one or more null
977       *         elements and the specified collection does not support null
978 <     *         elements (optional), or if the specified collection is null
978 >     *         elements
979 >     *         (<a href="Collection.html#optional-restrictions">optional</a>),
980 >     *         or if the specified collection is null
981       * @since 1.2
982       */
983 <    public synchronized boolean retainAll(Collection<?> c)  {
984 <        return super.retainAll(c);
983 >    public boolean retainAll(Collection<?> c) {
984 >        Objects.requireNonNull(c);
985 >        return bulkRemove(e -> !c.contains(e));
986 >    }
987 >
988 >    /**
989 >     * @throws NullPointerException {@inheritDoc}
990 >     */
991 >    @Override
992 >    public boolean removeIf(Predicate<? super E> filter) {
993 >        Objects.requireNonNull(filter);
994 >        return bulkRemove(filter);
995 >    }
996 >
997 >    // A tiny bit set implementation
998 >
999 >    private static long[] nBits(int n) {
1000 >        return new long[((n - 1) >> 6) + 1];
1001 >    }
1002 >    private static void setBit(long[] bits, int i) {
1003 >        bits[i >> 6] |= 1L << i;
1004 >    }
1005 >    private static boolean isClear(long[] bits, int i) {
1006 >        return (bits[i >> 6] & (1L << i)) == 0;
1007 >    }
1008 >
1009 >    private synchronized boolean bulkRemove(Predicate<? super E> filter) {
1010 >        int expectedModCount = modCount;
1011 >        final Object[] es = elementData;
1012 >        final int end = elementCount;
1013 >        int i;
1014 >        // Optimize for initial run of survivors
1015 >        for (i = 0; i < end && !filter.test(elementAt(es, i)); i++)
1016 >            ;
1017 >        // Tolerate predicates that reentrantly access the collection for
1018 >        // read (but writers still get CME), so traverse once to find
1019 >        // elements to delete, a second pass to physically expunge.
1020 >        if (i < end) {
1021 >            final int beg = i;
1022 >            final long[] deathRow = nBits(end - beg);
1023 >            deathRow[0] = 1L;   // set bit 0
1024 >            for (i = beg + 1; i < end; i++)
1025 >                if (filter.test(elementAt(es, i)))
1026 >                    setBit(deathRow, i - beg);
1027 >            if (modCount != expectedModCount)
1028 >                throw new ConcurrentModificationException();
1029 >            expectedModCount++;
1030 >            modCount++;
1031 >            int w = beg;
1032 >            for (i = beg; i < end; i++)
1033 >                if (isClear(deathRow, i - beg))
1034 >                    es[w++] = es[i];
1035 >            for (i = elementCount = w; i < end; i++)
1036 >                es[i] = null;
1037 >            // checkInvariants();
1038 >            return true;
1039 >        } else {
1040 >            if (modCount != expectedModCount)
1041 >                throw new ConcurrentModificationException();
1042 >            // checkInvariants();
1043 >            return false;
1044 >        }
1045      }
1046  
1047      /**
# Line 900 | Line 1055 | public class Vector<E>
1055       * @param index index at which to insert the first element from the
1056       *              specified collection
1057       * @param c elements to be inserted into this Vector
1058 <     * @return <tt>true</tt> if this Vector changed as a result of the call
1059 <     * @exception ArrayIndexOutOfBoundsException index out of range (index
1060 <     *            &lt; 0 || index &gt; size())
1058 >     * @return {@code true} if this Vector changed as a result of the call
1059 >     * @throws ArrayIndexOutOfBoundsException if the index is out of range
1060 >     *         ({@code index < 0 || index > size()})
1061       * @throws NullPointerException if the specified collection is null
1062       * @since 1.2
1063       */
1064      public synchronized boolean addAll(int index, Collection<? extends E> c) {
1065 <        modCount++;
1066 <        if (index < 0 || index > elementCount)
912 <            throw new ArrayIndexOutOfBoundsException(index);
1065 >        if (index < 0 || index > elementCount)
1066 >            throw new ArrayIndexOutOfBoundsException(index);
1067  
1068          Object[] a = c.toArray();
1069 <        int numNew = a.length;
1070 <        ensureCapacityHelper(elementCount + numNew);
1071 <
1072 <        int numMoved = elementCount - index;
1073 <        if (numMoved > 0)
1074 <            System.arraycopy(elementData, index, elementData, index + numNew,
1075 <                             numMoved);
1076 <
1069 >        modCount++;
1070 >        int numNew = a.length;
1071 >        if (numNew == 0)
1072 >            return false;
1073 >        Object[] elementData = this.elementData;
1074 >        final int s = elementCount;
1075 >        if (numNew > elementData.length - s)
1076 >            elementData = grow(s + numNew);
1077 >
1078 >        int numMoved = s - index;
1079 >        if (numMoved > 0)
1080 >            System.arraycopy(elementData, index,
1081 >                             elementData, index + numNew,
1082 >                             numMoved);
1083          System.arraycopy(a, 0, elementData, index, numNew);
1084 <        elementCount += numNew;
1085 <        return numNew != 0;
1084 >        elementCount = s + numNew;
1085 >        // checkInvariants();
1086 >        return true;
1087      }
1088  
1089      /**
1090       * Compares the specified Object with this Vector for equality.  Returns
1091       * true if and only if the specified Object is also a List, both Lists
1092       * have the same size, and all corresponding pairs of elements in the two
1093 <     * Lists are <em>equal</em>.  (Two elements <code>e1</code> and
1094 <     * <code>e2</code> are <em>equal</em> if <code>(e1==null ? e2==null :
1095 <     * e1.equals(e2))</code>.)  In other words, two Lists are defined to be
1093 >     * Lists are <em>equal</em>.  (Two elements {@code e1} and
1094 >     * {@code e2} are <em>equal</em> if {@code Objects.equals(e1, e2)}.)
1095 >     * In other words, two Lists are defined to be
1096       * equal if they contain the same elements in the same order.
1097       *
1098       * @param o the Object to be compared for equality with this Vector
# Line 962 | Line 1123 | public class Vector<E>
1123       * equal, the returned List is empty.)  The returned List is backed by this
1124       * List, so changes in the returned List are reflected in this List, and
1125       * vice-versa.  The returned List supports all of the optional List
1126 <     * operations supported by this List.<p>
1126 >     * operations supported by this List.
1127       *
1128 <     * This method eliminates the need for explicit range operations (of
1129 <     * the sort that commonly exist for arrays).   Any operation that expects
1128 >     * <p>This method eliminates the need for explicit range operations (of
1129 >     * the sort that commonly exist for arrays).  Any operation that expects
1130       * a List can be used as a range operation by operating on a subList view
1131       * instead of a whole List.  For example, the following idiom
1132       * removes a range of elements from a List:
1133       * <pre>
1134 <     *      list.subList(from, to).clear();
1134 >     *      list.subList(from, to).clear();
1135       * </pre>
1136       * Similar idioms may be constructed for indexOf and lastIndexOf,
1137       * and all of the algorithms in the Collections class can be applied to
1138 <     * a subList.<p>
1138 >     * a subList.
1139       *
1140 <     * The semantics of the List returned by this method become undefined if
1140 >     * <p>The semantics of the List returned by this method become undefined if
1141       * the backing list (i.e., this List) is <i>structurally modified</i> in
1142       * any way other than via the returned List.  (Structural modifications are
1143       * those that change the size of the List, or otherwise perturb it in such
# Line 985 | Line 1146 | public class Vector<E>
1146       * @param fromIndex low endpoint (inclusive) of the subList
1147       * @param toIndex high endpoint (exclusive) of the subList
1148       * @return a view of the specified range within this List
1149 <     * @throws IndexOutOfBoundsException endpoint index value out of range
1150 <     *         <code>(fromIndex &lt; 0 || toIndex &gt; size)</code>
1151 <     * @throws IllegalArgumentException endpoint indices out of order
1152 <     *         <code>(fromIndex &gt; toIndex)</code>
1149 >     * @throws IndexOutOfBoundsException if an endpoint index value is out of range
1150 >     *         {@code (fromIndex < 0 || toIndex > size)}
1151 >     * @throws IllegalArgumentException if the endpoint indices are out of order
1152 >     *         {@code (fromIndex > toIndex)}
1153       */
1154      public synchronized List<E> subList(int fromIndex, int toIndex) {
1155          return Collections.synchronizedList(super.subList(fromIndex, toIndex),
# Line 996 | Line 1157 | public class Vector<E>
1157      }
1158  
1159      /**
1160 <     * Removes from this List all of the elements whose index is between
1161 <     * fromIndex, inclusive and toIndex, exclusive.  Shifts any succeeding
1162 <     * elements to the left (reduces their index).
1163 <     * This call shortens the ArrayList by (toIndex - fromIndex) elements.  (If
1164 <     * toIndex==fromIndex, this operation has no effect.)
1004 <     *
1005 <     * @param fromIndex index of first element to be removed
1006 <     * @param toIndex index after last element to be removed
1160 >     * Removes from this list all of the elements whose index is between
1161 >     * {@code fromIndex}, inclusive, and {@code toIndex}, exclusive.
1162 >     * Shifts any succeeding elements to the left (reduces their index).
1163 >     * This call shortens the list by {@code (toIndex - fromIndex)} elements.
1164 >     * (If {@code toIndex==fromIndex}, this operation has no effect.)
1165       */
1166      protected synchronized void removeRange(int fromIndex, int toIndex) {
1167 <        modCount++;
1168 <        int numMoved = elementCount - toIndex;
1169 <        System.arraycopy(elementData, toIndex, elementData, fromIndex,
1170 <                         numMoved);
1167 >        modCount++;
1168 >        shiftTailOverGap(elementData, fromIndex, toIndex);
1169 >        // checkInvariants();
1170 >    }
1171  
1172 <        // Let gc do its work
1173 <        int newElementCount = elementCount - (toIndex-fromIndex);
1174 <        while (elementCount != newElementCount)
1175 <            elementData[--elementCount] = null;
1172 >    /** Erases the gap from lo to hi, by sliding down following elements. */
1173 >    private void shiftTailOverGap(Object[] es, int lo, int hi) {
1174 >        System.arraycopy(es, hi, es, lo, elementCount - hi);
1175 >        for (int to = elementCount, i = (elementCount -= hi - lo); i < to; i++)
1176 >            es[i] = null;
1177      }
1178  
1179      /**
1180 <     * Save the state of the <tt>Vector</tt> instance to a stream (that
1181 <     * is, serialize it).  This method is present merely for synchronization.
1182 <     * It just calls the default writeObject method.
1183 <     */
1184 <    private synchronized void writeObject(java.io.ObjectOutputStream s)
1185 <        throws java.io.IOException
1186 <    {
1187 <        s.defaultWriteObject();
1180 >     * Saves the state of the {@code Vector} instance to a stream
1181 >     * (that is, serializes it).
1182 >     * This method performs synchronization to ensure the consistency
1183 >     * of the serialized data.
1184 >     *
1185 >     * @param s the stream
1186 >     * @throws java.io.IOException if an I/O error occurs
1187 >     */
1188 >    private void writeObject(java.io.ObjectOutputStream s)
1189 >            throws java.io.IOException {
1190 >        final java.io.ObjectOutputStream.PutField fields = s.putFields();
1191 >        final Object[] data;
1192 >        synchronized (this) {
1193 >            fields.put("capacityIncrement", capacityIncrement);
1194 >            fields.put("elementCount", elementCount);
1195 >            data = elementData.clone();
1196 >        }
1197 >        fields.put("elementData", data);
1198 >        s.writeFields();
1199      }
1200  
1201      /**
1202 <     * Returns a list-iterator of the elements in this list (in proper
1202 >     * Returns a list iterator over the elements in this list (in proper
1203       * sequence), starting at the specified position in the list.
1204 <     * Obeys the general contract of <tt>List.listIterator(int)</tt>.<p>
1204 >     * The specified index indicates the first element that would be
1205 >     * returned by an initial call to {@link ListIterator#next next}.
1206 >     * An initial call to {@link ListIterator#previous previous} would
1207 >     * return the element with the specified index minus one.
1208 >     *
1209 >     * <p>The returned list iterator is <a href="#fail-fast"><i>fail-fast</i></a>.
1210       *
1036     * The list-iterator is <i>fail-fast</i>: if the list is structurally
1037     * modified at any time after the Iterator is created, in any way except
1038     * through the list-iterator's own <tt>remove</tt> or <tt>add</tt>
1039     * methods, the list-iterator will throw a
1040     * <tt>ConcurrentModificationException</tt>.  Thus, in the face of
1041     * concurrent modification, the iterator fails quickly and cleanly, rather
1042     * than risking arbitrary, non-deterministic behavior at an undetermined
1043     * time in the future.
1044     *
1045     * @param index index of the first element to be returned from the
1046     *              list-iterator (by a call to <tt>next</tt>)
1047     * @return a ListIterator of the elements in this list (in proper
1048     *         sequence), starting at the specified position in the list
1211       * @throws IndexOutOfBoundsException {@inheritDoc}
1050     * @see List#listIterator(int)
1212       */
1213      public synchronized ListIterator<E> listIterator(int index) {
1214 <        if (index < 0 || index > elementCount)
1214 >        if (index < 0 || index > elementCount)
1215              throw new IndexOutOfBoundsException("Index: "+index);
1216 <        return new VectorIterator(index);
1216 >        return new ListItr(index);
1217 >    }
1218 >
1219 >    /**
1220 >     * Returns a list iterator over the elements in this list (in proper
1221 >     * sequence).
1222 >     *
1223 >     * <p>The returned list iterator is <a href="#fail-fast"><i>fail-fast</i></a>.
1224 >     *
1225 >     * @see #listIterator(int)
1226 >     */
1227 >    public synchronized ListIterator<E> listIterator() {
1228 >        return new ListItr(0);
1229      }
1230  
1231      /**
1232       * Returns an iterator over the elements in this list in proper sequence.
1233       *
1234 +     * <p>The returned iterator is <a href="#fail-fast"><i>fail-fast</i></a>.
1235 +     *
1236       * @return an iterator over the elements in this list in proper sequence
1237       */
1238      public synchronized Iterator<E> iterator() {
1239 <        return new VectorIterator(0);
1239 >        return new Itr();
1240      }
1241  
1242      /**
1243 <     * A streamlined version of AbstractList.Itr.
1243 >     * An optimized version of AbstractList.Itr
1244       */
1245 <    final class VectorIterator implements ListIterator<E> {
1246 <        int cursor;           // index of next element to return;
1247 <        int lastRet;          // index of last element, or -1 if no such
1248 <        int expectedModCount; // to check for CME
1245 >    private class Itr implements Iterator<E> {
1246 >        int cursor;       // index of next element to return
1247 >        int lastRet = -1; // index of last element returned; -1 if no such
1248 >        int expectedModCount = modCount;
1249 >
1250 >        public boolean hasNext() {
1251 >            // Racy but within spec, since modifications are checked
1252 >            // within or after synchronization in next/previous
1253 >            return cursor != elementCount;
1254 >        }
1255 >
1256 >        public E next() {
1257 >            synchronized (Vector.this) {
1258 >                checkForComodification();
1259 >                int i = cursor;
1260 >                if (i >= elementCount)
1261 >                    throw new NoSuchElementException();
1262 >                cursor = i + 1;
1263 >                return elementData(lastRet = i);
1264 >            }
1265 >        }
1266  
1267 <        VectorIterator(int index) {
1268 <            cursor = index;
1267 >        public void remove() {
1268 >            if (lastRet == -1)
1269 >                throw new IllegalStateException();
1270 >            synchronized (Vector.this) {
1271 >                checkForComodification();
1272 >                Vector.this.remove(lastRet);
1273 >                expectedModCount = modCount;
1274 >            }
1275 >            cursor = lastRet;
1276              lastRet = -1;
1277 <            expectedModCount = modCount;
1079 <        }
1277 >        }
1278  
1279 <        public boolean hasNext() {
1280 <            // Racy but within spec and backwards-compatible
1281 <            return cursor < elementCount;
1282 <        }
1283 <
1284 <        public boolean hasPrevious() {
1285 <            return cursor > 0;
1286 <        }
1089 <
1090 <        public int nextIndex() {
1091 <            return cursor;
1092 <        }
1093 <
1094 <        public int previousIndex() {
1095 <            return cursor - 1;
1096 <        }
1097 <
1098 <        public E next() {
1099 <            synchronized(Vector.this) {
1100 <                if (expectedModCount == modCount) {
1101 <                    int i = cursor;
1102 <                    if (i < elementCount) {
1103 <                        try {
1104 <                            E e = (E)elementData[i];
1105 <                            lastRet = i;
1106 <                            cursor = i + 1;
1107 <                            return e;
1108 <                        } catch (IndexOutOfBoundsException fallthrough) {
1109 <                        }
1110 <                    }
1279 >        @Override
1280 >        public void forEachRemaining(Consumer<? super E> action) {
1281 >            Objects.requireNonNull(action);
1282 >            synchronized (Vector.this) {
1283 >                final int size = elementCount;
1284 >                int i = cursor;
1285 >                if (i >= size) {
1286 >                    return;
1287                  }
1288 <                // Prefer reporting CME if applicable on failures
1289 <                if (expectedModCount == modCount)
1290 <                    throw new NoSuchElementException();
1291 <                throw new ConcurrentModificationException();
1288 >                final Object[] es = elementData;
1289 >                if (i >= es.length)
1290 >                    throw new ConcurrentModificationException();
1291 >                while (i < size && modCount == expectedModCount)
1292 >                    action.accept(elementAt(es, i++));
1293 >                // update once at end of iteration to reduce heap write traffic
1294 >                cursor = i;
1295 >                lastRet = i - 1;
1296 >                checkForComodification();
1297              }
1298 <        }
1298 >        }
1299 >
1300 >        final void checkForComodification() {
1301 >            if (modCount != expectedModCount)
1302 >                throw new ConcurrentModificationException();
1303 >        }
1304 >    }
1305 >
1306 >    /**
1307 >     * An optimized version of AbstractList.ListItr
1308 >     */
1309 >    final class ListItr extends Itr implements ListIterator<E> {
1310 >        ListItr(int index) {
1311 >            super();
1312 >            cursor = index;
1313 >        }
1314 >
1315 >        public boolean hasPrevious() {
1316 >            return cursor != 0;
1317 >        }
1318 >
1319 >        public int nextIndex() {
1320 >            return cursor;
1321 >        }
1322 >
1323 >        public int previousIndex() {
1324 >            return cursor - 1;
1325 >        }
1326  
1327          public E previous() {
1328 <            synchronized(Vector.this) {
1329 <                if (expectedModCount == modCount) {
1330 <                    int i = cursor - 1;
1331 <                    if (i < elementCount) {
1124 <                        try {
1125 <                            E e = (E)elementData[i];
1126 <                            lastRet = i;
1127 <                            cursor = i;
1128 <                            return e;
1129 <                        } catch (IndexOutOfBoundsException fallthrough) {
1130 <                        }
1131 <                    }
1132 <                }
1133 <                if (expectedModCount == modCount)
1328 >            synchronized (Vector.this) {
1329 >                checkForComodification();
1330 >                int i = cursor - 1;
1331 >                if (i < 0)
1332                      throw new NoSuchElementException();
1333 <                throw new ConcurrentModificationException();
1333 >                cursor = i;
1334 >                return elementData(lastRet = i);
1335              }
1336          }
1337  
1338 <        public void remove() {
1339 <            if (lastRet < 0)
1340 <                throw new IllegalStateException();
1341 <            synchronized(Vector.this) {
1342 <                if (modCount != expectedModCount)
1343 <                    throw new ConcurrentModificationException();
1145 <                Vector.this.remove(lastRet);
1146 <                if (lastRet < cursor)
1147 <                    cursor--;
1148 <                lastRet = -1;
1149 <                expectedModCount = modCount;
1338 >        public void set(E e) {
1339 >            if (lastRet == -1)
1340 >                throw new IllegalStateException();
1341 >            synchronized (Vector.this) {
1342 >                checkForComodification();
1343 >                Vector.this.set(lastRet, e);
1344              }
1345 <        }
1345 >        }
1346  
1347 <        public void set(E e) {
1348 <            if (lastRet < 0)
1349 <                throw new IllegalStateException();
1350 <            synchronized(Vector.this) {
1351 <                if (modCount != expectedModCount)
1158 <                    throw new ConcurrentModificationException();
1159 <                Vector.this.set(lastRet, e);
1347 >        public void add(E e) {
1348 >            int i = cursor;
1349 >            synchronized (Vector.this) {
1350 >                checkForComodification();
1351 >                Vector.this.add(i, e);
1352                  expectedModCount = modCount;
1353              }
1354 <        }
1354 >            cursor = i + 1;
1355 >            lastRet = -1;
1356 >        }
1357 >    }
1358 >
1359 >    /**
1360 >     * @throws NullPointerException {@inheritDoc}
1361 >     */
1362 >    @Override
1363 >    public synchronized void forEach(Consumer<? super E> action) {
1364 >        Objects.requireNonNull(action);
1365 >        final int expectedModCount = modCount;
1366 >        final Object[] es = elementData;
1367 >        final int size = elementCount;
1368 >        for (int i = 0; modCount == expectedModCount && i < size; i++)
1369 >            action.accept(elementAt(es, i));
1370 >        if (modCount != expectedModCount)
1371 >            throw new ConcurrentModificationException();
1372 >        // checkInvariants();
1373 >    }
1374  
1375 <        public void add(E e) {
1376 <            synchronized(Vector.this) {
1375 >    /**
1376 >     * @throws NullPointerException {@inheritDoc}
1377 >     */
1378 >    @Override
1379 >    public synchronized void replaceAll(UnaryOperator<E> operator) {
1380 >        Objects.requireNonNull(operator);
1381 >        final int expectedModCount = modCount;
1382 >        final Object[] es = elementData;
1383 >        final int size = elementCount;
1384 >        for (int i = 0; modCount == expectedModCount && i < size; i++)
1385 >            es[i] = operator.apply(elementAt(es, i));
1386 >        if (modCount != expectedModCount)
1387 >            throw new ConcurrentModificationException();
1388 >        modCount++;
1389 >        // checkInvariants();
1390 >    }
1391 >
1392 >    @SuppressWarnings("unchecked")
1393 >    @Override
1394 >    public synchronized void sort(Comparator<? super E> c) {
1395 >        final int expectedModCount = modCount;
1396 >        Arrays.sort((E[]) elementData, 0, elementCount, c);
1397 >        if (modCount != expectedModCount)
1398 >            throw new ConcurrentModificationException();
1399 >        modCount++;
1400 >        // checkInvariants();
1401 >    }
1402 >
1403 >    /**
1404 >     * Creates a <em><a href="Spliterator.html#binding">late-binding</a></em>
1405 >     * and <em>fail-fast</em> {@link Spliterator} over the elements in this
1406 >     * list.
1407 >     *
1408 >     * <p>The {@code Spliterator} reports {@link Spliterator#SIZED},
1409 >     * {@link Spliterator#SUBSIZED}, and {@link Spliterator#ORDERED}.
1410 >     * Overriding implementations should document the reporting of additional
1411 >     * characteristic values.
1412 >     *
1413 >     * @return a {@code Spliterator} over the elements in this list
1414 >     * @since 1.8
1415 >     */
1416 >    @Override
1417 >    public Spliterator<E> spliterator() {
1418 >        return new VectorSpliterator(null, 0, -1, 0);
1419 >    }
1420 >
1421 >    /** Similar to ArrayList Spliterator */
1422 >    final class VectorSpliterator implements Spliterator<E> {
1423 >        private Object[] array;
1424 >        private int index; // current index, modified on advance/split
1425 >        private int fence; // -1 until used; then one past last index
1426 >        private int expectedModCount; // initialized when fence set
1427 >
1428 >        /** Creates new spliterator covering the given range. */
1429 >        VectorSpliterator(Object[] array, int origin, int fence,
1430 >                          int expectedModCount) {
1431 >            this.array = array;
1432 >            this.index = origin;
1433 >            this.fence = fence;
1434 >            this.expectedModCount = expectedModCount;
1435 >        }
1436 >
1437 >        private int getFence() { // initialize on first use
1438 >            int hi;
1439 >            if ((hi = fence) < 0) {
1440 >                synchronized (Vector.this) {
1441 >                    array = elementData;
1442 >                    expectedModCount = modCount;
1443 >                    hi = fence = elementCount;
1444 >                }
1445 >            }
1446 >            return hi;
1447 >        }
1448 >
1449 >        public Spliterator<E> trySplit() {
1450 >            int hi = getFence(), lo = index, mid = (lo + hi) >>> 1;
1451 >            return (lo >= mid) ? null :
1452 >                new VectorSpliterator(array, lo, index = mid, expectedModCount);
1453 >        }
1454 >
1455 >        @SuppressWarnings("unchecked")
1456 >        public boolean tryAdvance(Consumer<? super E> action) {
1457 >            Objects.requireNonNull(action);
1458 >            int i;
1459 >            if (getFence() > (i = index)) {
1460 >                index = i + 1;
1461 >                action.accept((E)array[i]);
1462                  if (modCount != expectedModCount)
1463                      throw new ConcurrentModificationException();
1464 <                Vector.this.add(cursor++, e);
1169 <                lastRet = -1;
1170 <                expectedModCount = modCount;
1464 >                return true;
1465              }
1466 <        }
1466 >            return false;
1467 >        }
1468 >
1469 >        @SuppressWarnings("unchecked")
1470 >        public void forEachRemaining(Consumer<? super E> action) {
1471 >            Objects.requireNonNull(action);
1472 >            final int hi = getFence();
1473 >            final Object[] a = array;
1474 >            int i;
1475 >            for (i = index, index = hi; i < hi; i++)
1476 >                action.accept((E) a[i]);
1477 >            if (modCount != expectedModCount)
1478 >                throw new ConcurrentModificationException();
1479 >        }
1480 >
1481 >        public long estimateSize() {
1482 >            return getFence() - index;
1483 >        }
1484 >
1485 >        public int characteristics() {
1486 >            return Spliterator.ORDERED | Spliterator.SIZED | Spliterator.SUBSIZED;
1487 >        }
1488      }
1489  
1490 +    void checkInvariants() {
1491 +        // assert elementCount >= 0;
1492 +        // assert elementCount == elementData.length || elementData[elementCount] == null;
1493 +    }
1494   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines