ViewVC Help

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

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

Comparing jsr166/src/main/java/util/Vector.java (file contents):
Revision 1.22 by jsr166, Tue Sep 11 15:38:19 2007 UTC vs.
Revision 1.26 by jsr166, Wed Jul 22 00:00:07 2009 UTC

#	Line 1 | Line 1
1		/*
2	<	* Copyright 1994-2007 Sun Microsystems, Inc.  All Rights Reserved.
2	>	* Copyright 1994-2008 Sun Microsystems, Inc.  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 64 | Line 64 | package java.util;
64		*
65		* <p>As of the Java 2 platform v1.2, this class was retrofitted to
66		* implement the {@link List} interface, making it a member of the
67	<	* <a href="{@docRoot}/../technotes/guides/collections/index.html"> Java
68	<	* Collections Framework</a>.  Unlike the new collection
69	<	* implementations, {@code Vector} is synchronized.
67	>	* <a href="{@docRoot}/../technotes/guides/collections/index.html">
68	>	* Java Collections Framework</a>.  Unlike the new collection
69	>	* implementations, {@code Vector} is synchronized.  If a thread-safe
70	>	* implementation is not needed, it is recommended to use {@link
71	>	* ArrayList} in place of {@code Vector}.
72		*
73		* @author  Lee Boynton
74		* @author  Jonathan Payne
73	–	* @version %I%, %G%
75		* @see Collection
75	–	* @see List
76	–	* @see ArrayList
76		* @see LinkedList
77		* @since   JDK1.0
78		*/
#	Line 125 | Line 124 | public class Vector<E>
124		*         is negative
125		*/
126		public Vector(int initialCapacity, int capacityIncrement) {
127	<	super();
127	>	super();
128		if (initialCapacity < 0)
129		throw new IllegalArgumentException("Illegal Capacity: "+
130		initialCapacity);
131	<	this.elementData = new Object[initialCapacity];
132	<	this.capacityIncrement = capacityIncrement;
131	>	this.elementData = new Object[initialCapacity];
132	>	this.capacityIncrement = capacityIncrement;
133		}
134
135		/**
#	Line 142 | Line 141 | public class Vector<E>
141		*         is negative
142		*/
143		public Vector(int initialCapacity) {
144	<	this(initialCapacity, 0);
144	>	this(initialCapacity, 0);
145		}
146
147		/**
#	Line 151 | Line 150 | public class Vector<E>
150		* zero.
151		*/
152		public Vector() {
153	<	this(10);
153	>	this(10);
154		}
155
156		/**
#	Line 165 | Line 164 | public class Vector<E>
164		* @since   1.2
165		*/
166		public Vector(Collection<? extends E> c) {
167	<	elementData = c.toArray();
168	<	elementCount = elementData.length;
169	<	// c.toArray might (incorrectly) not return Object[] (see 6260652)
170	<	if (elementData.getClass() != Object[].class)
171	<	elementData = Arrays.copyOf(elementData, elementCount, Object[].class);
167	>	elementData = c.toArray();
168	>	elementCount = elementData.length;
169	>	// c.toArray might (incorrectly) not return Object[] (see 6260652)
170	>	if (elementData.getClass() != Object[].class)
171	>	elementData = Arrays.copyOf(elementData, elementCount, Object[].class);
172		}
173
174		/**
#	Line 186 | Line 185 | public class Vector<E>
185		* @see #toArray(Object[])
186		*/
187		public synchronized void copyInto(Object[] anArray) {
188	<	System.arraycopy(elementData, 0, anArray, 0, elementCount);
188	>	System.arraycopy(elementData, 0, anArray, 0, elementCount);
189		}
190
191		/**
#	Line 198 | Line 197 | public class Vector<E>
197		* minimize the storage of a vector.
198		*/
199		public synchronized void trimToSize() {
200	<	modCount++;
201	<	int oldCapacity = elementData.length;
202	<	if (elementCount < oldCapacity) {
200	>	modCount++;
201	>	int oldCapacity = elementData.length;
202	>	if (elementCount < oldCapacity) {
203		elementData = Arrays.copyOf(elementData, elementCount);
204	<	}
204	>	}
205		}
206
207		/**
#	Line 223 | Line 222 | public class Vector<E>
222		* @param minCapacity the desired minimum capacity
223		*/
224		public synchronized void ensureCapacity(int minCapacity) {
225	<	modCount++;
226	<	ensureCapacityHelper(minCapacity);
225	>	modCount++;
226	>	ensureCapacityHelper(minCapacity);
227		}
228
229		/**
#	Line 236 | Line 235 | public class Vector<E>
235		* @see #ensureCapacity(int)
236		*/
237		private void ensureCapacityHelper(int minCapacity) {
238	<	int oldCapacity = elementData.length;
239	<	if (minCapacity > oldCapacity) {
240	<	Object[] oldData = elementData;
241	<	int newCapacity = (capacityIncrement > 0) ?
242	<	(oldCapacity + capacityIncrement) : (oldCapacity * 2);
243	<	if (newCapacity < minCapacity) {
244	<	newCapacity = minCapacity;
245	<	}
238	>	int oldCapacity = elementData.length;
239	>	if (minCapacity > oldCapacity) {
240	>	Object[] oldData = elementData;
241	>	int newCapacity = (capacityIncrement > 0) ?
242	>	(oldCapacity + capacityIncrement) : (oldCapacity * 2);
243	>	if (newCapacity < minCapacity) {
244	>	newCapacity = minCapacity;
245	>	}
246		elementData = Arrays.copyOf(elementData, newCapacity);
247	<	}
247	>	}
248		}
249
250		/**
#	Line 258 | Line 257 | public class Vector<E>
257		* @throws ArrayIndexOutOfBoundsException if the new size is negative
258		*/
259		public synchronized void setSize(int newSize) {
260	<	modCount++;
261	<	if (newSize > elementCount) {
262	<	ensureCapacityHelper(newSize);
263	<	} else {
264	<	for (int i = newSize ; i < elementCount ; i++) {
265	<	elementData[i] = null;
266	<	}
267	<	}
268	<	elementCount = newSize;
260	>	modCount++;
261	>	if (newSize > elementCount) {
262	>	ensureCapacityHelper(newSize);
263	>	} else {
264	>	for (int i = newSize ; i < elementCount ; i++) {
265	>	elementData[i] = null;
266	>	}
267	>	}
268	>	elementCount = newSize;
269		}
270
271		/**
#	Line 277 | Line 276 | public class Vector<E>
276		*          of this vector)
277		*/
278		public synchronized int capacity() {
279	<	return elementData.length;
279	>	return elementData.length;
280		}
281
282		/**
#	Line 286 | Line 285 | public class Vector<E>
285		* @return  the number of components in this vector
286		*/
287		public synchronized int size() {
288	<	return elementCount;
288	>	return elementCount;
289		}
290
291		/**
#	Line 297 | Line 296 | public class Vector<E>
296		*          {@code false} otherwise.
297		*/
298		public synchronized boolean isEmpty() {
299	<	return elementCount == 0;
299	>	return elementCount == 0;
300		}
301
302		/**
#	Line 310 | Line 309 | public class Vector<E>
309		* @see     Iterator
310		*/
311		public Enumeration<E> elements() {
312	<	return new Enumeration<E>() {
313	<	int count = 0;
312	>	return new Enumeration<E>() {
313	>	int count = 0;
314
315	<	public boolean hasMoreElements() {
316	<	return count < elementCount;
317	<	}
318	<
319	<	public E nextElement() {
320	<	synchronized (Vector.this) {
321	<	if (count < elementCount) {
322	<	return elementData(count++);
323	<	}
324	<	}
325	<	throw new NoSuchElementException("Vector Enumeration");
326	<	}
327	<	};
315	>	public boolean hasMoreElements() {
316	>	return count < elementCount;
317	>	}
318	>
319	>	public E nextElement() {
320	>	synchronized (Vector.this) {
321	>	if (count < elementCount) {
322	>	return elementData(count++);
323	>	}
324	>	}
325	>	throw new NoSuchElementException("Vector Enumeration");
326	>	}
327	>	};
328		}
329
330		/**
#	Line 338 | Line 337 | public class Vector<E>
337		* @return {@code true} if this vector contains the specified element
338		*/
339		public boolean contains(Object o) {
340	<	return indexOf(o, 0) >= 0;
340	>	return indexOf(o, 0) >= 0;
341		}
342
343		/**
#	Line 353 | Line 352 | public class Vector<E>
352		*         this vector, or -1 if this vector does not contain the element
353		*/
354		public int indexOf(Object o) {
355	<	return indexOf(o, 0);
355	>	return indexOf(o, 0);
356		}
357
358		/**
#	Line 373 | Line 372 | public class Vector<E>
372		* @see     Object#equals(Object)
373		*/
374		public synchronized int indexOf(Object o, int index) {
375	<	if (o == null) {
376	<	for (int i = index ; i < elementCount ; i++)
377	<	if (elementData[i]==null)
378	<	return i;
379	<	} else {
380	<	for (int i = index ; i < elementCount ; i++)
381	<	if (o.equals(elementData[i]))
382	<	return i;
383	<	}
384	<	return -1;
375	>	if (o == null) {
376	>	for (int i = index ; i < elementCount ; i++)
377	>	if (elementData[i]==null)
378	>	return i;
379	>	} else {
380	>	for (int i = index ; i < elementCount ; i++)
381	>	if (o.equals(elementData[i]))
382	>	return i;
383	>	}
384	>	return -1;
385		}
386
387		/**
#	Line 397 | Line 396 | public class Vector<E>
396		*         this vector, or -1 if this vector does not contain the element
397		*/
398		public synchronized int lastIndexOf(Object o) {
399	<	return lastIndexOf(o, elementCount-1);
399	>	return lastIndexOf(o, elementCount-1);
400		}
401
402		/**
#	Line 420 | Line 419 | public class Vector<E>
419		if (index >= elementCount)
420		throw new IndexOutOfBoundsException(index + " >= "+ elementCount);
421
422	<	if (o == null) {
423	<	for (int i = index; i >= 0; i--)
424	<	if (elementData[i]==null)
425	<	return i;
426	<	} else {
427	<	for (int i = index; i >= 0; i--)
428	<	if (o.equals(elementData[i]))
429	<	return i;
430	<	}
431	<	return -1;
422	>	if (o == null) {
423	>	for (int i = index; i >= 0; i--)
424	>	if (elementData[i]==null)
425	>	return i;
426	>	} else {
427	>	for (int i = index; i >= 0; i--)
428	>	if (o.equals(elementData[i]))
429	>	return i;
430	>	}
431	>	return -1;
432		}
433
434		/**
#	Line 441 | Line 440 | public class Vector<E>
440		* @param      index   an index into this vector
441		* @return     the component at the specified index
442		* @throws ArrayIndexOutOfBoundsException if the index is out of range
443	<	*         ({@code index < 0 || index >= size()})
443	>	*         ({@code index < 0 || index >= size()})
444		*/
445		public synchronized E elementAt(int index) {
446	<	if (index >= elementCount) {
447	<	throw new ArrayIndexOutOfBoundsException(index + " >= " + elementCount);
448	<	}
446	>	if (index >= elementCount) {
447	>	throw new ArrayIndexOutOfBoundsException(index + " >= " + elementCount);
448	>	}
449
450		return elementData(index);
451		}
#	Line 459 | Line 458 | public class Vector<E>
458		* @throws NoSuchElementException if this vector has no components
459		*/
460		public synchronized E firstElement() {
461	<	if (elementCount == 0) {
462	<	throw new NoSuchElementException();
463	<	}
464	<	return elementData(0);
461	>	if (elementCount == 0) {
462	>	throw new NoSuchElementException();
463	>	}
464	>	return elementData(0);
465		}
466
467		/**
#	Line 473 | Line 472 | public class Vector<E>
472		* @throws NoSuchElementException if this vector is empty
473		*/
474		public synchronized E lastElement() {
475	<	if (elementCount == 0) {
476	<	throw new NoSuchElementException();
477	<	}
478	<	return elementData(elementCount - 1);
475	>	if (elementCount == 0) {
476	>	throw new NoSuchElementException();
477	>	}
478	>	return elementData(elementCount - 1);
479		}
480
481		/**
#	Line 497 | Line 496 | public class Vector<E>
496		* @param      obj     what the component is to be set to
497		* @param      index   the specified index
498		* @throws ArrayIndexOutOfBoundsException if the index is out of range
499	<	*         ({@code index < 0 || index >= size()})
499	>	*         ({@code index < 0 || index >= size()})
500		*/
501		public synchronized void setElementAt(E obj, int index) {
502	<	if (index >= elementCount) {
503	<	throw new ArrayIndexOutOfBoundsException(index + " >= " +
504	<	elementCount);
505	<	}
506	<	elementData[index] = obj;
502	>	if (index >= elementCount) {
503	>	throw new ArrayIndexOutOfBoundsException(index + " >= " +
504	>	elementCount);
505	>	}
506	>	elementData[index] = obj;
507		}
508
509		/**
#	Line 524 | Line 523 | public class Vector<E>
523		*
524		* @param      index   the index of the object to remove
525		* @throws ArrayIndexOutOfBoundsException if the index is out of range
526	<	*         ({@code index < 0 || index >= size()})
526	>	*         ({@code index < 0 || index >= size()})
527		*/
528		public synchronized void removeElementAt(int index) {
529	<	modCount++;
530	<	if (index >= elementCount) {
531	<	throw new ArrayIndexOutOfBoundsException(index + " >= " +
532	<	elementCount);
533	<	}
534	<	else if (index < 0) {
535	<	throw new ArrayIndexOutOfBoundsException(index);
536	<	}
537	<	int j = elementCount - index - 1;
538	<	if (j > 0) {
539	<	System.arraycopy(elementData, index + 1, elementData, index, j);
540	<	}
541	<	elementCount--;
542	<	elementData[elementCount] = null; /* to let gc do its work */
529	>	modCount++;
530	>	if (index >= elementCount) {
531	>	throw new ArrayIndexOutOfBoundsException(index + " >= " +
532	>	elementCount);
533	>	}
534	>	else if (index < 0) {
535	>	throw new ArrayIndexOutOfBoundsException(index);
536	>	}
537	>	int j = elementCount - index - 1;
538	>	if (j > 0) {
539	>	System.arraycopy(elementData, index + 1, elementData, index, j);
540	>	}
541	>	elementCount--;
542	>	elementData[elementCount] = null; /* to let gc do its work */
543		}
544
545		/**
#	Line 564 | Line 563 | public class Vector<E>
563		* @param      obj     the component to insert
564		* @param      index   where to insert the new component
565		* @throws ArrayIndexOutOfBoundsException if the index is out of range
566	<	*         ({@code index < 0 || index > size()})
566	>	*         ({@code index < 0 || index > size()})
567		*/
568		public synchronized void insertElementAt(E obj, int index) {
569	<	modCount++;
570	<	if (index > elementCount) {
571	<	throw new ArrayIndexOutOfBoundsException(index
572	<	+ " > " + elementCount);
573	<	}
574	<	ensureCapacityHelper(elementCount + 1);
575	<	System.arraycopy(elementData, index, elementData, index + 1, elementCount - index);
576	<	elementData[index] = obj;
577	<	elementCount++;
569	>	modCount++;
570	>	if (index > elementCount) {
571	>	throw new ArrayIndexOutOfBoundsException(index
572	>	+ " > " + elementCount);
573	>	}
574	>	ensureCapacityHelper(elementCount + 1);
575	>	System.arraycopy(elementData, index, elementData, index + 1, elementCount - index);
576	>	elementData[index] = obj;
577	>	elementCount++;
578		}
579
580		/**
#	Line 590 | Line 589 | public class Vector<E>
589		* @param   obj   the component to be added
590		*/
591		public synchronized void addElement(E obj) {
592	<	modCount++;
593	<	ensureCapacityHelper(elementCount + 1);
594	<	elementData[elementCount++] = obj;
592	>	modCount++;
593	>	ensureCapacityHelper(elementCount + 1);
594	>	elementData[elementCount++] = obj;
595		}
596
597		/**
#	Line 611 | Line 610 | public class Vector<E>
610		*          vector; {@code false} otherwise.
611		*/
612		public synchronized boolean removeElement(Object obj) {
613	<	modCount++;
614	<	int i = indexOf(obj);
615	<	if (i >= 0) {
616	<	removeElementAt(i);
617	<	return true;
618	<	}
619	<	return false;
613	>	modCount++;
614	>	int i = indexOf(obj);
615	>	if (i >= 0) {
616	>	removeElementAt(i);
617	>	return true;
618	>	}
619	>	return false;
620		}
621
622		/**
#	Line 628 | Line 627 | public class Vector<E>
627		*/
628		public synchronized void removeAllElements() {
629		modCount++;
630	<	// Let gc do its work
631	<	for (int i = 0; i < elementCount; i++)
632	<	elementData[i] = null;
630	>	// Let gc do its work
631	>	for (int i = 0; i < elementCount; i++)
632	>	elementData[i] = null;
633
634	<	elementCount = 0;
634	>	elementCount = 0;
635		}
636
637		/**
#	Line 643 | Line 642 | public class Vector<E>
642		* @return  a clone of this vector
643		*/
644		public synchronized Object clone() {
645	<	try {
646	<	@SuppressWarnings("unchecked")
647	<	Vector<E> v = (Vector<E>) super.clone();
648	<	v.elementData = Arrays.copyOf(elementData, elementCount);
649	<	v.modCount = 0;
650	<	return v;
651	<	} catch (CloneNotSupportedException e) {
652	<	// this shouldn't happen, since we are Cloneable
653	<	throw new InternalError();
654	<	}
645	>	try {
646	>	@SuppressWarnings("unchecked")
647	>	Vector<E> v = (Vector<E>) super.clone();
648	>	v.elementData = Arrays.copyOf(elementData, elementCount);
649	>	v.modCount = 0;
650	>	return v;
651	>	} catch (CloneNotSupportedException e) {
652	>	// this shouldn't happen, since we are Cloneable
653	>	throw new InternalError();
654	>	}
655		}
656
657		/**
#	Line 680 | Line 679 | public class Vector<E>
679		* does not contain any null elements.)
680		*
681		* @param a the array into which the elements of the Vector are to
682	<	*          be stored, if it is big enough; otherwise, a new array of the
683	<	*          same runtime type is allocated for this purpose.
682	>	*          be stored, if it is big enough; otherwise, a new array of the
683	>	*          same runtime type is allocated for this purpose.
684		* @return an array containing the elements of the Vector
685		* @throws ArrayStoreException if the runtime type of a is not a supertype
686		* of the runtime type of every element in this Vector
#	Line 693 | Line 692 | public class Vector<E>
692		if (a.length < elementCount)
693		return (T[]) Arrays.copyOf(elementData, elementCount, a.getClass());
694
695	<	System.arraycopy(elementData, 0, a, 0, elementCount);
695	>	System.arraycopy(elementData, 0, a, 0, elementCount);
696
697		if (a.length > elementCount)
698		a[elementCount] = null;
#	Line 705 | Line 704 | public class Vector<E>
704
705		@SuppressWarnings("unchecked")
706		E elementData(int index) {
707	<	return (E) elementData[index];
707	>	return (E) elementData[index];
708		}
709
710		/**
#	Line 718 | Line 717 | public class Vector<E>
717		* @since 1.2
718		*/
719		public synchronized E get(int index) {
720	<	if (index >= elementCount)
721	<	throw new ArrayIndexOutOfBoundsException(index);
720	>	if (index >= elementCount)
721	>	throw new ArrayIndexOutOfBoundsException(index);
722
723	<	return elementData(index);
723	>	return elementData(index);
724		}
725
726		/**
#	Line 732 | Line 731 | public class Vector<E>
731		* @param element element to be stored at the specified position
732		* @return the element previously at the specified position
733		* @throws ArrayIndexOutOfBoundsException if the index is out of range
734	<	*         ({@code index < 0 || index >= size()})
734	>	*         ({@code index < 0 || index >= size()})
735		* @since 1.2
736		*/
737		public synchronized E set(int index, E element) {
738	<	if (index >= elementCount)
739	<	throw new ArrayIndexOutOfBoundsException(index);
738	>	if (index >= elementCount)
739	>	throw new ArrayIndexOutOfBoundsException(index);
740
741	<	E oldValue = elementData(index);
742	<	elementData[index] = element;
743	<	return oldValue;
741	>	E oldValue = elementData(index);
742	>	elementData[index] = element;
743	>	return oldValue;
744		}
745
746		/**
#	Line 752 | Line 751 | public class Vector<E>
751		* @since 1.2
752		*/
753		public synchronized boolean add(E e) {
754	<	modCount++;
755	<	ensureCapacityHelper(elementCount + 1);
756	<	elementData[elementCount++] = e;
754	>	modCount++;
755	>	ensureCapacityHelper(elementCount + 1);
756	>	elementData[elementCount++] = e;
757		return true;
758		}
759
#	Line 800 | Line 799 | public class Vector<E>
799		* @since 1.2
800		*/
801		public synchronized E remove(int index) {
802	<	modCount++;
803	<	if (index >= elementCount)
804	<	throw new ArrayIndexOutOfBoundsException(index);
805	<	E oldValue = elementData(index);
806	<
807	<	int numMoved = elementCount - index - 1;
808	<	if (numMoved > 0)
809	<	System.arraycopy(elementData, index+1, elementData, index,
810	<	numMoved);
811	<	elementData[--elementCount] = null; // Let gc do its work
802	>	modCount++;
803	>	if (index >= elementCount)
804	>	throw new ArrayIndexOutOfBoundsException(index);
805	>	E oldValue = elementData(index);
806	>
807	>	int numMoved = elementCount - index - 1;
808	>	if (numMoved > 0)
809	>	System.arraycopy(elementData, index+1, elementData, index,
810	>	numMoved);
811	>	elementData[--elementCount] = null; // Let gc do its work
812
813	<	return oldValue;
813	>	return oldValue;
814		}
815
816		/**
#	Line 833 | Line 832 | public class Vector<E>
832		* @param   c a collection whose elements will be tested for containment
833		*          in this Vector
834		* @return true if this Vector contains all of the elements in the
835	<	*         specified collection
835	>	*         specified collection
836		* @throws NullPointerException if the specified collection is null
837		*/
838		public synchronized boolean containsAll(Collection<?> c) {
#	Line 854 | Line 853 | public class Vector<E>
853		* @since 1.2
854		*/
855		public synchronized boolean addAll(Collection<? extends E> c) {
856	<	modCount++;
856	>	modCount++;
857		Object[] a = c.toArray();
858		int numNew = a.length;
859	<	ensureCapacityHelper(elementCount + numNew);
859	>	ensureCapacityHelper(elementCount + numNew);
860		System.arraycopy(a, 0, elementData, elementCount, numNew);
861		elementCount += numNew;
862	<	return numNew != 0;
862	>	return numNew != 0;
863		}
864
865		/**
#	Line 919 | Line 918 | public class Vector<E>
918		* @since 1.2
919		*/
920		public synchronized boolean addAll(int index, Collection<? extends E> c) {
921	<	modCount++;
922	<	if (index < 0 || index > elementCount)
923	<	throw new ArrayIndexOutOfBoundsException(index);
921	>	modCount++;
922	>	if (index < 0 || index > elementCount)
923	>	throw new ArrayIndexOutOfBoundsException(index);
924
925		Object[] a = c.toArray();
926	<	int numNew = a.length;
927	<	ensureCapacityHelper(elementCount + numNew);
926	>	int numNew = a.length;
927	>	ensureCapacityHelper(elementCount + numNew);
928
929	<	int numMoved = elementCount - index;
930	<	if (numMoved > 0)
931	<	System.arraycopy(elementData, index, elementData, index + numNew,
932	<	numMoved);
929	>	int numMoved = elementCount - index;
930	>	if (numMoved > 0)
931	>	System.arraycopy(elementData, index, elementData, index + numNew,
932	>	numMoved);
933
934		System.arraycopy(a, 0, elementData, index, numNew);
935	<	elementCount += numNew;
936	<	return numNew != 0;
935	>	elementCount += numNew;
936	>	return numNew != 0;
937		}
938
939		/**
#	Line 982 | Line 981 | public class Vector<E>
981		* instead of a whole List.  For example, the following idiom
982		* removes a range of elements from a List:
983		* <pre>
984	<	*      list.subList(from, to).clear();
984	>	*      list.subList(from, to).clear();
985		* </pre>
986		* Similar idioms may be constructed for indexOf and lastIndexOf,
987		* and all of the algorithms in the Collections class can be applied to
#	Line 1000 | Line 999 | public class Vector<E>
999		* @throws IndexOutOfBoundsException if an endpoint index value is out of range
1000		*         {@code (fromIndex < 0 || toIndex > size)}
1001		* @throws IllegalArgumentException if the endpoint indices are out of order
1002	<	*         {@code (fromIndex > toIndex)}
1002	>	*         {@code (fromIndex > toIndex)}
1003		*/
1004		public synchronized List<E> subList(int fromIndex, int toIndex) {
1005		return Collections.synchronizedList(super.subList(fromIndex, toIndex),
#	Line 1015 | Line 1014 | public class Vector<E>
1014		* (If {@code toIndex==fromIndex}, this operation has no effect.)
1015		*/
1016		protected synchronized void removeRange(int fromIndex, int toIndex) {
1017	<	modCount++;
1018	<	int numMoved = elementCount - toIndex;
1017	>	modCount++;
1018	>	int numMoved = elementCount - toIndex;
1019		System.arraycopy(elementData, toIndex, elementData, fromIndex,
1020		numMoved);
1021
1022	<	// Let gc do its work
1023	<	int newElementCount = elementCount - (toIndex-fromIndex);
1024	<	while (elementCount != newElementCount)
1025	<	elementData[--elementCount] = null;
1022	>	// Let gc do its work
1023	>	int newElementCount = elementCount - (toIndex-fromIndex);
1024	>	while (elementCount != newElementCount)
1025	>	elementData[--elementCount] = null;
1026		}
1027
1028		/**
#	Line 1034 | Line 1033 | public class Vector<E>
1033		private synchronized void writeObject(java.io.ObjectOutputStream s)
1034		throws java.io.IOException
1035		{
1036	<	s.defaultWriteObject();
1036	>	s.defaultWriteObject();
1037		}
1038
1039		/**
#	Line 1050 | Line 1049 | public class Vector<E>
1049		* @throws IndexOutOfBoundsException {@inheritDoc}
1050		*/
1051		public synchronized ListIterator<E> listIterator(int index) {
1052	<	if (index < 0 || index > elementCount)
1052	>	if (index < 0 || index > elementCount)
1053		throw new IndexOutOfBoundsException("Index: "+index);
1054	<	return new ListItr(index);
1054	>	return new ListItr(index);
1055		}
1056
1057		/**
#	Line 1064 | Line 1063 | public class Vector<E>
1063		* @see #listIterator(int)
1064		*/
1065		public synchronized ListIterator<E> listIterator() {
1066	<	return new ListItr(0);
1066	>	return new ListItr(0);
1067		}
1068
1069		/**
#	Line 1075 | Line 1074 | public class Vector<E>
1074		* @return an iterator over the elements in this list in proper sequence
1075		*/
1076		public synchronized Iterator<E> iterator() {
1077	<	return new Itr();
1077	>	return new Itr();
1078		}
1079
1080		/**
1081		* An optimized version of AbstractList.Itr
1082		*/
1083		private class Itr implements Iterator<E> {
1084	<	int cursor;       // index of next element to return
1085	<	int lastRet = -1; // index of last element returned; -1 if no such
1086	<	int expectedModCount = modCount;
1084	>	int cursor;       // index of next element to return
1085	>	int lastRet = -1; // index of last element returned; -1 if no such
1086	>	int expectedModCount = modCount;
1087
1088	<	public boolean hasNext() {
1088	>	public boolean hasNext() {
1089		// Racy but within spec, since modifications are checked
1090		// within or after synchronization in next/previous
1091		return cursor != elementCount;
1092	<	}
1092	>	}
1093	>
1094	>	public E next() {
1095	>	synchronized (Vector.this) {
1096	>	checkForComodification();
1097	>	int i = cursor;
1098	>	if (i >= elementCount)
1099	>	throw new NoSuchElementException();
1100	>	cursor = i + 1;
1101	>	return elementData(lastRet = i);
1102	>	}
1103	>	}
1104
1105	<	public E next() {
1106	<	synchronized (Vector.this) {
1107	<	checkForComodification();
1108	<	int i = cursor;
1109	<	if (i >= elementCount)
1110	<	throw new NoSuchElementException();
1111	<	cursor = i + 1;
1102	<	return elementData(lastRet = i);
1103	<	}
1104	<	}
1105	<
1106	<	public void remove() {
1107	<	if (lastRet == -1)
1108	<	throw new IllegalStateException();
1109	<	synchronized (Vector.this) {
1110	<	checkForComodification();
1111	<	Vector.this.remove(lastRet);
1112	<	expectedModCount = modCount;
1105	>	public void remove() {
1106	>	if (lastRet == -1)
1107	>	throw new IllegalStateException();
1108	>	synchronized (Vector.this) {
1109	>	checkForComodification();
1110	>	Vector.this.remove(lastRet);
1111	>	expectedModCount = modCount;
1112		}
1113	<	cursor = lastRet;
1114	<	lastRet = -1;
1115	<	}
1116	<
1117	<	final void checkForComodification() {
1118	<	if (modCount != expectedModCount)
1119	<	throw new ConcurrentModificationException();
1120	<	}
1113	>	cursor = lastRet;
1114	>	lastRet = -1;
1115	>	}
1116	>
1117	>	final void checkForComodification() {
1118	>	if (modCount != expectedModCount)
1119	>	throw new ConcurrentModificationException();
1120	>	}
1121		}
1122
1123		/**
1124		* An optimized version of AbstractList.ListItr
1125		*/
1126		final class ListItr extends Itr implements ListIterator<E> {
1127	<	ListItr(int index) {
1128	<	super();
1129	<	cursor = index;
1130	<	}
1131	<
1132	<	public boolean hasPrevious() {
1133	<	return cursor != 0;
1134	<	}
1135	<
1136	<	public int nextIndex() {
1137	<	return cursor;
1138	<	}
1139	<
1140	<	public int previousIndex() {
1141	<	return cursor - 1;
1142	<	}
1143	<
1144	<	public E previous() {
1145	<	synchronized (Vector.this) {
1146	<	checkForComodification();
1147	<	int i = cursor - 1;
1148	<	if (i < 0)
1149	<	throw new NoSuchElementException();
1150	<	cursor = i;
1151	<	return elementData(lastRet = i);
1152	<	}
1153	<	}
1154	<
1155	<	public void set(E e) {
1156	<	if (lastRet == -1)
1157	<	throw new IllegalStateException();
1158	<	synchronized (Vector.this) {
1159	<	checkForComodification();
1160	<	Vector.this.set(lastRet, e);
1161	<	}
1162	<	}
1163	<
1164	<	public void add(E e) {
1165	<	int i = cursor;
1166	<	synchronized (Vector.this) {
1167	<	checkForComodification();
1168	<	Vector.this.add(i, e);
1169	<	expectedModCount = modCount;
1170	<	}
1171	<	cursor = i + 1;
1172	<	lastRet = -1;
1173	<	}
1127	>	ListItr(int index) {
1128	>	super();
1129	>	cursor = index;
1130	>	}
1131	>
1132	>	public boolean hasPrevious() {
1133	>	return cursor != 0;
1134	>	}
1135	>
1136	>	public int nextIndex() {
1137	>	return cursor;
1138	>	}
1139	>
1140	>	public int previousIndex() {
1141	>	return cursor - 1;
1142	>	}
1143	>
1144	>	public E previous() {
1145	>	synchronized (Vector.this) {
1146	>	checkForComodification();
1147	>	int i = cursor - 1;
1148	>	if (i < 0)
1149	>	throw new NoSuchElementException();
1150	>	cursor = i;
1151	>	return elementData(lastRet = i);
1152	>	}
1153	>	}
1154	>
1155	>	public void set(E e) {
1156	>	if (lastRet == -1)
1157	>	throw new IllegalStateException();
1158	>	synchronized (Vector.this) {
1159	>	checkForComodification();
1160	>	Vector.this.set(lastRet, e);
1161	>	}
1162	>	}
1163	>
1164	>	public void add(E e) {
1165	>	int i = cursor;
1166	>	synchronized (Vector.this) {
1167	>	checkForComodification();
1168	>	Vector.this.add(i, e);
1169	>	expectedModCount = modCount;
1170	>	}
1171	>	cursor = i + 1;
1172	>	lastRet = -1;
1173	>	}
1174		}
1175		}

Diff Legend

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