--- jsr166/src/test/loops/CollectionLoops.java	2014/12/18 18:13:06	1.8
+++ jsr166/src/test/loops/CollectionLoops.java	2016/12/31 19:18:26	1.12
@@ -4,9 +4,11 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.Collection;
+import java.util.Random;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 public class CollectionLoops {
     static int pinsert     = 100;
@@ -23,7 +25,7 @@ public class CollectionLoops {
         int nkeys       = 10000;
         int nops        = 100000;
 
-        Class collectionClass = null;
+        Class<?> collectionClass = null;
         if (args.length > 0) {
             try {
                 collectionClass = Class.forName(args[0]);
@@ -103,10 +105,11 @@ public class CollectionLoops {
         }
     }
 
-    static void test(int i, int nk, int nops, Class collectionClass) throws Exception {
+    static void test(int i, int nk, int nops, Class<?> collectionClass) throws Exception {
         if (print)
             System.out.print("Threads: " + i + "\t:");
-        Collection<Integer> collection = (Collection<Integer>)collectionClass.newInstance();
+        Collection<Integer> collection =
+            (Collection<Integer>) collectionClass.getConstructor().newInstance();
         Integer[] key = makeKeys(nk);
         // Uncomment to start with a non-empty table
         for (int j = 0; j < nk; j += 2)