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.42 by jsr166, Wed Dec 21 05:14:01 2016 UTC vs.
Revision 1.48 by jsr166, Wed Mar 28 02:50:41 2018 UTC

# Line 1 | Line 1
1   /*
2 < * Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
2 > * Copyright (c) 1994, 2018, Oracle and/or its affiliates. All rights reserved.
3   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4   *
5   * This code is free software; you can redistribute it and/or modify it
# Line 70 | Line 70 | import java.util.function.UnaryOperator;
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">
73 > * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework">
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
# Line 307 | Line 307 | public class Vector<E>
307          if (newSize > elementData.length)
308              grow(newSize);
309          final Object[] es = elementData;
310 <        for (int to = elementCount, i = elementCount = newSize; i < to; i++)
310 >        for (int to = elementCount, i = newSize; i < to; i++)
311              es[i] = null;
312 +        elementCount = newSize;
313      }
314  
315      /**
# Line 1026 | Line 1027 | public class Vector<E>
1027                      setBit(deathRow, i - beg);
1028              if (modCount != expectedModCount)
1029                  throw new ConcurrentModificationException();
1029 –            expectedModCount++;
1030              modCount++;
1031              int w = beg;
1032              for (i = beg; i < end; i++)
# Line 1425 | Line 1425 | public class Vector<E>
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 */
1428 >        /** Creates new spliterator covering the given range. */
1429          VectorSpliterator(Object[] array, int origin, int fence,
1430                            int expectedModCount) {
1431              this.array = array;
# Line 1454 | Line 1454 | public class Vector<E>
1454  
1455          @SuppressWarnings("unchecked")
1456          public boolean tryAdvance(Consumer<? super E> action) {
1457 +            Objects.requireNonNull(action);
1458              int i;
1458 –            if (action == null)
1459 –                throw new NullPointerException();
1459              if (getFence() > (i = index)) {
1460                  index = i + 1;
1461                  action.accept((E)array[i]);
# Line 1469 | Line 1468 | public class Vector<E>
1468  
1469          @SuppressWarnings("unchecked")
1470          public void forEachRemaining(Consumer<? super E> action) {
1471 <            if (action == null)
1473 <                throw new NullPointerException();
1471 >            Objects.requireNonNull(action);
1472              final int hi = getFence();
1473              final Object[] a = array;
1474              int i;

Diff Legend

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