--- jsr166/src/test/loops/RWCollection.java 2011/03/15 19:47:05 1.4 +++ jsr166/src/test/loops/RWCollection.java 2012/10/21 06:40:21 1.6 @@ -7,13 +7,11 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.locks.*; - /** * This is an incomplete implementation of a wrapper class * that places read-write locks around unsynchronized Collections. * Exists as a sample input for CollectionLoops test. */ - public final class RWCollection implements Collection { private final Collection c; private final ReentrantReadWriteLock rwl = new ReentrantReadWriteLock(); @@ -29,112 +27,112 @@ public final class RWCollection imple } public final int size() { - final ReentrantReadWriteLock.ReadLock l = rwl.readLock(); + final ReentrantReadWriteLock.ReadLock l = rwl.readLock(); l.lock(); try { return c.size(); } finally { l.unlock(); } } public final boolean isEmpty() { - final ReentrantReadWriteLock.ReadLock l = rwl.readLock(); + final ReentrantReadWriteLock.ReadLock l = rwl.readLock(); l.lock(); try { return c.isEmpty(); } finally { l.unlock(); } } public final boolean contains(Object o) { - final ReentrantReadWriteLock.ReadLock l = rwl.readLock(); + final ReentrantReadWriteLock.ReadLock l = rwl.readLock(); l.lock(); try { return c.contains(o); } finally { l.unlock(); } } public final boolean equals(Object o) { - final ReentrantReadWriteLock.ReadLock l = rwl.readLock(); + final ReentrantReadWriteLock.ReadLock l = rwl.readLock(); l.lock(); try { return c.equals(o); } finally { l.unlock(); } } public final int hashCode() { - final ReentrantReadWriteLock.ReadLock l = rwl.readLock(); + final ReentrantReadWriteLock.ReadLock l = rwl.readLock(); l.lock(); try { return c.hashCode(); } finally { l.unlock(); } } public final String toString() { - final ReentrantReadWriteLock.ReadLock l = rwl.readLock(); + final ReentrantReadWriteLock.ReadLock l = rwl.readLock(); l.lock(); try { return c.toString(); } finally { l.unlock(); } } public final Iterator iterator() { - final ReentrantReadWriteLock.ReadLock l = rwl.readLock(); + final ReentrantReadWriteLock.ReadLock l = rwl.readLock(); l.lock(); try { return c.iterator(); } finally { l.unlock(); } } public final Object[] toArray() { - final ReentrantReadWriteLock.ReadLock l = rwl.readLock(); + final ReentrantReadWriteLock.ReadLock l = rwl.readLock(); l.lock(); try { return c.toArray(); } finally { l.unlock(); } } public final T[] toArray(T[] a) { - final ReentrantReadWriteLock.ReadLock l = rwl.readLock(); + final ReentrantReadWriteLock.ReadLock l = rwl.readLock(); l.lock(); try { return (T[])c.toArray(a); } finally { l.unlock(); } } public final boolean add(E e) { - final ReentrantReadWriteLock.WriteLock l = rwl.writeLock(); + final ReentrantReadWriteLock.WriteLock l = rwl.writeLock(); l.lock(); try { return c.add(e); } finally { l.unlock(); } } public final boolean remove(Object o) { - final ReentrantReadWriteLock.WriteLock l = rwl.writeLock(); + final ReentrantReadWriteLock.WriteLock l = rwl.writeLock(); l.lock(); try { return c.remove(o); } finally { l.unlock(); } } public final boolean containsAll(Collection coll) { - final ReentrantReadWriteLock.WriteLock l = rwl.writeLock(); + final ReentrantReadWriteLock.WriteLock l = rwl.writeLock(); l.lock(); try { return c.containsAll(coll); } finally { l.unlock(); } } public final boolean addAll(Collection coll) { - final ReentrantReadWriteLock.WriteLock l = rwl.writeLock(); + final ReentrantReadWriteLock.WriteLock l = rwl.writeLock(); l.lock(); try { return c.addAll(coll); } finally { l.unlock(); } } public final boolean removeAll(Collection coll) { - final ReentrantReadWriteLock.WriteLock l = rwl.writeLock(); + final ReentrantReadWriteLock.WriteLock l = rwl.writeLock(); l.lock(); try { return c.removeAll(coll); } finally { l.unlock(); } } public final boolean retainAll(Collection coll) { - final ReentrantReadWriteLock.WriteLock l = rwl.writeLock(); + final ReentrantReadWriteLock.WriteLock l = rwl.writeLock(); l.lock(); try { return c.retainAll(coll); } finally { l.unlock(); } } public final void clear() { - final ReentrantReadWriteLock.WriteLock l = rwl.writeLock(); + final ReentrantReadWriteLock.WriteLock l = rwl.writeLock(); l.lock(); try { c.clear(); } finally { l.unlock(); }