--- jsr166/src/test/loops/CancelledProducerConsumerLoops.java	2010/09/01 07:47:27	1.9
+++ jsr166/src/test/loops/CancelledProducerConsumerLoops.java	2015/01/15 18:34:18	1.14
@@ -1,7 +1,7 @@
 /*
  * 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/
  */
 import java.util.concurrent.*;
 
@@ -32,13 +32,13 @@ public class CancelledProducerConsumerLo
             Thread.sleep(100);
         }
         pool.shutdown();
-   }
+    }
 
     static void oneRun(BlockingQueue<Integer> q, int npairs, int iters) throws Exception {
         LoopHelpers.BarrierTimer timer = new LoopHelpers.BarrierTimer();
         CyclicBarrier barrier = new CyclicBarrier(npairs * 2 + 1, timer);
-        Future[] prods = new Future[npairs];
-        Future[] cons = new Future[npairs];
+        Future<?>[] prods = new Future<?>[npairs];
+        Future<?>[] cons = new Future<?>[npairs];
 
         for (int i = 0; i < npairs; ++i) {
             prods[i] = pool.submit(new Producer(q, barrier, iters));
@@ -95,7 +95,6 @@ public class CancelledProducerConsumerLo
             System.out.print("SynchronousQueue        ");
         oneRun(new SynchronousQueue<Integer>(), pairs, iters / 8);
 
-
         if (print)
             System.out.print("SynchronousQueue(fair)  ");
         oneRun(new SynchronousQueue<Integer>(true), pairs, iters / 8);
@@ -107,7 +106,7 @@ public class CancelledProducerConsumerLo
         */
     }
 
-    static abstract class Stage implements Callable {
+    abstract static class Stage implements Callable {
         final BlockingQueue<Integer> queue;
         final CyclicBarrier barrier;
         final int iters;