--- jsr166/src/test/tck/ReentrantReadWriteLockTest.java	2003/11/10 13:32:08	1.6
+++ jsr166/src/test/tck/ReentrantReadWriteLockTest.java	2003/12/27 14:16:33	1.10
@@ -56,12 +56,12 @@ public class ReentrantReadWriteLockTest
         public Collection<Thread> getQueuedThreads() { 
             return super.getQueuedThreads(); 
         }
-        public WriterConditionObject newCondition() { 
-            return new PublicCondition(this);
+        public PublicCondition newCondition() { 
+            return new PublicCondition();
         }
 
-        static class PublicCondition extends ReentrantReadWriteLock.WriterConditionObject {
-            PublicCondition(PublicReentrantReadWriteLock l) { super(l); }
+        class PublicCondition extends ReentrantReadWriteLock.WriterConditionObject {
+            PublicCondition() { }
             public Collection<Thread> getWaitingThreads() { 
                 return super.getWaitingThreads(); 
             }
@@ -76,11 +76,11 @@ public class ReentrantReadWriteLockTest
 	ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
         assertFalse(rl.isFair());
         assertFalse(rl.isWriteLocked());
-        assertEquals(0, rl.getReadLocks());
+        assertEquals(0, rl.getReadLockCount());
 	ReentrantReadWriteLock r2 = new ReentrantReadWriteLock(true);
         assertTrue(r2.isFair());
         assertFalse(r2.isWriteLocked());
-        assertEquals(0, r2.getReadLocks());
+        assertEquals(0, r2.getReadLockCount());
     }
 
     /**
@@ -91,19 +91,19 @@ public class ReentrantReadWriteLockTest
         rl.writeLock().lock();
         assertTrue(rl.isWriteLocked());
         assertTrue(rl.isWriteLockedByCurrentThread());
-        assertEquals(0, rl.getReadLocks());
+        assertEquals(0, rl.getReadLockCount());
         rl.writeLock().unlock();
         assertFalse(rl.isWriteLocked());
         assertFalse(rl.isWriteLockedByCurrentThread());
-        assertEquals(0, rl.getReadLocks());
+        assertEquals(0, rl.getReadLockCount());
         rl.readLock().lock();
         assertFalse(rl.isWriteLocked());
         assertFalse(rl.isWriteLockedByCurrentThread());
-        assertEquals(1, rl.getReadLocks());
+        assertEquals(1, rl.getReadLockCount());
         rl.readLock().unlock();
         assertFalse(rl.isWriteLocked());
         assertFalse(rl.isWriteLockedByCurrentThread());
-        assertEquals(0, rl.getReadLocks());
+        assertEquals(0, rl.getReadLockCount());
     }
 
 
@@ -115,19 +115,19 @@ public class ReentrantReadWriteLockTest
         rl.writeLock().lock();
         assertTrue(rl.isWriteLocked());
         assertTrue(rl.isWriteLockedByCurrentThread());
-        assertEquals(0, rl.getReadLocks());
+        assertEquals(0, rl.getReadLockCount());
         rl.writeLock().unlock();
         assertFalse(rl.isWriteLocked());
         assertFalse(rl.isWriteLockedByCurrentThread());
-        assertEquals(0, rl.getReadLocks());
+        assertEquals(0, rl.getReadLockCount());
         rl.readLock().lock();
         assertFalse(rl.isWriteLocked());
         assertFalse(rl.isWriteLockedByCurrentThread());
-        assertEquals(1, rl.getReadLocks());
+        assertEquals(1, rl.getReadLockCount());
         rl.readLock().unlock();
         assertFalse(rl.isWriteLocked());
         assertFalse(rl.isWriteLockedByCurrentThread());
-        assertEquals(0, rl.getReadLocks());
+        assertEquals(0, rl.getReadLockCount());
     }
 
     /**