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.17 by jsr166, Mon Jun 26 00:17:48 2006 UTC vs.
Revision 1.26 by jsr166, Wed Jul 22 00:00:07 2009 UTC

#	Line 1 | Line 1
1		/*
2	<	* %W% %E%
2	>	* Copyright 1994-2008 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;
#	Line 23 | Line 41 | package java.util;
41		* capacity of a vector before inserting a large number of
42		* components; this reduces the amount of incremental reallocation.
43		*
44	<	* <p>The Iterators returned by Vector's iterator and listIterator
45	<	* methods are <em>fail-fast</em>: if the Vector is structurally modified
46	<	* at any time after the Iterator is created, in any way except through the
47	<	* Iterator's own remove or add methods, the Iterator will throw a
48	<	* ConcurrentModificationException.  Thus, in the face of concurrent
49	<	* modification, the Iterator fails quickly and cleanly, rather than risking
50	<	* arbitrary, non-deterministic behavior at an undetermined time in the future.
51	<	* The Enumerations returned by Vector's elements method are <em>not</em>
52	<	* fail-fast.
44	>	* <p><a name="fail-fast"/>
45	>	* The iterators returned by this class's {@link #iterator() iterator} and
46	>	* {@link #listIterator(int) listIterator} methods are <em>fail-fast</em>:
47	>	* if the vector is structurally modified at any time after the iterator is
48	>	* created, in any way except through the iterator's own
49	>	* {@link ListIterator#remove() remove} or
50	>	* {@link ListIterator#add(Object) add} methods, the iterator will throw a
51	>	* {@link ConcurrentModificationException}.  Thus, in the face of
52	>	* concurrent modification, the iterator fails quickly and cleanly, rather
53	>	* than risking arbitrary, non-deterministic behavior at an undetermined
54	>	* time in the future.  The {@link Enumeration Enumerations} returned by
55	>	* the {@link #elements() elements} method are <em>not</em> fail-fast.
56		*
57		* <p>Note that the fail-fast behavior of an iterator cannot be guaranteed
58		* as it is, generally speaking, impossible to make any hard guarantees in the
#	Line 43 | 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
52	–	* @version %I%, %G%
75		* @see Collection
54	–	* @see List
55	–	* @see ArrayList
76		* @see LinkedList
77		* @since   JDK1.0
78		*/
#	Line 104 | 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 121 | 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 130 | Line 150 | public class Vector<E>
150		* zero.
151		*/
152		public Vector() {
153	<	this(10);
153	>	this(10);
154		}
155
156		/**
#	Line 144 | 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 165 | 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 177 | 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 202 | 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 215 | 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 237 | 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 256 | 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 265 | 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 276 | 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 289 | 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 boolean hasMoreElements() {
320	<	return count < elementCount;
321	<	}
322	<
323	<	public E nextElement() {
324	<	synchronized (Vector.this) {
325	<	if (count < elementCount) {
326	<	return (E)elementData[count++];
327	<	}
304	<	}
305	<	throw new NoSuchElementException("Vector Enumeration");
306	<	}
307	<	};
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 317 | 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 332 | 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 352 | 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 376 | 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 399 | 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 420 | 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 (E)elementData[index];
450	>	return elementData(index);
451		}
452
453		/**
#	Line 438 | 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 (E)elementData[0];
461	>	if (elementCount == 0) {
462	>	throw new NoSuchElementException();
463	>	}
464	>	return elementData(0);
465		}
466
467		/**
#	Line 452 | 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 (E)elementData[elementCount - 1];
475	>	if (elementCount == 0) {
476	>	throw new NoSuchElementException();
477	>	}
478	>	return elementData(elementCount - 1);
479		}
480
481		/**
#	Line 476 | 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 503 | 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 543 | 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 563 | Line 583 | public class Vector<E>
583		* increased if its size becomes greater than its capacity.
584		*
585		* <p>This method is identical in functionality to the
586	<	* {@link #remove(Object)} method (which is part of the
587	<	* {@link List} interface).
586	>	* {@link #add(Object) add(E)}
587	>	* method (which is part of the {@link List} interface).
588		*
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 581 | Line 601 | public class Vector<E>
601		* object's index is shifted downward to have an index one smaller
602		* than the value it had previously.
603		*
604	<	* <p>This method is identical in functionality to the remove(Object)
605	<	* method (which is part of the List interface).
604	>	* <p>This method is identical in functionality to the
605	>	* {@link #remove(Object)} method (which is part of the
606	>	* {@link List} interface).
607		*
608		* @param   obj   the component to be removed
609		* @return  {@code true} if the argument was a component of this
610		*          vector; {@code false} otherwise.
590	–	* @see     List#remove(Object)
591	–	* @see     List
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 608 | 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 623 | Line 642 | public class Vector<E>
642		* @return  a clone of this vector
643		*/
644		public synchronized Object clone() {
645	<	try {
646	<	Vector<E> v = (Vector<E>) super.clone();
647	<	v.elementData = Arrays.copyOf(elementData, elementCount);
648	<	v.modCount = 0;
649	<	return v;
650	<	} catch (CloneNotSupportedException e) {
651	<	// this shouldn't happen, since we are Cloneable
652	<	throw new InternalError();
653	<	}
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 659 | 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
687		* @throws NullPointerException if the given array is null
688		* @since 1.2
689		*/
690	+	@SuppressWarnings("unchecked")
691		public synchronized <T> T[] toArray(T[] a) {
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 681 | Line 702 | public class Vector<E>
702
703		// Positional Access Operations
704
705	+	@SuppressWarnings("unchecked")
706	+	E elementData(int index) {
707	+	return (E) elementData[index];
708	+	}
709	+
710		/**
711		* Returns the element at the specified position in this Vector.
712		*
#	Line 691 | 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 (E)elementData[index];
723	>	return elementData(index);
724		}
725
726		/**
#	Line 705 | 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	<	Object oldValue = elementData[index];
742	<	elementData[index] = element;
743	<	return (E)oldValue;
741	>	E oldValue = elementData(index);
742	>	elementData[index] = element;
743	>	return oldValue;
744		}
745
746		/**
#	Line 725 | 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 766 | Line 792 | public class Vector<E>
792		* Shifts any subsequent elements to the left (subtracts one from their
793		* indices).  Returns the element that was removed from the Vector.
794		*
795	<	* @exception ArrayIndexOutOfBoundsException index out of range (index
796	<	*            &lt; 0 || index &gt;= size())
795	>	* @throws ArrayIndexOutOfBoundsException if the index is out of range
796	>	*         ({@code index < 0 || index >= size()})
797		* @param index the index of the element to be removed
798		* @return element that was removed
799		* @since 1.2
800		*/
801		public synchronized E remove(int index) {
802	<	modCount++;
803	<	if (index >= elementCount)
804	<	throw new ArrayIndexOutOfBoundsException(index);
805	<	Object 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 (E)oldValue;
813	>	return oldValue;
814		}
815
816		/**
#	Line 806 | 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 827 | 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 886 | Line 912 | public class Vector<E>
912		*              specified collection
913		* @param c elements to be inserted into this Vector
914		* @return {@code true} if this Vector changed as a result of the call
915	<	* @exception ArrayIndexOutOfBoundsException index out of range (index
916	<	*            &lt; 0 || index &gt; size())
915	>	* @throws ArrayIndexOutOfBoundsException if the index is out of range
916	>	*         ({@code index < 0 || index > size()})
917		* @throws NullPointerException if the specified collection is null
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 942 | Line 968 | public class Vector<E>
968		}
969
970		/**
971	<	* Removes from this List all of the elements whose index is between
972	<	* fromIndex, inclusive and toIndex, exclusive.  Shifts any succeeding
973	<	* elements to the left (reduces their index).
974	<	* This call shortens the Vector by (toIndex - fromIndex) elements.  (If
975	<	* toIndex==fromIndex, this operation has no effect.)
971	>	* Returns a view of the portion of this List between fromIndex,
972	>	* inclusive, and toIndex, exclusive.  (If fromIndex and toIndex are
973	>	* equal, the returned List is empty.)  The returned List is backed by this
974	>	* List, so changes in the returned List are reflected in this List, and
975	>	* vice-versa.  The returned List supports all of the optional List
976	>	* operations supported by this List.
977		*
978	<	* @param fromIndex index of first element to be removed
979	<	* @param toIndex index after last element to be removed
978	>	* <p>This method eliminates the need for explicit range operations (of
979	>	* the sort that commonly exist for arrays).  Any operation that expects
980	>	* a List can be used as a range operation by operating on a subList view
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();
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
988	>	* a subList.
989	>	*
990	>	* <p>The semantics of the List returned by this method become undefined if
991	>	* the backing list (i.e., this List) is <i>structurally modified</i> in
992	>	* any way other than via the returned List.  (Structural modifications are
993	>	* those that change the size of the List, or otherwise perturb it in such
994	>	* a fashion that iterations in progress may yield incorrect results.)
995	>	*
996	>	* @param fromIndex low endpoint (inclusive) of the subList
997	>	* @param toIndex high endpoint (exclusive) of the subList
998	>	* @return a view of the specified range within this List
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)}
1003	>	*/
1004	>	public synchronized List<E> subList(int fromIndex, int toIndex) {
1005	>	return Collections.synchronizedList(super.subList(fromIndex, toIndex),
1006	>	this);
1007	>	}
1008	>
1009	>	/**
1010	>	* Removes from this list all of the elements whose index is between
1011	>	* {@code fromIndex}, inclusive, and {@code toIndex}, exclusive.
1012	>	* Shifts any succeeding elements to the left (reduces their index).
1013	>	* This call shortens the list by {@code (toIndex - fromIndex)} elements.
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 971 | 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		/**
1040	<	* Returns a list-iterator of the elements in this list (in proper
1040	>	* Returns a list iterator over the elements in this list (in proper
1041		* sequence), starting at the specified position in the list.
1042	<	* Obeys the general contract of {@link List#listIterator(int)}.
1042	>	* The specified index indicates the first element that would be
1043	>	* returned by an initial call to {@link ListIterator#next next}.
1044	>	* An initial call to {@link ListIterator#previous previous} would
1045	>	* return the element with the specified index minus one.
1046	>	*
1047	>	* <p>The returned list iterator is <a href="#fail-fast"><i>fail-fast</i></a>.
1048		*
982	–	* <p>The list-iterator is <i>fail-fast</i>: if the list is structurally
983	–	* modified at any time after the Iterator is created, in any way except
984	–	* through the list-iterator's own {@code remove} or {@code add}
985	–	* methods, the list-iterator will throw a
986	–	* {@code ConcurrentModificationException}.  Thus, in the face of
987	–	* concurrent modification, the iterator fails quickly and cleanly, rather
988	–	* than risking arbitrary, non-deterministic behavior at an undetermined
989	–	* time in the future.
990	–	*
991	–	* @param index index of the first element to be returned from the
992	–	*        list-iterator (by a call to {@link ListIterator#next})
993	–	* @return a list-iterator of the elements in this list (in proper
994	–	*         sequence), starting at the specified position in the list
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 VectorIterator(index, elementCount);
1054	>	return new ListItr(index);
1055		}
1056
1057		/**
1058	<	* {@inheritDoc}
1058	>	* Returns a list iterator over the elements in this list (in proper
1059	>	* sequence).
1060	>	*
1061	>	* <p>The returned list iterator is <a href="#fail-fast"><i>fail-fast</i></a>.
1062	>	*
1063	>	* @see #listIterator(int)
1064		*/
1065		public synchronized ListIterator<E> listIterator() {
1066	<	return new VectorIterator(0, elementCount);
1066	>	return new ListItr(0);
1067		}
1068
1069		/**
1070		* Returns an iterator over the elements in this list in proper sequence.
1071		*
1072	+	* <p>The returned iterator is <a href="#fail-fast"><i>fail-fast</i></a>.
1073	+	*
1074		* @return an iterator over the elements in this list in proper sequence
1075		*/
1076		public synchronized Iterator<E> iterator() {
1077	<	return new VectorIterator(0, elementCount);
1077	>	return new Itr();
1078		}
1079
1080		/**
1081	<	* Helper method to access array elements under synchronization by
1021	<	* iterators. The caller performs index check with respect to
1022	<	* expected bounds, so errors accessing the element are reported
1023	<	* as ConcurrentModificationExceptions.
1081	>	* An optimized version of AbstractList.Itr
1082		*/
1083	<	final synchronized Object iteratorGet(int index, int expectedModCount) {
1084	<	if (modCount == expectedModCount) {
1085	<	try {
1086	<	return elementData[index];
1029	<	} catch(IndexOutOfBoundsException fallThrough) {
1030	<	}
1031	<	}
1032	<	throw new ConcurrentModificationException();
1033	<	}
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;
1087
1088	<	/**
1089	<	* Streamlined specialization of AbstractList version of iterator.
1090	<	* Locally perfroms bounds checks, but relies on outer Vector
1091	<	* to access elements under synchronization.
1039	<	*/
1040	<	private final class VectorIterator implements ListIterator<E> {
1041	<	int cursor;              // Index of next element to return;
1042	<	int fence;               // Upper bound on cursor (cache of size())
1043	<	int lastRet;             // Index of last element, or -1 if no such
1044	<	int expectedModCount;    // To check for CME
1045	<
1046	<	VectorIterator(int index, int fence) {
1047	<	this.cursor = index;
1048	<	this.fence = fence;
1049	<	this.lastRet = -1;
1050	<	this.expectedModCount = Vector.this.modCount;
1051	<	}
1052	<
1053	<	public boolean hasNext() {
1054	<	return cursor < fence;
1055	<	}
1056	<
1057	<	public boolean hasPrevious() {
1058	<	return cursor > 0;
1059	<	}
1060	<
1061	<	public int nextIndex() {
1062	<	return cursor;
1063	<	}
1064	<
1065	<	public int previousIndex() {
1066	<	return cursor - 1;
1067	<	}
1068	<
1069	<	public E next() {
1070	<	int i = cursor;
1071	<	if (i >= fence)
1072	<	throw new NoSuchElementException();
1073	<	Object next = Vector.this.iteratorGet(i, expectedModCount);
1074	<	lastRet = i;
1075	<	cursor = i + 1;
1076	<	return (E)next;
1077	<	}
1078	<
1079	<	public E previous() {
1080	<	int i = cursor - 1;
1081	<	if (i < 0)
1082	<	throw new NoSuchElementException();
1083	<	Object prev = Vector.this.iteratorGet(i, expectedModCount);
1084	<	lastRet = i;
1085	<	cursor = i;
1086	<	return (E)prev;
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		}
1093
1094	<	public void set(E e) {
1095	<	if (lastRet < 0)
1096	<	throw new IllegalStateException();
1092	<	if (Vector.this.modCount != expectedModCount)
1093	<	throw new ConcurrentModificationException();
1094	<	try {
1095	<	Vector.this.set(lastRet, e);
1096	<	expectedModCount = Vector.this.modCount;
1097	<	} catch (IndexOutOfBoundsException ex) {
1098	<	throw new ConcurrentModificationException();
1099	<	}
1100	<	}
1101	<
1102	<	public void remove() {
1103	<	int i = lastRet;
1104	<	if (i < 0)
1105	<	throw new IllegalStateException();
1106	<	if (Vector.this.modCount != expectedModCount)
1107	<	throw new ConcurrentModificationException();
1108	<	try {
1109	<	Vector.this.remove(i);
1110	<	if (i < cursor)
1111	<	cursor--;
1112	<	lastRet = -1;
1113	<	fence = Vector.this.size();
1114	<	expectedModCount = Vector.this.modCount;
1115	<	} catch (IndexOutOfBoundsException ex) {
1116	<	throw new ConcurrentModificationException();
1117	<	}
1118	<	}
1119	<
1120	<	public void add(E e) {
1121	<	if (Vector.this.modCount != expectedModCount)
1122	<	throw new ConcurrentModificationException();
1123	<	try {
1094	>	public E next() {
1095	>	synchronized (Vector.this) {
1096	>	checkForComodification();
1097		int i = cursor;
1098	<	Vector.this.add(i, e);
1098	>	if (i >= elementCount)
1099	>	throw new NoSuchElementException();
1100		cursor = i + 1;
1101	<	lastRet = -1;
1128	<	fence = Vector.this.size();
1129	<	expectedModCount = Vector.this.modCount;
1130	<	} catch (IndexOutOfBoundsException ex) {
1131	<	throw new ConcurrentModificationException();
1132	<	}
1133	<	}
1134	<	}
1135	<
1136	<	/**
1137	<	* Returns a view of the portion of this List between fromIndex,
1138	<	* inclusive, and toIndex, exclusive.  (If fromIndex and toIndex are
1139	<	* equal, the returned List is empty.)  The returned List is backed by this
1140	<	* List, so changes in the returned List are reflected in this List, and
1141	<	* vice-versa.  The returned List supports all of the optional List
1142	<	* operations supported by this List.
1143	<	*
1144	<	* <p>This method eliminates the need for explicit range operations (of
1145	<	* the sort that commonly exist for arrays).   Any operation that expects
1146	<	* a List can be used as a range operation by operating on a subList view
1147	<	* instead of a whole List.  For example, the following idiom
1148	<	* removes a range of elements from a List:
1149	<	* <pre>
1150	<	*      list.subList(from, to).clear();
1151	<	* </pre>
1152	<	* Similar idioms may be constructed for indexOf and lastIndexOf,
1153	<	* and all of the algorithms in the Collections class can be applied to
1154	<	* a subList.
1155	<	*
1156	<	* <p>The semantics of the List returned by this method become undefined if
1157	<	* the backing list (i.e., this List) is <i>structurally modified</i> in
1158	<	* any way other than via the returned List.  (Structural modifications are
1159	<	* those that change the size of the List, or otherwise perturb it in such
1160	<	* a fashion that iterations in progress may yield incorrect results.)
1161	<	*
1162	<	* @param fromIndex low endpoint (inclusive) of the subList
1163	<	* @param toIndex high endpoint (exclusive) of the subList
1164	<	* @return a view of the specified range within this List
1165	<	* @throws IndexOutOfBoundsException endpoint index value out of range
1166	<	*         <code>(fromIndex &lt; 0 || toIndex &gt; size)</code>
1167	<	* @throws IllegalArgumentException endpoint indices out of order
1168	<	*         <code>(fromIndex &gt; toIndex)</code>
1169	<	*/
1170	<	public synchronized List<E> subList(int fromIndex, int toIndex) {
1171	<	return new VectorSubList(this, this, fromIndex, fromIndex, toIndex);
1172	<	}
1173	<
1174	<	/**
1175	<	* This class specializes the AbstractList version of SubList to
1176	<	* avoid the double-indirection penalty that would arise using a
1177	<	* synchronized wrapper, as well as to avoid some unnecessary
1178	<	* checks in sublist iterators.
1179	<	*/
1180	<	private static final class VectorSubList<E> extends AbstractList<E> implements RandomAccess {
1181	<	final Vector<E> base;             // base list
1182	<	final AbstractList<E> parent;     // Creating list
1183	<	final int baseOffset;             // index wrt Vector
1184	<	final int parentOffset;           // index wrt parent
1185	<	int length;                       // length of sublist
1186	<
1187	<	VectorSubList(Vector<E> base, AbstractList<E> parent, int baseOffset,
1188	<	int fromIndex, int toIndex) {
1189	<	if (fromIndex < 0)
1190	<	throw new IndexOutOfBoundsException("fromIndex = " + fromIndex);
1191	<	if (toIndex > parent.size())
1192	<	throw new IndexOutOfBoundsException("toIndex = " + toIndex);
1193	<	if (fromIndex > toIndex)
1194	<	throw new IllegalArgumentException("fromIndex(" + fromIndex +
1195	<	") > toIndex(" + toIndex + ")");
1196	<
1197	<	this.base = base;
1198	<	this.parent = parent;
1199	<	this.baseOffset = baseOffset;
1200	<	this.parentOffset = fromIndex;
1201	<	this.length = toIndex - fromIndex;
1202	<	modCount = base.modCount;
1203	<	}
1204	<
1205	<	/**
1206	<	* Returns an IndexOutOfBoundsException with nicer message
1207	<	*/
1208	<	private IndexOutOfBoundsException indexError(int index) {
1209	<	return new IndexOutOfBoundsException("Index: " + index +
1210	<	", Size: " + length);
1211	<	}
1212	<
1213	<	public E set(int index, E element) {
1214	<	synchronized(base) {
1215	<	if (index < 0 || index >= length)
1216	<	throw indexError(index);
1217	<	if (base.modCount != modCount)
1218	<	throw new ConcurrentModificationException();
1219	<	return base.set(index + baseOffset, element);
1220	<	}
1221	<	}
1222	<
1223	<	public E get(int index) {
1224	<	synchronized(base) {
1225	<	if (index < 0 || index >= length)
1226	<	throw indexError(index);
1227	<	if (base.modCount != modCount)
1228	<	throw new ConcurrentModificationException();
1229	<	return base.get(index + baseOffset);
1230	<	}
1231	<	}
1232	<
1233	<	public int size() {
1234	<	synchronized(base) {
1235	<	if (base.modCount != modCount)
1236	<	throw new ConcurrentModificationException();
1237	<	return length;
1238	<	}
1239	<	}
1240	<
1241	<	public void add(int index, E element) {
1242	<	synchronized(base) {
1243	<	if (index < 0 || index > length)
1244	<	throw indexError(index);
1245	<	if (base.modCount != modCount)
1246	<	throw new ConcurrentModificationException();
1247	<	parent.add(index + parentOffset, element);
1248	<	length++;
1249	<	modCount = base.modCount;
1101	>	return elementData(lastRet = i);
1102		}
1103		}
1104
1105	<	public E remove(int index) {
1106	<	synchronized(base) {
1107	<	if (index < 0 || index >= length)
1108	<	throw indexError(index);
1109	<	if (base.modCount != modCount)
1110	<	throw new ConcurrentModificationException();
1111	<	E result = parent.remove(index + parentOffset);
1260	<	length--;
1261	<	modCount = base.modCount;
1262	<	return result;
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	<	protected void removeRange(int fromIndex, int toIndex) {
1118	<	synchronized(base) {
1119	<	if (base.modCount != modCount)
1269	<	throw new ConcurrentModificationException();
1270	<	parent.removeRange(fromIndex + parentOffset,
1271	<	toIndex + parentOffset);
1272	<	length -= (toIndex-fromIndex);
1273	<	modCount = base.modCount;
1274	<	}
1275	<	}
1276	<
1277	<	public boolean addAll(Collection<? extends E> c) {
1278	<	return addAll(length, c);
1279	<	}
1280	<
1281	<	public boolean addAll(int index, Collection<? extends E> c) {
1282	<	synchronized(base) {
1283	<	if (index < 0 || index > length)
1284	<	throw indexError(index);
1285	<	int cSize = c.size();
1286	<	if (cSize==0)
1287	<	return false;
1288	<
1289	<	if (base.modCount != modCount)
1290	<	throw new ConcurrentModificationException();
1291	<	parent.addAll(parentOffset + index, c);
1292	<	modCount = base.modCount;
1293	<	length += cSize;
1294	<	return true;
1295	<	}
1296	<	}
1297	<
1298	<	public boolean equals(Object o) {
1299	<	synchronized(base) {return super.equals(o);}
1300	<	}
1301	<
1302	<	public int hashCode() {
1303	<	synchronized(base) {return super.hashCode();}
1304	<	}
1305	<
1306	<	public int indexOf(Object o) {
1307	<	synchronized(base) {return super.indexOf(o);}
1308	<	}
1309	<
1310	<	public int lastIndexOf(Object o) {
1311	<	synchronized(base) {return super.lastIndexOf(o);}
1117	>	final void checkForComodification() {
1118	>	if (modCount != expectedModCount)
1119	>	throw new ConcurrentModificationException();
1120		}
1121	+	}
1122
1123	<	public List<E> subList(int fromIndex, int toIndex) {
1124	<	return new VectorSubList(base, this, fromIndex + baseOffset,
1125	<	fromIndex, toIndex);
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 Iterator<E> iterator() {
1133	<	synchronized(base) {
1321	<	return new VectorSubListIterator(this, 0);
1322	<	}
1132	>	public boolean hasPrevious() {
1133	>	return cursor != 0;
1134		}
1135
1136	<	public synchronized ListIterator<E> listIterator() {
1137	<	synchronized(base) {
1327	<	return new VectorSubListIterator(this, 0);
1328	<	}
1136	>	public int nextIndex() {
1137	>	return cursor;
1138		}
1139
1140	<	public ListIterator<E> listIterator(int index) {
1141	<	synchronized(base) {
1333	<	if (index < 0 || index > length)
1334	<	throw indexError(index);
1335	<	return new VectorSubListIterator(this, index);
1336	<	}
1140	>	public int previousIndex() {
1141	>	return cursor - 1;
1142		}
1143
1144	<	/**
1145	<	* Same idea as VectorIterator, except routing structural
1146	<	* change operations through the sublist.
1342	<	*/
1343	<	private static final class VectorSubListIterator<E> implements ListIterator<E> {
1344	<	final Vector<E> base;         // base list
1345	<	final VectorSubList<E> outer; // Sublist creating this iteraor
1346	<	final int offset;             // cursor offset wrt base
1347	<	int cursor;                   // Current index
1348	<	int fence;                    // Upper bound on cursor
1349	<	int lastRet;                  // Index of returned element, or -1
1350	<	int expectedModCount;         // Expected modCount of base Vector
1351	<
1352	<	VectorSubListIterator(VectorSubList<E> list, int index) {
1353	<	this.lastRet = -1;
1354	<	this.cursor = index;
1355	<	this.outer = list;
1356	<	this.offset = list.baseOffset;
1357	<	this.fence = list.length;
1358	<	this.base = list.base;
1359	<	this.expectedModCount = base.modCount;
1360	<	}
1361	<
1362	<	public boolean hasNext() {
1363	<	return cursor < fence;
1364	<	}
1365	<
1366	<	public boolean hasPrevious() {
1367	<	return cursor > 0;
1368	<	}
1369	<
1370	<	public int nextIndex() {
1371	<	return cursor;
1372	<	}
1373	<
1374	<	public int previousIndex() {
1375	<	return cursor - 1;
1376	<	}
1377	<
1378	<	public E next() {
1379	<	int i = cursor;
1380	<	if (cursor >= fence)
1381	<	throw new NoSuchElementException();
1382	<	Object next = base.iteratorGet(i + offset, expectedModCount);
1383	<	lastRet = i;
1384	<	cursor = i + 1;
1385	<	return (E)next;
1386	<	}
1387	<
1388	<	public E previous() {
1144	>	public E previous() {
1145	>	synchronized (Vector.this) {
1146	>	checkForComodification();
1147		int i = cursor - 1;
1148		if (i < 0)
1149		throw new NoSuchElementException();
1392	–	Object prev = base.iteratorGet(i + offset, expectedModCount);
1393	–	lastRet = i;
1150		cursor = i;
1151	<	return (E)prev;
1396	<	}
1397	<
1398	<	public void set(E e) {
1399	<	if (lastRet < 0)
1400	<	throw new IllegalStateException();
1401	<	if (base.modCount != expectedModCount)
1402	<	throw new ConcurrentModificationException();
1403	<	try {
1404	<	outer.set(lastRet, e);
1405	<	expectedModCount = base.modCount;
1406	<	} catch (IndexOutOfBoundsException ex) {
1407	<	throw new ConcurrentModificationException();
1408	<	}
1151	>	return elementData(lastRet = i);
1152		}
1153	+	}
1154
1155	<	public void remove() {
1156	<	int i = lastRet;
1157	<	if (i < 0)
1158	<	throw new IllegalStateException();
1159	<	if (base.modCount != expectedModCount)
1160	<	throw new ConcurrentModificationException();
1417	<	try {
1418	<	outer.remove(i);
1419	<	if (i < cursor)
1420	<	cursor--;
1421	<	lastRet = -1;
1422	<	fence = outer.length;
1423	<	expectedModCount = base.modCount;
1424	<	} catch (IndexOutOfBoundsException ex) {
1425	<	throw new ConcurrentModificationException();
1426	<	}
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	<	if (base.modCount != expectedModCount)
1166	<	throw new ConcurrentModificationException();
1167	<	try {
1168	<	int i = cursor;
1169	<	outer.add(i, e);
1435	<	cursor = i + 1;
1436	<	lastRet = -1;
1437	<	fence = outer.length;
1438	<	expectedModCount = base.modCount;
1439	<	} catch (IndexOutOfBoundsException ex) {
1440	<	throw new ConcurrentModificationException();
1441	<	}
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		}
1446	–
1447	–
1448	–

Diff Legend

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