--- jsr166/src/jsr166y/ForkJoinTask.java 2009/07/25 15:50:57 1.18 +++ jsr166/src/jsr166y/ForkJoinTask.java 2009/07/26 06:26:37 1.21 @@ -493,7 +493,7 @@ public abstract class ForkJoinTask im * #inForkJoinPool}). Attempts to invoke in other contexts result * in exceptions or errors, possibly including ClassCastException. * - * @return this, to simplify usage. + * @return {@code this}, to simplify usage. */ public final ForkJoinTask fork() { ((ForkJoinWorkerThread) Thread.currentThread()) @@ -606,13 +606,14 @@ public abstract class ForkJoinTask im * in exceptions or errors, possibly including ClassCastException. * * @param tasks the collection of tasks + * @return the tasks argument, to simplify usage * @throws NullPointerException if tasks or any element are null * @throws RuntimeException or Error if any task did so */ - public static void invokeAll(Collection> tasks) { + public static > Collection invokeAll(Collection tasks) { if (!(tasks instanceof List)) { invokeAll(tasks.toArray(new ForkJoinTask[tasks.size()])); - return; + return tasks; } @SuppressWarnings("unchecked") List> ts = @@ -647,6 +648,7 @@ public abstract class ForkJoinTask im } if (ex != null) rethrowException(ex); + return tasks; } /** @@ -1040,9 +1042,9 @@ public abstract class ForkJoinTask im // adaptors /** - * Returns a new ForkJoinTask that performs the run + * Returns a new ForkJoinTask that performs the {@code run} * method of the given Runnable as its action, and returns a null - * result upon join. + * result upon {@code join}. * * @param runnable the runnable action * @return the task @@ -1052,9 +1054,9 @@ public abstract class ForkJoinTask im } /** - * Returns a new ForkJoinTask that performs the run + * Returns a new ForkJoinTask that performs the {@code run} * method of the given Runnable as its action, and returns the - * given result upon join. + * given result upon {@code join}. * * @param runnable the runnable action * @param result the result upon completion @@ -1065,10 +1067,10 @@ public abstract class ForkJoinTask im } /** - * Returns a new ForkJoinTask that performs the call + * Returns a new ForkJoinTask that performs the {@code call} * method of the given Callable as its action, and returns its - * result upon join, translating any checked - * exceptions encountered into RuntimeException. + * result upon {@code join}, translating any checked + * exceptions encountered into {@code RuntimeException}. * * @param callable the callable action * @return the task @@ -1147,7 +1149,7 @@ public abstract class ForkJoinTask im } private static final sun.misc.Unsafe UNSAFE = getUnsafe(); - static final long statusOffset = + private static final long statusOffset = fieldOffset("status", ForkJoinTask.class); }