ViewVC Help

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

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

Comparing jsr166/src/main/java/util/LinkedList.java (file contents):
Revision 1.43 by jsr166, Tue Jan 10 21:32:09 2006 UTC vs.
Revision 1.49 by jsr166, Sun May 18 23:59:57 2008 UTC

#	Line 1 | Line 1
1		/*
2	<	* %W% %E%
2	>	* Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
3	>	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4		*
5	<	* Copyright 2006 Sun Microsystems, Inc. All rights reserved.
6	<	* SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
5	>	* This code is free software; you can redistribute it and/or modify it
6	>	* under the terms of the GNU General Public License version 2 only, as
7	>	* published by the Free Software Foundation.  Sun designates this
8	>	* particular file as subject to the "Classpath" exception as provided
9	>	* by Sun in the LICENSE file that accompanied this code.
10	>	*
11	>	* This code is distributed in the hope that it will be useful, but WITHOUT
12	>	* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13	>	* FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
14	>	* version 2 for more details (a copy is included in the LICENSE file that
15	>	* accompanied this code).
16	>	*
17	>	* You should have received a copy of the GNU General Public License version
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.
24		*/
25
26		package java.util;
9	–	import java.util.*; // for javadoc (till 6280605 is fixed)
27
28		/**
29		* Linked list implementation of the <tt>List</tt> interface.  Implements all
#	Line 60 | Line 77 | import java.util.*; // for javadoc (till
77		* should be used only to detect bugs.</i>
78		*
79		* <p>This class is a member of the
80	<	* <a href="{@docRoot}/../guide/collections/index.html">
80	>	* <a href="{@docRoot}/../technotes/guides/collections/index.html">
81		* Java Collections Framework</a>.
82		*
83		* @author  Josh Bloch
84	<	* @version %I%, %G%
85	<	* @see     List
86	<	* @see     ArrayList
70	<	* @see     Vector
84	>	* @see     List
85	>	* @see     ArrayList
86	>	* @see     Vector
87		* @since 1.2
88		* @param <E> the type of elements held in this collection
89		*/
#	Line 95 | Line 111 | public class LinkedList<E>
111		* @throws NullPointerException if the specified collection is null
112		*/
113		public LinkedList(Collection<? extends E> c) {
114	<	this();
115	<	addAll(c);
114	>	this();
115	>	addAll(c);
116		}
117
118		/**
#	Line 106 | Line 122 | public class LinkedList<E>
122		* @throws NoSuchElementException if this list is empty
123		*/
124		public E getFirst() {
125	<	if (size==0)
126	<	throw new NoSuchElementException();
125	>	if (size==0)
126	>	throw new NoSuchElementException();
127
128	<	return header.next.element;
128	>	return header.next.element;
129		}
130
131		/**
#	Line 119 | Line 135 | public class LinkedList<E>
135		* @throws NoSuchElementException if this list is empty
136		*/
137		public E getLast()  {
138	<	if (size==0)
139	<	throw new NoSuchElementException();
138	>	if (size==0)
139	>	throw new NoSuchElementException();
140
141	<	return header.previous.element;
141	>	return header.previous.element;
142		}
143
144		/**
#	Line 132 | Line 148 | public class LinkedList<E>
148		* @throws NoSuchElementException if this list is empty
149		*/
150		public E removeFirst() {
151	<	return remove(header.next);
151	>	return remove(header.next);
152		}
153
154		/**
#	Line 142 | Line 158 | public class LinkedList<E>
158		* @throws NoSuchElementException if this list is empty
159		*/
160		public E removeLast() {
161	<	return remove(header.previous);
161	>	return remove(header.previous);
162		}
163
164		/**
#	Line 151 | Line 167 | public class LinkedList<E>
167		* @param e the element to add
168		*/
169		public void addFirst(E e) {
170	<	addBefore(e, header.next);
170	>	addBefore(e, header.next);
171		}
172
173		/**
#	Line 162 | Line 178 | public class LinkedList<E>
178		* @param e the element to add
179		*/
180		public void addLast(E e) {
181	<	addBefore(e, header);
181	>	addBefore(e, header);
182		}
183
184		/**
#	Line 184 | Line 200 | public class LinkedList<E>
200		* @return the number of elements in this list
201		*/
202		public int size() {
203	<	return size;
203	>	return size;
204		}
205
206		/**
#	Line 196 | Line 212 | public class LinkedList<E>
212		* @return <tt>true</tt> (as specified by {@link Collection#add})
213		*/
214		public boolean add(E e) {
215	<	addBefore(e, header);
215	>	addBefore(e, header);
216		return true;
217		}
218
#	Line 271 | Line 287 | public class LinkedList<E>
287		int numNew = a.length;
288		if (numNew==0)
289		return false;
290	<	modCount++;
290	>	modCount++;
291
292		Entry<E> successor = (index==size ? header : entry(index));
293		Entry<E> predecessor = successor.previous;
294	<	for (int i=0; i<numNew; i++) {
294	>	for (int i=0; i<numNew; i++) {
295		Entry<E> e = new Entry<E>((E)a[i], successor, predecessor);
296		predecessor.next = e;
297		predecessor = e;
#	Line 299 | Line 315 | public class LinkedList<E>
315		}
316		header.next = header.previous = header;
317		size = 0;
318	<	modCount++;
318	>	modCount++;
319		}
320
321
#	Line 665 | Line 681 | public class LinkedList<E>
681		* @see List#listIterator(int)
682		*/
683		public ListIterator<E> listIterator(int index) {
684	<	return new ListItr(index);
684	>	return new ListItr(index);
685		}
686
687		private class ListItr implements ListIterator<E> {
688	<	private Entry<E> lastReturned = header;
689	<	private Entry<E> next;
690	<	private int nextIndex;
691	<	private int expectedModCount = modCount;
692	<
693	<	ListItr(int index) {
694	<	if (index < 0 || index > size)
695	<	throw new IndexOutOfBoundsException("Index: "+index+
696	<	", Size: "+size);
697	<	if (index < (size >> 1)) {
698	<	next = header.next;
699	<	for (nextIndex=0; nextIndex<index; nextIndex++)
700	<	next = next.next;
701	<	} else {
702	<	next = header;
703	<	for (nextIndex=size; nextIndex>index; nextIndex--)
704	<	next = next.previous;
705	<	}
706	<	}
691	<
692	<	public boolean hasNext() {
693	<	return nextIndex != size;
694	<	}
695	<
696	<	public E next() {
697	<	checkForComodification();
698	<	if (nextIndex == size)
699	<	throw new NoSuchElementException();
700	<
701	<	lastReturned = next;
702	<	next = next.next;
703	<	nextIndex++;
704	<	return lastReturned.element;
705	<	}
706	<
707	<	public boolean hasPrevious() {
708	<	return nextIndex != 0;
709	<	}
710	<
711	<	public E previous() {
712	<	if (nextIndex == 0)
713	<	throw new NoSuchElementException();
714	<
715	<	lastReturned = next = next.previous;
716	<	nextIndex--;
717	<	checkForComodification();
718	<	return lastReturned.element;
719	<	}
720	<
721	<	public int nextIndex() {
722	<	return nextIndex;
723	<	}
724	<
725	<	public int previousIndex() {
726	<	return nextIndex-1;
727	<	}
688	>	private Entry<E> lastReturned = header;
689	>	private Entry<E> next;
690	>	private int nextIndex;
691	>	private int expectedModCount = modCount;
692	>
693	>	ListItr(int index) {
694	>	if (index < 0 || index > size)
695	>	throw new IndexOutOfBoundsException("Index: "+index+
696	>	", Size: "+size);
697	>	if (index < (size >> 1)) {
698	>	next = header.next;
699	>	for (nextIndex=0; nextIndex<index; nextIndex++)
700	>	next = next.next;
701	>	} else {
702	>	next = header;
703	>	for (nextIndex=size; nextIndex>index; nextIndex--)
704	>	next = next.previous;
705	>	}
706	>	}
707
708	<	public void remove() {
708	>	public boolean hasNext() {
709	>	return nextIndex != size;
710	>	}
711	>
712	>	public E next() {
713	>	checkForComodification();
714	>	if (nextIndex == size)
715	>	throw new NoSuchElementException();
716	>
717	>	lastReturned = next;
718	>	next = next.next;
719	>	nextIndex++;
720	>	return lastReturned.element;
721	>	}
722	>
723	>	public boolean hasPrevious() {
724	>	return nextIndex != 0;
725	>	}
726	>
727	>	public E previous() {
728	>	if (nextIndex == 0)
729	>	throw new NoSuchElementException();
730	>
731	>	lastReturned = next = next.previous;
732	>	nextIndex--;
733	>	checkForComodification();
734	>	return lastReturned.element;
735	>	}
736	>
737	>	public int nextIndex() {
738	>	return nextIndex;
739	>	}
740	>
741	>	public int previousIndex() {
742	>	return nextIndex-1;
743	>	}
744	>
745	>	public void remove() {
746		checkForComodification();
747		Entry<E> lastNext = lastReturned.next;
748		try {
#	Line 734 | Line 750 | public class LinkedList<E>
750		} catch (NoSuchElementException e) {
751		throw new IllegalStateException();
752		}
753	<	if (next==lastReturned)
753	>	if (next==lastReturned)
754		next = lastNext;
755		else
756	<	nextIndex--;
757	<	lastReturned = header;
758	<	expectedModCount++;
759	<	}
760	<
761	<	public void set(E e) {
762	<	if (lastReturned == header)
763	<	throw new IllegalStateException();
764	<	checkForComodification();
765	<	lastReturned.element = e;
766	<	}
767	<
768	<	public void add(E e) {
769	<	checkForComodification();
770	<	lastReturned = header;
771	<	addBefore(e, next);
772	<	nextIndex++;
773	<	expectedModCount++;
774	<	}
775	<
776	<	final void checkForComodification() {
777	<	if (modCount != expectedModCount)
778	<	throw new ConcurrentModificationException();
779	<	}
756	>	nextIndex--;
757	>	lastReturned = header;
758	>	expectedModCount++;
759	>	}
760	>
761	>	public void set(E e) {
762	>	if (lastReturned == header)
763	>	throw new IllegalStateException();
764	>	checkForComodification();
765	>	lastReturned.element = e;
766	>	}
767	>
768	>	public void add(E e) {
769	>	checkForComodification();
770	>	lastReturned = header;
771	>	addBefore(e, next);
772	>	nextIndex++;
773	>	expectedModCount++;
774	>	}
775	>
776	>	final void checkForComodification() {
777	>	if (modCount != expectedModCount)
778	>	throw new ConcurrentModificationException();
779	>	}
780		}
781
782		private static class Entry<E> {
783	<	E element;
784	<	Entry<E> next;
785	<	Entry<E> previous;
786	<
787	<	Entry(E element, Entry<E> next, Entry<E> previous) {
788	<	this.element = element;
789	<	this.next = next;
790	<	this.previous = previous;
791	<	}
783	>	E element;
784	>	Entry<E> next;
785	>	Entry<E> previous;
786	>
787	>	Entry(E element, Entry<E> next, Entry<E> previous) {
788	>	this.element = element;
789	>	this.next = next;
790	>	this.previous = previous;
791	>	}
792		}
793
794		private Entry<E> addBefore(E e, Entry<E> entry) {
795	<	Entry<E> newEntry = new Entry<E>(e, entry, entry.previous);
796	<	newEntry.previous.next = newEntry;
797	<	newEntry.next.previous = newEntry;
798	<	size++;
799	<	modCount++;
800	<	return newEntry;
795	>	Entry<E> newEntry = new Entry<E>(e, entry, entry.previous);
796	>	newEntry.previous.next = newEntry;
797	>	newEntry.next.previous = newEntry;
798	>	size++;
799	>	modCount++;
800	>	return newEntry;
801		}
802
803		private E remove(Entry<E> e) {
804	<	if (e == header)
805	<	throw new NoSuchElementException();
804	>	if (e == header)
805	>	throw new NoSuchElementException();
806
807		E result = e.element;
808	<	e.previous.next = e.next;
809	<	e.next.previous = e.previous;
808	>	e.previous.next = e.next;
809	>	e.next.previous = e.previous;
810		e.next = e.previous = null;
811		e.element = null;
812	<	size--;
813	<	modCount++;
812	>	size--;
813	>	modCount++;
814		return result;
815		}
816
#	Line 808 | Line 824 | public class LinkedList<E>
824		/** Adapter to provide descending iterators via ListItr.previous */
825		private class DescendingIterator implements Iterator {
826		final ListItr itr = new ListItr(size());
827	<	public boolean hasNext() {
828	<	return itr.hasPrevious();
829	<	}
830	<	public E next() {
827	>	public boolean hasNext() {
828	>	return itr.hasPrevious();
829	>	}
830	>	public E next() {
831		return itr.previous();
832		}
833	<	public void remove() {
833	>	public void remove() {
834		itr.remove();
835		}
836		}
#	Line 827 | Line 843 | public class LinkedList<E>
843		*/
844		public Object clone() {
845		LinkedList<E> clone = null;
846	<	try {
847	<	clone = (LinkedList<E>) super.clone();
848	<	} catch (CloneNotSupportedException e) {
849	<	throw new InternalError();
850	<	}
846	>	try {
847	>	clone = (LinkedList<E>) super.clone();
848	>	} catch (CloneNotSupportedException e) {
849	>	throw new InternalError();
850	>	}
851
852		// Put clone into "virgin" state
853		clone.header = new Entry<E>(null, null, null);
#	Line 861 | Line 877 | public class LinkedList<E>
877		*         in proper sequence
878		*/
879		public Object[] toArray() {
880	<	Object[] result = new Object[size];
880	>	Object[] result = new Object[size];
881		int i = 0;
882		for (Entry<E> e = header.next; e != header; e = e.next)
883		result[i++] = e.element;
884	<	return result;
884	>	return result;
885		}
886
887		/**
#	Line 911 | Line 927 | public class LinkedList<E>
927		a = (T[])java.lang.reflect.Array.newInstance(
928		a.getClass().getComponentType(), size);
929		int i = 0;
930	<	Object[] result = a;
930	>	Object[] result = a;
931		for (Entry<E> e = header.next; e != header; e = e.next)
932		result[i++] = e.element;
933
#	Line 933 | Line 949 | public class LinkedList<E>
949		*/
950		private void writeObject(java.io.ObjectOutputStream s)
951		throws java.io.IOException {
952	<	// Write out any hidden serialization magic
953	<	s.defaultWriteObject();
952	>	// Write out any hidden serialization magic
953	>	s.defaultWriteObject();
954
955		// Write out size
956		s.writeInt(size);
957
958	<	// Write out all elements in the proper order.
958	>	// Write out all elements in the proper order.
959		for (Entry e = header.next; e != header; e = e.next)
960		s.writeObject(e.element);
961		}
#	Line 950 | Line 966 | public class LinkedList<E>
966		*/
967		private void readObject(java.io.ObjectInputStream s)
968		throws java.io.IOException, ClassNotFoundException {
969	<	// Read in any hidden serialization magic
970	<	s.defaultReadObject();
969	>	// Read in any hidden serialization magic
970	>	s.defaultReadObject();
971
972		// Read in size
973		int size = s.readInt();
#	Line 960 | Line 976 | public class LinkedList<E>
976		header = new Entry<E>(null, null, null);
977		header.next = header.previous = header;
978
979	<	// Read in all elements in the proper order.
980	<	for (int i=0; i<size; i++)
979	>	// Read in all elements in the proper order.
980	>	for (int i=0; i<size; i++)
981		addBefore((E)s.readObject(), header);
982		}
983		}

Diff Legend

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