--- jsr166/src/test/loops/MapLoops.java	2011/03/15 19:47:05	1.7
+++ jsr166/src/test/loops/MapLoops.java	2014/12/18 18:43:22	1.11
@@ -20,7 +20,7 @@ public class MapLoops {
 
     public static void main(String[] args) throws Exception {
 
-        Class mapClass = null;
+        Class<?> mapClass = null;
         if (args.length > 0) {
             try {
                 mapClass = Class.forName(args[0]);
@@ -58,9 +58,8 @@ public class MapLoops {
         System.out.print(" ops: " + nops);
         System.out.println();
 
-        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, mapClass);
             if (warmups > 0)
@@ -97,7 +96,7 @@ public class MapLoops {
         }
     }
 
-    static void test(int i, int nkeys, Class mapClass) throws Exception {
+    static void test(int i, int nkeys, Class<?> mapClass) throws Exception {
         System.out.print("Threads: " + i + "\t:");
         Map<Integer, Integer> map = (Map<Integer,Integer>)mapClass.newInstance();
         Integer[] key = makeKeys(nkeys);
@@ -127,7 +126,7 @@ public class MapLoops {
         int position;
         int total;
 
-        Runner(int id, Map<Integer,Integer> map, Integer[] key,  CyclicBarrier barrier) {
+        Runner(int id, Map<Integer,Integer> map, Integer[] key, CyclicBarrier barrier) {
             this.map = map;
             this.key = key;
             this.barrier = barrier;
@@ -137,7 +136,7 @@ public class MapLoops {
         }
 
         int step() {
-            // random-walk around key positions,  bunching accesses
+            // random-walk around key positions, bunching accesses
             int r = rng.next();
             position += (r & 7) - 3;
             while (position >= key.length) position -= key.length;