ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/main/java/util/concurrent/ForkJoinTask.java

Comparing jsr166/src/main/java/util/concurrent/ForkJoinTask.java (file contents):
Revision 1.81 by dl, Thu Jun 20 15:06:50 2013 UTC vs.
Revision 1.82 by jsr166, Thu Jul 18 17:13:42 2013 UTC

#	Line 781 | Line 781 | public abstract class ForkJoinTask<V> im
781		* unprocessed.
782		*
783		* @param tasks the collection of tasks
784	+	* @param <T> the type of the values returned from the tasks
785		* @return the tasks argument, to simplify usage
786		* @throws NullPointerException if tasks or any element are null
787		*/
#	Line 1443 | Line 1444 | public abstract class ForkJoinTask<V> im
1444		*
1445		* @param runnable the runnable action
1446		* @param result the result upon completion
1447	+	* @param <T> the type of the result
1448		* @return the task
1449		*/
1450		public static <T> ForkJoinTask<T> adapt(Runnable runnable, T result) {
#	Line 1456 | Line 1458 | public abstract class ForkJoinTask<V> im
1458		* encountered into {@code RuntimeException}.
1459		*
1460		* @param callable the callable action
1461	+	* @param <T> the type of the callable's result
1462		* @return the task
1463		*/
1464		public static <T> ForkJoinTask<T> adapt(Callable<? extends T> callable) {

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines