ViewVC Help

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

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

Comparing jsr166/src/main/java/util/concurrent/CompletableFuture.java (file contents):
Revision 1.11 by jsr166, Sat Dec 29 23:55:19 2012 UTC vs.
Revision 1.12 by jsr166, Sun Dec 30 02:21:42 2012 UTC

#	Line 169 | Line 169 | public class CompletableFuture<T> implem
169		* @return the CompletableFuture
170		*/
171		public static CompletableFuture<Void> runAsync(Runnable runnable,
172	<	Executor executor) {
172	>	Executor executor) {
173		if (executor == null || runnable == null)
174		throw new NullPointerException();
175		CompletableFuture<Void> f = new CompletableFuture<Void>();
#	Line 356 | Line 356 | public class CompletableFuture<T> implem
356		* @return the new CompletableFuture
357		*/
358		public <U> CompletableFuture<U> thenApplyAsync(Function<? super T,? extends U> fn,
359	<	Executor executor) {
359	>	Executor executor) {
360		if (executor == null) throw new NullPointerException();
361		return thenFunction(fn, executor);
362		}
#	Line 456 | Line 456 | public class CompletableFuture<T> implem
456		* @param executor the executor to use for asynchronous execution
457		* @return the new CompletableFuture
458		*/
459	<	public CompletableFuture<Void> thenRunAsync(Runnable action, Executor executor) {
459	>	public CompletableFuture<Void> thenRunAsync(Runnable action,
460	>	Executor executor) {
461		if (executor == null) throw new NullPointerException();
462		return thenRunnable(action, executor);
463		}
#	Line 515 | Line 516 | public class CompletableFuture<T> implem
516		*/
517
518		public <U,V> CompletableFuture<V> thenApplyAsync(CompletableFuture<? extends U> other,
519	<	BiFunction<? super T,? super U,? extends V> fn,
520	<	Executor executor) {
519	>	BiFunction<? super T,? super U,? extends V> fn,
520	>	Executor executor) {
521		if (executor == null) throw new NullPointerException();
522		return andFunction(other, fn, executor);
523		}

Diff Legend

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