--- jsr166/src/main/java/util/ArrayList.java	2005/11/25 13:34:29	1.2
+++ jsr166/src/main/java/util/ArrayList.java	2005/11/26 04:35:16	1.6
@@ -101,9 +101,9 @@ public class ArrayList<E> extends Abstra
     /**
      * Constructs an empty list with the specified initial capacity.
      *
-     * @param   initialCapacity   the initial capacity of the list
-     * @exception IllegalArgumentException if the specified initial capacity
-     *            is negative
+     * @param initialCapacity the initial capacity of the list
+     * @throws IllegalArgumentException if the specified initial capacity
+     *         is negative
      */
     public ArrayList(int initialCapacity) {
 	super();
@@ -146,7 +146,7 @@ public class ArrayList<E> extends Abstra
 	}
 	initFromConcurrentlyMutating(c);
     }
-    
+
     private void initFromConcurrentlyMutating(Collection<? extends E> c) {
 	elementData = c.toArray();
 	size = elementData.length;
@@ -154,9 +154,9 @@ public class ArrayList<E> extends Abstra
 	if (elementData.getClass() != Object[].class)
 	    elementData = Arrays.copyOf(elementData, size, Object[].class);
     }
-    
+
     private final static Object UNALLOCATED = new Object();
-    
+
     /**
      * Trims the capacity of this <tt>ArrayList</tt> instance to be the
      * list's current size.  An application can use this operation to minimize
@@ -175,14 +175,7 @@ public class ArrayList<E> extends Abstra
      * necessary, to ensure that it can hold at least the number of elements
      * specified by the minimum capacity argument.
      *
-     * @param   minCapacity   the desired minimum capacity
-     */
-    /**
-     * Increases the capacity of this <tt>ArrayList</tt> instance, if
-     * necessary, to ensure that it can hold at least the number of elements
-     * specified by the minimum capacity argument.
-     *
-     * @param   minCapacity   the desired minimum capacity
+     * @param minCapacity the desired minimum capacity
      */
     public void ensureCapacity(int minCapacity) {
 	modCount++;
@@ -191,13 +184,14 @@ public class ArrayList<E> extends Abstra
     }
 
     /**
-     * Increase the capacity of the array.
-     * @param   minCapacity   the desired minimum capacity
+     * Increases the capacity of the array.
+     *
+     * @param minCapacity the desired minimum capacity
      */
     private void growArray(int minCapacity) {
 	int oldCapacity = elementData.length;
         // Double size if small; else grow by 50%
-        int newCapacity = ((oldCapacity < 64)? 
+        int newCapacity = ((oldCapacity < 64)?
                            (oldCapacity * 2):
                            ((oldCapacity * 3)/2 + 1));
         if (newCapacity < minCapacity)
@@ -348,15 +342,13 @@ public class ArrayList<E> extends Abstra
 
     // Positional Access Operations
 
-    /** 
-     * Create and return an appropriate exception for indexing errors 
+    /**
+     * Creates and returns an appropriate exception for indexing errors.
      */
     private static IndexOutOfBoundsException rangeException(int i, int s) {
         return new IndexOutOfBoundsException("Index: " + i + ", Size: " + s);
     }
 
-    // Positional Access Operations
-
     /**
      * Returns the element at the specified position in this list.
      *
@@ -443,7 +435,7 @@ public class ArrayList<E> extends Abstra
 	Object oldValue = elementData[index];
 	int numMoved = s - index;
 	if (numMoved > 0)
-	    System.arraycopy(elementData, index+1, elementData, index, 
+	    System.arraycopy(elementData, index+1, elementData, index,
                              numMoved);
 	elementData[s] = null; // forget removed element
 	return (E)oldValue;
@@ -659,7 +651,7 @@ public class ArrayList<E> extends Abstra
             throw new IndexOutOfBoundsException("Index: "+index);
 	return new ArrayListIterator(index);
     }
- 
+
     /**
      * Returns an iterator over the elements in this list in proper sequence.
      *
@@ -670,7 +662,7 @@ public class ArrayList<E> extends Abstra
     }
 
     /**
-     * A streamlined version of AbstractList.Itr 
+     * A streamlined version of AbstractList.Itr
      */
     final class ArrayListIterator implements ListIterator<E> {
 	int cursor;           // index of next element to return;
@@ -708,7 +700,7 @@ public class ArrayList<E> extends Abstra
                         lastRet = i;
                         cursor = i + 1;
                         return e;
-                    } catch (IndexOutOfBoundsException fallthrough) { 
+                    } catch (IndexOutOfBoundsException fallthrough) {
                     }
                 }
             }
@@ -727,7 +719,7 @@ public class ArrayList<E> extends Abstra
                         lastRet = i;
                         cursor = i;
                         return e;
-                    } catch (IndexOutOfBoundsException fallthrough) { 
+                    } catch (IndexOutOfBoundsException fallthrough) {
                     }
                 }
             }
@@ -739,7 +731,7 @@ public class ArrayList<E> extends Abstra
 	public void remove() {
 	    if (lastRet < 0)
 		throw new IllegalStateException();
-            if (modCount != expectedModCount) 
+            if (modCount != expectedModCount)
                 throw new ConcurrentModificationException();
             ArrayList.this.remove(lastRet);
             if (lastRet < cursor)
@@ -751,14 +743,14 @@ public class ArrayList<E> extends Abstra
 	public void set(E e) {
 	    if (lastRet < 0)
 		throw new IllegalStateException();
-            if (modCount != expectedModCount) 
+            if (modCount != expectedModCount)
                 throw new ConcurrentModificationException();
             ArrayList.this.set(lastRet, e);
             expectedModCount = modCount;
 	}
 
 	public void add(E e) {
-            if (modCount != expectedModCount) 
+            if (modCount != expectedModCount)
                 throw new ConcurrentModificationException();
             ArrayList.this.add(cursor++, e);
             lastRet = -1;