ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/main/java/util/concurrent/ForkJoinTask.java
(Generate patch)

Comparing jsr166/src/main/java/util/concurrent/ForkJoinTask.java (file contents):
Revision 1.94 by dl, Mon Aug 3 15:08:08 2015 UTC vs.
Revision 1.95 by jsr166, Thu Sep 3 22:54:46 2015 UTC

# Line 1332 | Line 1332 | public abstract class ForkJoinTask<V> im
1332      }
1333  
1334      /**
1335 <     * Adaptor for Runnables. This implements RunnableFuture
1335 >     * Adapter for Runnables. This implements RunnableFuture
1336       * to be compliant with AbstractExecutorService constraints
1337       * when used in ForkJoinPool.
1338       */
# Line 1353 | Line 1353 | public abstract class ForkJoinTask<V> im
1353      }
1354  
1355      /**
1356 <     * Adaptor for Runnables without results
1356 >     * Adapter for Runnables without results
1357       */
1358      static final class AdaptedRunnableAction extends ForkJoinTask<Void>
1359          implements RunnableFuture<Void> {
# Line 1370 | Line 1370 | public abstract class ForkJoinTask<V> im
1370      }
1371  
1372      /**
1373 <     * Adaptor for Runnables in which failure forces worker exception
1373 >     * Adapter for Runnables in which failure forces worker exception
1374       */
1375      static final class RunnableExecuteAction extends ForkJoinTask<Void> {
1376          final Runnable runnable;
# Line 1388 | Line 1388 | public abstract class ForkJoinTask<V> im
1388      }
1389  
1390      /**
1391 <     * Adaptor for Callables
1391 >     * Adapter for Callables
1392       */
1393      static final class AdaptedCallable<T> extends ForkJoinTask<T>
1394          implements RunnableFuture<T> {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines