--- jsr166/src/test/loops/UncheckedLockLoops.java	2009/10/29 23:09:08	1.4
+++ jsr166/src/test/loops/UncheckedLockLoops.java	2015/08/10 03:13:34	1.12
@@ -1,16 +1,16 @@
 /*
  * Written by Doug Lea with assistance from members of JCP JSR-166
  * Expert Group and released to the public domain, as explained at
- * http://creativecommons.org/licenses/publicdomain
+ * http://creativecommons.org/publicdomain/zero/1.0/
  */
 /*
  * @test
  * @summary basic safety and liveness of ReentrantLocks, and other locks based on them
  */
 
+import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.locks.*;
-import java.util.*;
 
 public final class UncheckedLockLoops {
     static final LoopHelpers.SimpleRandom rng = new LoopHelpers.SimpleRandom();
@@ -49,11 +49,10 @@ public final class UncheckedLockLoops {
             oneTest(i, iters / i);
             Thread.sleep(100);
         }
-
     }
 
     static void oneTest(int nthreads, int iters) throws Exception {
-        int fairIters = (nthreads <= 1)? iters : iters/20;
+        int fairIters = (nthreads <= 1) ? iters : iters/20;
         int v = rng.next();
 
         if (print)
@@ -118,10 +117,9 @@ public final class UncheckedLockLoops {
             System.out.print("FairRReadWriteLock     ");
         new FairReentrantReadWriteLockLoop().test(v, nthreads, fairIters);
         Thread.sleep(10);
-
     }
 
-    static abstract class LockLoop implements Runnable {
+    abstract static class LockLoop implements Runnable {
         int value;
         int checkValue;
         int iters;
@@ -155,7 +153,7 @@ public final class UncheckedLockLoops {
             if (print) {
                 long tpi = time / (iters * nthreads);
                 System.out.print("\t" + LoopHelpers.rightJustify(tpi) + " ns per update");
-                //                double secs = (double)(time) / 1000000000.0;
+                //                double secs = (double) time / 1000000000.0;
                 //                System.out.print("\t " + secs + "s run time");
                 System.out.println();
             }
@@ -201,7 +199,7 @@ public final class UncheckedLockLoops {
             int sum = 0;
             int x = 0;
             while (n-- > 0) {
-                synchronized(this) {
+                synchronized (this) {
                     x = setValue(LoopHelpers.compute1(getValue()));
                 }
                 sum += LoopHelpers.compute2(x);
@@ -211,7 +209,7 @@ public final class UncheckedLockLoops {
     }
 
     private static class ReentrantLockLoop extends LockLoop {
-        final private ReentrantLock lock = new ReentrantLock();
+        private final ReentrantLock lock = new ReentrantLock();
         final int loop(int n) {
             final ReentrantLock lock = this.lock;
             int sum = 0;
@@ -231,7 +229,7 @@ public final class UncheckedLockLoops {
     }
 
     private static class MutexLoop extends LockLoop {
-        final private Mutex lock = new Mutex();
+        private final Mutex lock = new Mutex();
         final int loop(int n) {
             final Mutex lock = this.lock;
             int sum = 0;
@@ -251,7 +249,7 @@ public final class UncheckedLockLoops {
     }
 
     private static class LongMutexLoop extends LockLoop {
-        final private LongMutex lock = new LongMutex();
+        private final LongMutex lock = new LongMutex();
         final int loop(int n) {
             final LongMutex lock = this.lock;
             int sum = 0;
@@ -271,7 +269,7 @@ public final class UncheckedLockLoops {
     }
 
     private static class FairReentrantLockLoop extends LockLoop {
-        final private ReentrantLock lock = new ReentrantLock(true);
+        private final ReentrantLock lock = new ReentrantLock(true);
         final int loop(int n) {
             final ReentrantLock lock = this.lock;
             int sum = 0;
@@ -291,7 +289,7 @@ public final class UncheckedLockLoops {
     }
 
     private static class ReentrantWriteLockLoop extends LockLoop {
-        final private Lock lock = new ReentrantReadWriteLock().writeLock();
+        private final Lock lock = new ReentrantReadWriteLock().writeLock();
         final int loop(int n) {
             final Lock lock = this.lock;
             int sum = 0;
@@ -331,7 +329,7 @@ public final class UncheckedLockLoops {
     }
 
     private static class SemaphoreLoop extends LockLoop {
-        final private Semaphore sem = new Semaphore(1, false);
+        private final Semaphore sem = new Semaphore(1, false);
         final int loop(int n) {
             final Semaphore sem = this.sem;
             int sum = 0;
@@ -350,7 +348,7 @@ public final class UncheckedLockLoops {
         }
     }
     private static class FairSemaphoreLoop extends LockLoop {
-        final private Semaphore sem = new Semaphore(1, true);
+        private final Semaphore sem = new Semaphore(1, true);
         final int loop(int n) {
             final Semaphore sem = this.sem;
             int sum = 0;
@@ -370,7 +368,7 @@ public final class UncheckedLockLoops {
     }
 
     private static class ReentrantReadWriteLockLoop extends LockLoop {
-        final private ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
+        private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
         final int loop(int n) {
             final Lock rlock = lock.readLock();
             final Lock wlock = lock.writeLock();
@@ -403,9 +401,8 @@ public final class UncheckedLockLoops {
 
     }
 
-
     private static class FairReentrantReadWriteLockLoop extends LockLoop {
-        final private ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
+        private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
         final int loop(int n) {
             final Lock rlock = lock.readLock();
             final Lock wlock = lock.writeLock();