--- jsr166/src/test/loops/CollectionLoops.java	2011/03/15 19:47:05	1.6
+++ jsr166/src/test/loops/CollectionLoops.java	2015/01/15 18:34:18	1.10
@@ -4,7 +4,6 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-
 import java.util.*;
 import java.util.concurrent.*;
 
@@ -23,7 +22,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]);
@@ -65,9 +64,8 @@ public class CollectionLoops {
         test(4, 100, 100, collectionClass);
         print = true;
 
-        int k = 1;
         int warmups = 2;
-        for (int i = 1; i <= maxThreads;) {
+        for (int k = 1, i = 1; i <= maxThreads;) {
             Thread.sleep(100);
             test(i, nkeys, nops, collectionClass);
             if (warmups > 0)
@@ -104,7 +102,7 @@ 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();
@@ -141,7 +139,7 @@ public class CollectionLoops {
         int total;
         int nops;
 
-        Runner(int id, Collection<Integer> collection, Integer[] key,  CyclicBarrier barrier, int nops) {
+        Runner(int id, Collection<Integer> collection, Integer[] key, CyclicBarrier barrier, int nops) {
             this.collection = collection;
             this.key = key;
             this.barrier = barrier;