--- jsr166/src/main/java/util/ArrayList.java 2005/11/28 23:53:32 1.13
+++ jsr166/src/main/java/util/ArrayList.java 2006/06/26 01:38:57 1.22
@@ -1,12 +1,11 @@
/*
* %W% %E%
*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
* SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
*/
package java.util;
-import java.util.*; // for javadoc (till 6280605 is fixed)
/**
* Resizable-array implementation of the List interface. Implements
@@ -67,7 +66,7 @@ import java.util.*; // for javadoc (till
* should be used only to detect bugs.
*
* This class is a member of the
- *
+ *
* Java Collections Framework.
*
* @author Josh Bloch
@@ -123,31 +122,12 @@ public class ArrayList extends Abstra
/**
* Constructs a list containing the elements of the specified
* collection, in the order they are returned by the collection's
- * iterator. The ArrayList instance has an initial capacity of
- * 110% the size of the specified collection.
+ * iterator.
*
* @param c the collection whose elements are to be placed into this list
* @throws NullPointerException if the specified collection is null
*/
public ArrayList(Collection extends E> c) {
- int size = c.size();
- // 10% for growth
- int cap = ((size/10)+1)*11;
- if (cap > 0) {
- Object[] a = new Object[cap];
- a[size] = a[size+1] = UNALLOCATED;
- Object[] b = c.toArray(a);
- if (b[size] == null && b[size+1] == UNALLOCATED) {
- b[size+1] = null;
- elementData = b;
- this.size = size;
- return;
- }
- }
- initFromConcurrentlyMutating(c);
- }
-
- private void initFromConcurrentlyMutating(Collection extends E> c) {
elementData = c.toArray();
size = elementData.length;
// c.toArray might (incorrectly) not return Object[] (see 6260652)
@@ -155,8 +135,6 @@ public class ArrayList extends Abstra
elementData = Arrays.copyOf(elementData, size, Object[].class);
}
- private final static Object UNALLOCATED = new Object();
-
/**
* Trims the capacity of this ArrayList instance to be the
* list's current size. An application can use this operation to minimize
@@ -189,12 +167,12 @@ public class ArrayList extends Abstra
* @param minCapacity the desired minimum capacity
*/
private void growArray(int minCapacity) {
- if (minCapacity < 0) // overflow
- throw new OutOfMemoryError();
+ if (minCapacity < 0) // overflow
+ throw new OutOfMemoryError();
int oldCapacity = elementData.length;
// Double size if small; else grow by 50%
- int newCapacity = ((oldCapacity < 64)?
- ((oldCapacity + 1) * 2):
+ int newCapacity = ((oldCapacity < 64) ?
+ ((oldCapacity + 1) * 2) :
((oldCapacity / 2) * 3));
if (newCapacity < 0) // overflow
newCapacity = Integer.MAX_VALUE;
@@ -347,10 +325,10 @@ public class ArrayList extends Abstra
// Positional Access Operations
/**
- * Returns error message string for IndexOutOfBoundsExceptions
+ * Throws an appropriate exception for indexing errors.
*/
- private String ioobe(int index) {
- return "Index: " + index + ", Size: " + size;
+ private static void indexOutOfBounds(int i, int s) {
+ throw new IndexOutOfBoundsException("Index: " + i + ", Size: " + s);
}
/**
@@ -362,8 +340,8 @@ public class ArrayList extends Abstra
*/
public E get(int index) {
if (index >= size)
- throw new IndexOutOfBoundsException(ioobe(index));
- return (E)elementData[index];
+ indexOutOfBounds(index, size);
+ return (E) elementData[index];
}
/**
@@ -377,8 +355,7 @@ public class ArrayList extends Abstra
*/
public E set(int index, E element) {
if (index >= size)
- throw new IndexOutOfBoundsException(ioobe(index));
-
+ indexOutOfBounds(index, size);
E oldValue = (E) elementData[index];
elementData[index] = element;
return oldValue;
@@ -396,8 +373,8 @@ public class ArrayList extends Abstra
if (s >= elementData.length)
growArray(s + 1);
elementData[s] = e;
- size = s + 1;
- return true;
+ size = s + 1;
+ return true;
}
/**
@@ -412,12 +389,12 @@ public class ArrayList extends Abstra
public void add(int index, E element) {
int s = size;
if (index > s || index < 0)
- throw new IndexOutOfBoundsException(ioobe(index));
+ indexOutOfBounds(index, s);
modCount++;
if (s >= elementData.length)
growArray(s + 1);
System.arraycopy(elementData, index,
- elementData, index + 1, s - index);
+ elementData, index + 1, s - index);
elementData[index] = element;
size = s + 1;
}
@@ -434,15 +411,15 @@ public class ArrayList extends Abstra
public E remove(int index) {
int s = size - 1;
if (index > s)
- throw new IndexOutOfBoundsException(ioobe(index));
+ indexOutOfBounds(index, size);
modCount++;
- E oldValue = (E)elementData[index];
+ E oldValue = (E) elementData[index];
int numMoved = s - index;
if (numMoved > 0)
System.arraycopy(elementData, index + 1,
- elementData, index, numMoved);
+ elementData, index, numMoved);
elementData[s] = null;
- size = s;
+ size = s;
return oldValue;
}
@@ -542,7 +519,7 @@ public class ArrayList extends Abstra
*/
public boolean addAll(int index, Collection extends E> c) {
if (index > size || index < 0)
- throw new IndexOutOfBoundsException(ioobe(index));
+ indexOutOfBounds(index, size);
Object[] a = c.toArray();
int numNew = a.length;
@@ -627,142 +604,4 @@ public class ArrayList extends Abstra
for (int i=0; iList.listIterator(int).
- *
- * The list-iterator is fail-fast: if the list is structurally
- * modified at any time after the Iterator is created, in any way except
- * through the list-iterator's own remove or add
- * methods, the list-iterator will throw a
- * ConcurrentModificationException. Thus, in the face of
- * concurrent modification, the iterator fails quickly and cleanly, rather
- * than risking arbitrary, non-deterministic behavior at an undetermined
- * time in the future.
- *
- * @param index index of the first element to be returned from the
- * list-iterator (by a call to next)
- * @return a ListIterator of the elements in this list (in proper
- * sequence), starting at the specified position in the list
- * @throws IndexOutOfBoundsException {@inheritDoc}
- * @see List#listIterator(int)
- */
- public ListIterator listIterator(int index) {
- if (index < 0 || index > size)
- throw new IndexOutOfBoundsException(ioobe(index));
- return new ArrayListIterator(index);
- }
-
- /**
- * {@inheritDoc}
- */
- public ListIterator listIterator() {
- return new ArrayListIterator(0);
- }
-
- /**
- * Returns an iterator over the elements in this list in proper sequence.
- *
- * @return an iterator over the elements in this list in proper sequence
- */
- public Iterator iterator() {
- return new ArrayListIterator(0);
- }
-
- /**
- * A streamlined version of AbstractList.ListItr
- */
- final class ArrayListIterator implements ListIterator {
- int cursor; // index of next element to return;
- int lastRet; // index of last element, or -1 if no such
- int expectedModCount; // to check for CME
-
- ArrayListIterator(int index) {
- cursor = index;
- lastRet = -1;
- expectedModCount = modCount;
- }
-
- public boolean hasNext() {
- return cursor != size;
- }
-
- public boolean hasPrevious() {
- return cursor != 0;
- }
-
- public int nextIndex() {
- return cursor;
- }
-
- public int previousIndex() {
- return cursor - 1;
- }
-
- public E next() {
- try {
- int i = cursor;
- E next = get(i);
- lastRet = i;
- cursor = i + 1;
- return next;
- } catch (IndexOutOfBoundsException ex) {
- throw new NoSuchElementException();
- } finally {
- if (expectedModCount != modCount)
- throw new ConcurrentModificationException();
- }
- }
-
- public E previous() {
- try {
- int i = cursor - 1;
- E prev = get(i);
- lastRet = i;
- cursor = i;
- return prev;
- } catch (IndexOutOfBoundsException ex) {
- throw new NoSuchElementException();
- } finally {
- if (expectedModCount != modCount)
- throw new ConcurrentModificationException();
- }
- }
-
- public void remove() {
- if (lastRet < 0)
- throw new IllegalStateException();
- if (expectedModCount != modCount)
- throw new ConcurrentModificationException();
- ArrayList.this.remove(lastRet);
- if (lastRet < cursor)
- cursor--;
- lastRet = -1;
- expectedModCount = modCount;
- }
-
- public void set(E e) {
- if (lastRet < 0)
- throw new IllegalStateException();
- if (expectedModCount != modCount)
- throw new ConcurrentModificationException();
- ArrayList.this.set(lastRet, e);
- expectedModCount = modCount;
- }
-
- public void add(E e) {
- if (expectedModCount != modCount)
- throw new ConcurrentModificationException();
- try {
- ArrayList.this.add(cursor++, e);
- lastRet = -1;
- expectedModCount = modCount;
- } catch (IndexOutOfBoundsException ex) {
- throw new ConcurrentModificationException();
- }
- }
- }
}