ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/main/java/util/ArrayList.java

Comparing jsr166/src/main/java/util/ArrayList.java (file contents):
Revision 1.26 by jsr166, Sun May 18 23:47:55 2008 UTC vs.
Revision 1.30 by jsr166, Sun Sep 5 21:32:19 2010 UTC

#	Line 1 | Line 1
1		/*
2	<	* Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
2	>	* Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
3		* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4		*
5		* This code is free software; you can redistribute it and/or modify it
#	Line 18 | Line 18
18		* 2 along with this work; if not, write to the Free Software Foundation,
19		* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
20		*
21	<	* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
22	<	* CA 95054 USA or visit www.sun.com if you need additional information or
23	<	* have any questions.
21	>	* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
22	>	* or visit www.oracle.com if you need additional information or have any
23	>	* questions.
24		*/
25
26		package java.util;
#	Line 92 | Line 92 | package java.util;
92		*
93		* @author  Josh Bloch
94		* @author  Neal Gafter
95	–	* @version %I%, %G%
95		* @see     Collection
96		* @see     List
97		* @see     LinkedList
#	Line 180 | Line 179 | public class ArrayList<E> extends Abstra
179		modCount++;
180		int oldCapacity = elementData.length;
181		if (minCapacity > oldCapacity) {
183	–	Object oldData[] = elementData;
182		int newCapacity = (oldCapacity * 3)/2 + 1;
183		if (newCapacity < minCapacity)
184		newCapacity = minCapacity;
#	Line 893 | Line 891 | public class ArrayList<E> extends Abstra
891		private final AbstractList<E> parent;
892		private final int parentOffset;
893		private final int offset;
894	<	private int size;
894	>	int size;
895
896		SubList(AbstractList<E> parent,
897		int offset, int fromIndex, int toIndex) {
#	Line 972 | Line 970 | public class ArrayList<E> extends Abstra
970		public ListIterator<E> listIterator(final int index) {
971		checkForComodification();
972		rangeCheckForAdd(index);
973	+	final int offset = this.offset;
974
975		return new ListIterator<E>() {
976		int cursor = index;

Diff Legend

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