--- jsr166/src/jsr166e/ConcurrentHashMapV8.java 2012/08/13 15:52:33 1.52 +++ jsr166/src/jsr166e/ConcurrentHashMapV8.java 2012/08/13 18:13:30 1.53 @@ -3636,7 +3636,7 @@ public class ConcurrentHashMapV8 * * @param action the action */ - public void forEach(BiAction action) { + public void forEach(BiAction action) { fjp.invoke(ForkJoinTasks.forEach (ConcurrentHashMapV8.this, action)); } @@ -3650,7 +3650,7 @@ public class ConcurrentHashMapV8 * which case the action is not applied). * @param action the action */ - public void forEach(BiFun transformer, + public void forEach(BiFun transformer, Action action) { fjp.invoke(ForkJoinTasks.forEach (ConcurrentHashMapV8.this, transformer, action)); @@ -3754,7 +3754,7 @@ public class ConcurrentHashMapV8 * * @param action the action */ - public void forEachKey(Action action) { + public void forEachKey(Action action) { fjp.invoke(ForkJoinTasks.forEachKey (ConcurrentHashMapV8.this, action)); } @@ -3768,7 +3768,7 @@ public class ConcurrentHashMapV8 * which case the action is not applied). * @param action the action */ - public void forEachKey(Fun transformer, + public void forEachKey(Fun transformer, Action action) { fjp.invoke(ForkJoinTasks.forEachKey (ConcurrentHashMapV8.this, transformer, action)); @@ -3884,7 +3884,7 @@ public class ConcurrentHashMapV8 * * @param action the action */ - public void forEachValue(Action action) { + public void forEachValue(Action action) { fjp.invoke(ForkJoinTasks.forEachValue (ConcurrentHashMapV8.this, action)); } @@ -3897,7 +3897,7 @@ public class ConcurrentHashMapV8 * for an element, or null of there is no transformation (in * which case the action is not applied). */ - public void forEachValue(Fun transformer, + public void forEachValue(Fun transformer, Action action) { fjp.invoke(ForkJoinTasks.forEachValue (ConcurrentHashMapV8.this, transformer, action)); @@ -4013,7 +4013,7 @@ public class ConcurrentHashMapV8 * * @param action the action */ - public void forEachEntry(Action> action) { + public void forEachEntry(Action> action) { fjp.invoke(ForkJoinTasks.forEachEntry (ConcurrentHashMapV8.this, action)); } @@ -4027,7 +4027,7 @@ public class ConcurrentHashMapV8 * which case the action is not applied). * @param action the action */ - public void forEachEntry(Fun, ? extends U> transformer, + public void forEachEntry(Fun, ? extends U> transformer, Action action) { fjp.invoke(ForkJoinTasks.forEachEntry (ConcurrentHashMapV8.this, transformer, action)); @@ -4159,7 +4159,7 @@ public class ConcurrentHashMapV8 * @param action the action * @return the task */ - public static ForkJoinTask forEach + public static ForkJoinTask forEach (ConcurrentHashMapV8 map, BiAction action) { if (action == null) throw new NullPointerException(); @@ -4177,7 +4177,7 @@ public class ConcurrentHashMapV8 * @param action the action * @return the task */ - public static ForkJoinTask forEach + public static ForkJoinTask forEach (ConcurrentHashMapV8 map, BiFun transformer, Action action) { @@ -4310,7 +4310,7 @@ public class ConcurrentHashMapV8 * @param action the action * @return the task */ - public static ForkJoinTask forEachKey + public static ForkJoinTask forEachKey (ConcurrentHashMapV8 map, Action action) { if (action == null) throw new NullPointerException(); @@ -4328,7 +4328,7 @@ public class ConcurrentHashMapV8 * @param action the action * @return the task */ - public static ForkJoinTask forEachKey + public static ForkJoinTask forEachKey (ConcurrentHashMapV8 map, Fun transformer, Action action) { @@ -4477,7 +4477,7 @@ public class ConcurrentHashMapV8 * @param map the map * @param action the action */ - public static ForkJoinTask forEachValue + public static ForkJoinTask forEachValue (ConcurrentHashMapV8 map, Action action) { if (action == null) throw new NullPointerException(); @@ -4494,7 +4494,7 @@ public class ConcurrentHashMapV8 * which case the action is not applied). * @param action the action */ - public static ForkJoinTask forEachValue + public static ForkJoinTask forEachValue (ConcurrentHashMapV8 map, Fun transformer, Action action) { @@ -4645,7 +4645,7 @@ public class ConcurrentHashMapV8 * @param map the map * @param action the action */ - public static ForkJoinTask forEachEntry + public static ForkJoinTask forEachEntry (ConcurrentHashMapV8 map, Action> action) { if (action == null) throw new NullPointerException(); @@ -4662,7 +4662,7 @@ public class ConcurrentHashMapV8 * which case the action is not applied). * @param action the action */ - public static ForkJoinTask forEachEntry + public static ForkJoinTask forEachEntry (ConcurrentHashMapV8 map, Fun, ? extends U> transformer, Action action) { @@ -4877,7 +4877,7 @@ public class ConcurrentHashMapV8 try { compute(); } - catch(Throwable ex) { + catch (Throwable ex) { tryAbortComputation(ex); } return false; @@ -4904,7 +4904,7 @@ public class ConcurrentHashMapV8 if (b < 0) { long n = map.counter.sum(); int sp = getPool().getParallelism() << 3; // slack of 8 - b = batch = (n <= 0L)? 0 : (n < (long)sp) ? (int)n : sp; + b = batch = (n <= 0L) ? 0 : (n < (long)sp) ? (int)n : sp; } return b; }