--- jsr166/src/test/loops/LockLoops.java	2010/09/16 03:57:13	1.5
+++ jsr166/src/test/loops/LockLoops.java	2014/12/31 17:00:58	1.9
@@ -1,15 +1,15 @@
 /*
  * 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/
  */
 /*
  * A simple test program. Feel free to play.
  */
 
+import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.locks.*;
-import java.util.*;
 
 public final class LockLoops {
     static final ExecutorService pool = Executors.newCachedThreadPool();
@@ -18,7 +18,7 @@ public final class LockLoops {
     static boolean doBuiltin = true;
     static boolean doReadWrite = true;
     static boolean doSemaphore = true;
-    static boolean doFair =  true;
+    static boolean doFair = true;
 
     public static void main(String[] args) throws Exception {
         int maxThreads = 100;
@@ -131,7 +131,7 @@ public final class LockLoops {
 
     }
 
-    static abstract class LockLoop implements Runnable {
+    abstract static class LockLoop implements Runnable {
         int v;
         int iters;
         volatile int result;
@@ -198,7 +198,7 @@ public final class LockLoops {
     }
 
     private static class NoLockVolatileLoop extends LockLoop {
-        volatile private int vv;
+        private volatile int vv;
         final int loop(int n) {
             int sum = 0;
             while (n-- > 0) {
@@ -211,7 +211,7 @@ public final class LockLoops {
     }
 
     private static class ReentrantLockLoop extends LockLoop {
-        final private ReentrantLock lock = new ReentrantLock();
+        private final ReentrantLock lock = new ReentrantLock();
         final int loop(int n) {
             int sum = 0;
             while (n-- > 0) {
@@ -229,7 +229,7 @@ public final class LockLoops {
     }
 
     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) {
             int sum = 0;
             while (n-- > 0) {
@@ -247,7 +247,7 @@ public final class LockLoops {
     }
 
     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) {
             int sum = 0;
             while (n-- > 0) {
@@ -265,7 +265,7 @@ public final class LockLoops {
     }
 
     private static class ReentrantReadWriteLockLoop extends LockLoop {
-        final private ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
+        private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
         final int loop(int n) {
             int sum = 0;
             while (n-- > 0) {
@@ -309,7 +309,7 @@ public final class LockLoops {
     }
 
     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) {
             int sum = 0;
             try {
@@ -331,7 +331,7 @@ public final class LockLoops {
         }
     }
     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) {
             int sum = 0;
             try {
@@ -354,7 +354,7 @@ public final class LockLoops {
     }
 
     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) {
             int sum = 0;
             while (n-- > 0) {