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

Comparing jsr166/src/main/java/util/ArrayList.java (file contents):
Revision 1.46 by jsr166, Fri Dec 2 06:41:08 2016 UTC vs.
Revision 1.48 by jsr166, Thu Dec 8 05:02:32 2016 UTC

# Line 578 | Line 578 | public class ArrayList<E> extends Abstra
578       */
579      public void clear() {
580          modCount++;
581 <        Arrays.fill(elementData, 0, size, null);
582 <        size = 0;
581 >        final Object[] es = elementData;
582 >        for (int to = size, i = size = 0; i < to; i++)
583 >            es[i] = null;
584      }
585  
586      /**
# Line 669 | Line 670 | public class ArrayList<E> extends Abstra
670                      outOfBoundsMsg(fromIndex, toIndex));
671          }
672          modCount++;
673 <        final Object[] es = elementData;
673 <        final int oldSize = size;
674 <        System.arraycopy(es, toIndex, es, fromIndex, oldSize - toIndex);
675 <        Arrays.fill(es, size -= (toIndex - fromIndex), oldSize, null);
673 >        shiftTailOverGap(elementData, fromIndex, toIndex);
674          // checkInvariants();
675      }
676  
677 +    /** Erases the gap from lo to hi, by sliding down following elements. */
678 +    private void shiftTailOverGap(Object[] es, int lo, int hi) {
679 +        System.arraycopy(es, hi, es, lo, size - hi);
680 +        for (int to = size, i = (size -= hi - lo); i < to; i++)
681 +            es[i] = null;
682 +    }
683 +
684      /**
685       * A version of rangeCheck used by add and addAll.
686       */
# Line 761 | Line 766 | public class ArrayList<E> extends Abstra
766                  w += end - r;
767                  throw ex;
768              } finally {
769 <                final int oldSize = size, deleted = end - w;
770 <                modCount += deleted;
766 <                System.arraycopy(es, end, es, w, oldSize - end);
767 <                Arrays.fill(es, size -= deleted, oldSize, null);
769 >                modCount += end - w;
770 >                shiftTailOverGap(es, w, end);
771              }
772          }
773          // checkInvariants();
# Line 1368 | Line 1371 | public class ArrayList<E> extends Abstra
1371          }
1372      }
1373  
1374 +    /**
1375 +     * @throws NullPointerException {@inheritDoc}
1376 +     */
1377      @Override
1378      public void forEach(Consumer<? super E> action) {
1379          Objects.requireNonNull(action);
# Line 1519 | Line 1525 | public class ArrayList<E> extends Abstra
1525          return (bits[i >> 6] & (1L << i)) == 0;
1526      }
1527  
1528 +    /**
1529 +     * @throws NullPointerException {@inheritDoc}
1530 +     */
1531      @Override
1532      public boolean removeIf(Predicate<? super E> filter) {
1533          return removeIf(filter, 0, size);
# Line 1553 | Line 1562 | public class ArrayList<E> extends Abstra
1562              for (i = beg; i < end; i++)
1563                  if (isClear(deathRow, i - beg))
1564                      es[w++] = es[i];
1565 <            final int oldSize = size;
1557 <            System.arraycopy(es, end, es, w, oldSize - end);
1558 <            Arrays.fill(es, size -= (end - w), oldSize, null);
1565 >            shiftTailOverGap(es, w, end);
1566              // checkInvariants();
1567              return true;
1568          } else {

Diff Legend

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