--- jsr166/src/test/loops/CancelledProducerConsumerLoops.java	2010/09/27 19:15:15	1.10
+++ jsr166/src/test/loops/CancelledProducerConsumerLoops.java	2016/12/31 19:16:42	1.17
@@ -1,12 +1,24 @@
 /*
  * 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.*;
+
+import java.util.concurrent.BrokenBarrierException;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.Future;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.LinkedTransferQueue;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.TimeUnit;
 
 public class CancelledProducerConsumerLoops {
-    static final int CAPACITY =      100;
+    static final int CAPACITY = 100;
     static final long TIMEOUT = 100;
 
     static final ExecutorService pool = Executors.newCachedThreadPool();
@@ -32,13 +44,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 +107,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);
@@ -156,6 +167,4 @@ public class CancelledProducerConsumerLo
             return new Integer(s);
         }
     }
-
-
 }