--- jsr166/src/jsr166e/extra/ReadMostlyVector.java 2011/07/19 12:05:09 1.9 +++ jsr166/src/jsr166e/extra/ReadMostlyVector.java 2011/07/19 12:16:06 1.10 @@ -688,7 +688,7 @@ public class ReadMostlyVector impleme } public Iterator iterator() { - return new Itr(this, 0); + return new Itr(this, 0); } public int lastIndexOf(Object o) { @@ -717,11 +717,11 @@ public class ReadMostlyVector impleme } public ListIterator listIterator() { - return new Itr(this, 0); + return new Itr(this, 0); } public ListIterator listIterator(int index) { - return new Itr(this, index); + return new Itr(this, index); } public E remove(int index) { @@ -784,7 +784,7 @@ public class ReadMostlyVector impleme int ssize = toIndex - fromIndex; if (fromIndex < 0 || toIndex > c || ssize < 0) throw new IndexOutOfBoundsException(); - return new ReadMostlyVectorSublist(this, fromIndex, ssize); + return new ReadMostlyVectorSublist(this, fromIndex, ssize); } public Object[] toArray() { @@ -1060,7 +1060,7 @@ public class ReadMostlyVector impleme /** See {@link Vector#elements} */ public Enumeration elements() { - return new Itr(this, 0); + return new Itr(this, 0); } /** See {@link Vector#capacity} */ @@ -1106,7 +1106,7 @@ public class ReadMostlyVector impleme // other methods - public Object clone() { + public ReadMostlyVector clone() { SequenceLock lock = this.lock; Object[] a = null; boolean retry = false; @@ -1126,7 +1126,7 @@ public class ReadMostlyVector impleme lock.unlock(); } } - return new ReadMostlyVector(a, n, capacityIncrement); + return new ReadMostlyVector(a, n, capacityIncrement); } private void writeObject(java.io.ObjectOutputStream s) @@ -1416,7 +1416,7 @@ public class ReadMostlyVector impleme } public Iterator iterator() { - return new SubItr(this, offset); + return new SubItr(this, offset); } public int lastIndexOf(Object o) { @@ -1440,11 +1440,11 @@ public class ReadMostlyVector impleme } public ListIterator listIterator() { - return new SubItr(this, offset); + return new SubItr(this, offset); } public ListIterator listIterator(int index) { - return new SubItr(this, index + offset); + return new SubItr(this, index + offset); } public E remove(int index) { @@ -1504,7 +1504,7 @@ public class ReadMostlyVector impleme int ssize = toIndex - fromIndex; if (fromIndex < 0 || toIndex > c || ssize < 0) throw new IndexOutOfBoundsException(); - return new ReadMostlyVectorSublist(list, offset+fromIndex, ssize); + return new ReadMostlyVectorSublist(list, offset+fromIndex, ssize); } public Object[] toArray() {