--- jsr166/src/main/java/util/ArrayList.java 2006/04/19 15:07:14 1.19 +++ jsr166/src/main/java/util/ArrayList.java 2006/06/26 01:38:57 1.22 @@ -1,5 +1,5 @@ /* - * @(#)ArrayList.java 1.56 06/03/14 + * %W% %E% * * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. @@ -66,12 +66,12 @@ package java.util; * should be used only to detect bugs.

* * This class is a member of the - * + * * Java Collections Framework. * * @author Josh Bloch * @author Neal Gafter - * @version 1.56, 03/14/06 + * @version %I%, %G% * @see Collection * @see List * @see LinkedList @@ -135,16 +135,6 @@ public class ArrayList extends Abstra elementData = Arrays.copyOf(elementData, size, Object[].class); } - private void initFromConcurrentlyMutating(Collection 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 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