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.8 by jsr166, Sat Nov 26 20:39:51 2005 UTC vs.
Revision 1.21 by jsr166, Sun May 28 23:36:29 2006 UTC

# Line 1 | Line 1
1   /*
2   * %W% %E%
3   *
4 < * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
4 > * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
5   * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
6   */
7  
8   package java.util;
9 – import java.util.*; // for javadoc (till 6280605 is fixed)
9  
10   /**
11   * Resizable-array implementation of the <tt>List</tt> interface.  Implements
# Line 67 | Line 66 | import java.util.*; // for javadoc (till
66   * should be used only to detect bugs.</i><p>
67   *
68   * This class is a member of the
69 < * <a href="{@docRoot}/../guide/collections/index.html">
69 > * <a href="{@docRoot}/../technotes/guides/collections/index.html">
70   * Java Collections Framework</a>.
71   *
72   * @author  Josh Bloch
# Line 123 | Line 122 | public class ArrayList<E> extends Abstra
122      /**
123       * Constructs a list containing the elements of the specified
124       * collection, in the order they are returned by the collection's
125 <     * iterator.  The <tt>ArrayList</tt> instance has an initial capacity of
127 <     * 110% the size of the specified collection.
125 >     * iterator.
126       *
127       * @param c the collection whose elements are to be placed into this list
128       * @throws NullPointerException if the specified collection is null
129       */
130      public ArrayList(Collection<? extends E> c) {
131 <        int size = c.size();
132 <        // 10% for growth
133 <        int cap = ((size/10)+1)*11;
134 <        if (cap > 0) {
135 <            Object[] a = new Object[cap];
138 <            a[size] = a[size+1] = UNALLOCATED;
139 <            Object[] b = c.toArray(a);
140 <            if (b[size] == null && b[size+1] == UNALLOCATED) {
141 <                b[size+1] = null;
142 <                elementData = b;
143 <                this.size = size;
144 <                return;
145 <            }
146 <        }
147 <        initFromConcurrentlyMutating(c);
131 >        elementData = c.toArray();
132 >        size = elementData.length;
133 >        // c.toArray might (incorrectly) not return Object[] (see 6260652)
134 >        if (elementData.getClass() != Object[].class)
135 >            elementData = Arrays.copyOf(elementData, size, Object[].class);
136      }
137  
138      private void initFromConcurrentlyMutating(Collection<? extends E> c) {
# Line 189 | Line 177 | public class ArrayList<E> extends Abstra
177       * @param minCapacity the desired minimum capacity
178       */
179      private void growArray(int minCapacity) {
180 <        if (minCapacity < 0) throw new OutOfMemoryError(); // int overflow
180 >        if (minCapacity < 0) // overflow
181 >            throw new OutOfMemoryError();
182          int oldCapacity = elementData.length;
183          // Double size if small; else grow by 50%
184 <        int newCapacity = ((oldCapacity < 64)?
185 <                           (oldCapacity * 2):
186 <                           ((oldCapacity * 3)/2));
184 >        int newCapacity = ((oldCapacity < 64) ?
185 >                           ((oldCapacity + 1) * 2) :
186 >                           ((oldCapacity / 2) * 3));
187 >        if (newCapacity < 0) // overflow
188 >            newCapacity = Integer.MAX_VALUE;
189          if (newCapacity < minCapacity)
190              newCapacity = minCapacity;
191          elementData = Arrays.copyOf(elementData, newCapacity);
# Line 346 | Line 337 | public class ArrayList<E> extends Abstra
337      /**
338       * Throws an appropriate exception for indexing errors.
339       */
340 <    private static void rangeException(int i, int s) {
340 >    private static void indexOutOfBounds(int i, int s) {
341          throw new IndexOutOfBoundsException("Index: " + i + ", Size: " + s);
342      }
343  
# Line 359 | Line 350 | public class ArrayList<E> extends Abstra
350       */
351      public E get(int index) {
352          if (index >= size)
353 <            rangeException(index, size);
354 <        return (E)elementData[index];
353 >            indexOutOfBounds(index, size);
354 >        return (E) elementData[index];
355      }
356  
357      /**
# Line 374 | Line 365 | public class ArrayList<E> extends Abstra
365       */
366      public E set(int index, E element) {
367          if (index >= size)
368 <            rangeException(index, size);
378 <
368 >            indexOutOfBounds(index, size);
369          E oldValue = (E) elementData[index];
370          elementData[index] = element;
371          return oldValue;
# Line 393 | Line 383 | public class ArrayList<E> extends Abstra
383          if (s >= elementData.length)
384              growArray(s + 1);
385          elementData[s] = e;
386 <        size = s + 1;
387 <        return true;
386 >        size = s + 1;
387 >        return true;
388      }
389  
390      /**
# Line 409 | Line 399 | public class ArrayList<E> extends Abstra
399      public void add(int index, E element) {
400          int s = size;
401          if (index > s || index < 0)
402 <            rangeException(index, s);
402 >            indexOutOfBounds(index, s);
403          modCount++;
404          if (s >= elementData.length)
405              growArray(s + 1);
406 <        System.arraycopy(elementData, index,
407 <                         elementData, index + 1, s - index);
406 >        System.arraycopy(elementData, index,
407 >                         elementData, index + 1, s - index);
408          elementData[index] = element;
409          size = s + 1;
410      }
# Line 431 | Line 421 | public class ArrayList<E> extends Abstra
421      public E remove(int index) {
422          int s = size - 1;
423          if (index > s)
424 <            rangeException(index, size);
424 >            indexOutOfBounds(index, size);
425          modCount++;
426 <        E oldValue = (E)elementData[index];
426 >        E oldValue = (E) elementData[index];
427          int numMoved = s - index;
428          if (numMoved > 0)
429 <            System.arraycopy(elementData, index + 1,
430 <                             elementData, index, numMoved);
429 >            System.arraycopy(elementData, index + 1,
430 >                             elementData, index, numMoved);
431          elementData[s] = null;
432 <        size = s;
432 >        size = s;
433          return oldValue;
434      }
435  
# Line 539 | Line 529 | public class ArrayList<E> extends Abstra
529       */
530      public boolean addAll(int index, Collection<? extends E> c) {
531          if (index > size || index < 0)
532 <            throw new IndexOutOfBoundsException(
543 <                "Index: " + index + ", Size: " + size);
532 >            indexOutOfBounds(index, size);
533  
534          Object[] a = c.toArray();
535          int numNew = a.length;
# Line 602 | Line 591 | public class ArrayList<E> extends Abstra
591          for (int i=0; i<size; i++)
592              s.writeObject(elementData[i]);
593  
594 <        if (modCount != expectedModCount) {
594 >        if (expectedModCount != modCount) {
595              throw new ConcurrentModificationException();
596          }
597  
# Line 625 | Line 614 | public class ArrayList<E> extends Abstra
614          for (int i=0; i<size; i++)
615              a[i] = s.readObject();
616      }
628 –
629 –
630 –    /**
631 –     * Returns a list-iterator of the elements in this list (in proper
632 –     * sequence), starting at the specified position in the list.
633 –     * Obeys the general contract of <tt>List.listIterator(int)</tt>.<p>
634 –     *
635 –     * The list-iterator is <i>fail-fast</i>: if the list is structurally
636 –     * modified at any time after the Iterator is created, in any way except
637 –     * through the list-iterator's own <tt>remove</tt> or <tt>add</tt>
638 –     * methods, the list-iterator will throw a
639 –     * <tt>ConcurrentModificationException</tt>.  Thus, in the face of
640 –     * concurrent modification, the iterator fails quickly and cleanly, rather
641 –     * than risking arbitrary, non-deterministic behavior at an undetermined
642 –     * time in the future.
643 –     *
644 –     * @param index index of the first element to be returned from the
645 –     *              list-iterator (by a call to <tt>next</tt>)
646 –     * @return a ListIterator of the elements in this list (in proper
647 –     *         sequence), starting at the specified position in the list
648 –     * @throws IndexOutOfBoundsException {@inheritDoc}
649 –     * @see List#listIterator(int)
650 –     */
651 –    public ListIterator<E> listIterator(int index) {
652 –        if (index < 0 || index > size)
653 –            throw new IndexOutOfBoundsException("Index: "+index);
654 –        return new ArrayListIterator(index);
655 –    }
656 –
657 –    /**
658 –     * Returns an iterator over the elements in this list in proper sequence.
659 –     *
660 –     * @return an iterator over the elements in this list in proper sequence
661 –     */
662 –    public Iterator<E> iterator() {
663 –        return new ArrayListIterator(0);
664 –    }
665 –
666 –    /**
667 –     * A streamlined version of AbstractList.Itr
668 –     */
669 –    final class ArrayListIterator implements ListIterator<E> {
670 –        int cursor;           // index of next element to return;
671 –        int lastRet;          // index of last element, or -1 if no such
672 –        int expectedModCount; // to check for CME
673 –
674 –        ArrayListIterator(int index) {
675 –            cursor = index;
676 –            lastRet = -1;
677 –            expectedModCount = modCount;
678 –        }
679 –
680 –        public boolean hasNext() {
681 –            return cursor < size;
682 –        }
683 –
684 –        public boolean hasPrevious() {
685 –            return cursor > 0;
686 –        }
687 –
688 –        public int nextIndex() {
689 –            return cursor;
690 –        }
691 –
692 –        public int previousIndex() {
693 –            return cursor - 1;
694 –        }
695 –
696 –        public E next() {
697 –            if (expectedModCount == modCount) {
698 –                int i = cursor;
699 –                if (i < size) {
700 –                    try {
701 –                        E e = (E)elementData[i];
702 –                        lastRet = i;
703 –                        cursor = i + 1;
704 –                        return e;
705 –                    } catch (IndexOutOfBoundsException fallthrough) {
706 –                    }
707 –                }
708 –            }
709 –            // Prefer reporting CME if applicable on failures
710 –            if (expectedModCount == modCount)
711 –                throw new NoSuchElementException();
712 –            throw new ConcurrentModificationException();
713 –        }
714 –
715 –        public E previous() {
716 –            if (expectedModCount == modCount) {
717 –                int i = cursor - 1;
718 –                if (i < size) {
719 –                    try {
720 –                        E e = (E)elementData[i];
721 –                        lastRet = i;
722 –                        cursor = i;
723 –                        return e;
724 –                    } catch (IndexOutOfBoundsException fallthrough) {
725 –                    }
726 –                }
727 –            }
728 –            if (expectedModCount == modCount)
729 –                throw new NoSuchElementException();
730 –            throw new ConcurrentModificationException();
731 –        }
732 –
733 –        public void remove() {
734 –            if (lastRet < 0)
735 –                throw new IllegalStateException();
736 –            if (modCount != expectedModCount)
737 –                throw new ConcurrentModificationException();
738 –            ArrayList.this.remove(lastRet);
739 –            if (lastRet < cursor)
740 –                cursor--;
741 –            lastRet = -1;
742 –            expectedModCount = modCount;
743 –        }
744 –
745 –        public void set(E e) {
746 –            if (lastRet < 0)
747 –                throw new IllegalStateException();
748 –            if (modCount != expectedModCount)
749 –                throw new ConcurrentModificationException();
750 –            ArrayList.this.set(lastRet, e);
751 –            expectedModCount = modCount;
752 –        }
753 –
754 –        public void add(E e) {
755 –            if (modCount != expectedModCount)
756 –                throw new ConcurrentModificationException();
757 –            ArrayList.this.add(cursor++, e);
758 –            lastRet = -1;
759 –            expectedModCount = modCount;
760 –        }
761 –    }
762 –
617   }

Diff Legend

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