--- jsr166/src/main/java/util/ArrayList.java	2005/11/28 04:06:29	1.12
+++ jsr166/src/main/java/util/ArrayList.java	2006/04/21 20:49:03	1.20
@@ -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 <tt>List</tt> interface.  Implements
@@ -123,28 +122,17 @@ public class ArrayList<E> extends Abstra
     /**
      * Constructs a list containing the elements of the specified
      * collection, in the order they are returned by the collection's
-     * iterator.  The <tt>ArrayList</tt> 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);
+	elementData = c.toArray();
+	size = elementData.length;
+	// c.toArray might (incorrectly) not return Object[] (see 6260652)
+	if (elementData.getClass() != Object[].class)
+	    elementData = Arrays.copyOf(elementData, size, Object[].class);
     }
 
     private void initFromConcurrentlyMutating(Collection<? extends E> c) {
@@ -189,13 +177,15 @@ public class ArrayList<E> extends Abstra
      * @param minCapacity the desired minimum capacity
      */
     private void growArray(int minCapacity) {
-        if (minCapacity < 0)
-            throw new OutOfMemoryError(); // int overflow
+	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):
-                           ((oldCapacity * 3) / 2));
+        int newCapacity = ((oldCapacity < 64) ?
+                           ((oldCapacity + 1) * 2) :
+                           ((oldCapacity / 2) * 3));
+        if (newCapacity < 0) // overflow
+            newCapacity = Integer.MAX_VALUE;
         if (newCapacity < minCapacity)
             newCapacity = minCapacity;
         elementData = Arrays.copyOf(elementData, newCapacity);
@@ -345,10 +335,10 @@ public class ArrayList<E> 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);
     }
 
     /**
@@ -360,8 +350,8 @@ public class ArrayList<E> 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];
     }
 
     /**
@@ -375,8 +365,7 @@ public class ArrayList<E> 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;
@@ -394,8 +383,8 @@ public class ArrayList<E> extends Abstra
         if (s >= elementData.length)
             growArray(s + 1);
  	elementData[s] = e;
-        size = s + 1;
- 	return true;
+	size = s + 1;
+	return true;
     }
 
     /**
@@ -410,12 +399,12 @@ public class ArrayList<E> 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;
     }
@@ -432,15 +421,15 @@ public class ArrayList<E> 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;
     }
 
@@ -540,7 +529,7 @@ public class ArrayList<E> 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;
@@ -625,138 +614,4 @@ public class ArrayList<E> extends Abstra
 	for (int i=0; i<size; i++)
             a[i] = s.readObject();
     }
-
-
-    /**
-     * Returns a list-iterator of the elements in this list (in proper
-     * sequence), starting at the specified position in the list.
-     * Obeys the general contract of <tt>List.listIterator(int)</tt>.<p>
-     *
-     * The list-iterator is <i>fail-fast</i>: if the list is structurally
-     * modified at any time after the Iterator is created, in any way except
-     * through the list-iterator's own <tt>remove</tt> or <tt>add</tt>
-     * methods, the list-iterator will throw a
-     * <tt>ConcurrentModificationException</tt>.  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 <tt>next</tt>)
-     * @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<E> listIterator(int index) {
-	if (index < 0 || index > size)
-            throw new IndexOutOfBoundsException(ioobe(index));
-	return new ArrayListIterator(index);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public ListIterator<E> 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<E> iterator() {
-    	return new ArrayListIterator(0);
-    }
-
-    /**
-     * A streamlined version of AbstractList.ListItr
-     */
-    final class ArrayListIterator implements ListIterator<E> {
-	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();
-            ArrayList.this.add(cursor++, e);
-            lastRet = -1;
-            expectedModCount = modCount;
-	}
-    }
 }