--- jsr166/src/test/loops/MapWordLoops.java 2014/12/31 17:00:58 1.10 +++ jsr166/src/test/loops/MapWordLoops.java 2016/10/23 03:03:23 1.13 @@ -39,7 +39,6 @@ public class MapWordLoops { for (int s = WORDS_FILES.length-1; s >= 0; --s) tests(mapClass, numTests, s); - } static void tests(Class mapClass, int numTests, int sizeIndex) { @@ -65,11 +64,9 @@ public class MapWordLoops { } } - static Map newMap(Class cl) { try { - Map m = (Map)cl.newInstance(); - return m; + return (Map) cl.getConstructor().newInstance(); } catch (Exception e) { throw new RuntimeException("Can't instantiate " + cl + ": " + e); } @@ -127,7 +124,6 @@ public class MapWordLoops { return runTime; } - static class Runner implements Runnable { final Map map; final String[] key; @@ -148,7 +144,6 @@ public class MapWordLoops { rng = new LoopHelpers.SimpleRandom((id + 1) * 8862213513L); } - int oneStep(int j) { int n = key.length; int r = rng.next() & 0x7FFFFFFF;