Skip to content

Commit

Permalink
Scheduler.Inner -> Scheduler.Worker
Browse files Browse the repository at this point in the history 
As per decision at ReactiveX/RxJava#997 (comment)
  • Loading branch information
@benjchristensen
benjchristensen committed Apr 23, 2014
1 parent 670fbb2 commit a8a1904
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 20 deletions.
32 changes: 16 additions & 16 deletions src/main/java/rx/util/async/Async.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import rx.Observable;
import rx.Observer;
import rx.Scheduler;
import rx.Scheduler.Inner;
import rx.Scheduler.Worker;
import rx.Subscriber;
import rx.Subscription;
import rx.functions.Action0;
Expand Down Expand Up @@ -599,7 +599,7 @@ public static <R> Func0<Observable<R>> toAsync(final Func0<? extends R> func, fi
@Override
public Observable<R> call() {
final AsyncSubject<R> subject = AsyncSubject.create();
final Inner inner = scheduler.createInner();
final Worker inner = scheduler.createWorker();
inner.schedule(new Action0() {
@Override
public void call() {
Expand Down Expand Up @@ -659,7 +659,7 @@ public static <T1, R> Func1<T1, Observable<R>> toAsync(final Func1<? super T1, ?
@Override
public Observable<R> call(final T1 t1) {
final AsyncSubject<R> subject = AsyncSubject.create();
final Inner inner = scheduler.createInner();
final Worker inner = scheduler.createWorker();
inner.schedule(new Action0() {
@Override
public void call() {
Expand Down Expand Up @@ -721,7 +721,7 @@ public static <T1, T2, R> Func2<T1, T2, Observable<R>> toAsync(final Func2<? sup
@Override
public Observable<R> call(final T1 t1, final T2 t2) {
final AsyncSubject<R> subject = AsyncSubject.create();
final Inner inner = scheduler.createInner();
final Worker inner = scheduler.createWorker();
inner.schedule(new Action0() {
@Override
public void call() {
Expand Down Expand Up @@ -785,7 +785,7 @@ public static <T1, T2, T3, R> Func3<T1, T2, T3, Observable<R>> toAsync(final Fun
@Override
public Observable<R> call(final T1 t1, final T2 t2, final T3 t3) {
final AsyncSubject<R> subject = AsyncSubject.create();
final Inner inner = scheduler.createInner();
final Worker inner = scheduler.createWorker();
inner.schedule(new Action0() {
@Override
public void call() {
Expand Down Expand Up @@ -851,7 +851,7 @@ public static <T1, T2, T3, T4, R> Func4<T1, T2, T3, T4, Observable<R>> toAsync(f
@Override
public Observable<R> call(final T1 t1, final T2 t2, final T3 t3, final T4 t4) {
final AsyncSubject<R> subject = AsyncSubject.create();
final Inner inner = scheduler.createInner();
final Worker inner = scheduler.createWorker();
inner.schedule(new Action0() {
@Override
public void call() {
Expand Down Expand Up @@ -919,7 +919,7 @@ public static <T1, T2, T3, T4, T5, R> Func5<T1, T2, T3, T4, T5, Observable<R>> t
@Override
public Observable<R> call(final T1 t1, final T2 t2, final T3 t3, final T4 t4, final T5 t5) {
final AsyncSubject<R> subject = AsyncSubject.create();
final Inner inner = scheduler.createInner();
final Worker inner = scheduler.createWorker();
inner.schedule(new Action0() {
@Override
public void call() {
Expand Down Expand Up @@ -989,7 +989,7 @@ public static <T1, T2, T3, T4, T5, T6, R> Func6<T1, T2, T3, T4, T5, T6, Observab
@Override
public Observable<R> call(final T1 t1, final T2 t2, final T3 t3, final T4 t4, final T5 t5, final T6 t6) {
final AsyncSubject<R> subject = AsyncSubject.create();
final Inner inner = scheduler.createInner();
final Worker inner = scheduler.createWorker();
inner.schedule(new Action0() {
@Override
public void call() {
Expand Down Expand Up @@ -1061,7 +1061,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Func7<T1, T2, T3, T4, T5, T6, T7,
@Override
public Observable<R> call(final T1 t1, final T2 t2, final T3 t3, final T4 t4, final T5 t5, final T6 t6, final T7 t7) {
final AsyncSubject<R> subject = AsyncSubject.create();
final Inner inner = scheduler.createInner();
final Worker inner = scheduler.createWorker();
inner.schedule(new Action0() {
@Override
public void call() {
Expand Down Expand Up @@ -1135,7 +1135,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Func8<T1, T2, T3, T4, T5, T6,
@Override
public Observable<R> call(final T1 t1, final T2 t2, final T3 t3, final T4 t4, final T5 t5, final T6 t6, final T7 t7, final T8 t8) {
final AsyncSubject<R> subject = AsyncSubject.create();
final Inner inner = scheduler.createInner();
final Worker inner = scheduler.createWorker();
inner.schedule(new Action0() {
@Override
public void call() {
Expand Down Expand Up @@ -1211,7 +1211,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Func9<T1, T2, T3, T4, T5,
@Override
public Observable<R> call(final T1 t1, final T2 t2, final T3 t3, final T4 t4, final T5 t5, final T6 t6, final T7 t7, final T8 t8, final T9 t9) {
final AsyncSubject<R> subject = AsyncSubject.create();
final Inner inner = scheduler.createInner();
final Worker inner = scheduler.createWorker();
inner.schedule(new Action0() {
@Override
public void call() {
Expand Down Expand Up @@ -1267,7 +1267,7 @@ public static <R> FuncN<Observable<R>> toAsync(final FuncN<? extends R> func, fi
@Override
public Observable<R> call(final Object... args) {
final AsyncSubject<R> subject = AsyncSubject.create();
final Inner inner = scheduler.createInner();
final Worker inner = scheduler.createWorker();
inner.schedule(new Action0() {
@Override
public void call() {
Expand Down Expand Up @@ -1535,7 +1535,7 @@ public static <T> FutureTask<Void> forEachFuture(
Action1<? super T> onNext,
Scheduler scheduler) {
FutureTask<Void> task = OperationForEachFuture.forEachFuture(source, onNext);
final Inner inner = scheduler.createInner();
final Worker inner = scheduler.createWorker();
inner.schedule(Functionals.fromRunnable(task, inner));
return task;
}
Expand Down Expand Up @@ -1563,7 +1563,7 @@ public static <T> FutureTask<Void> forEachFuture(
Action1<? super Throwable> onError,
Scheduler scheduler) {
FutureTask<Void> task = OperationForEachFuture.forEachFuture(source, onNext, onError);
final Inner inner = scheduler.createInner();
final Worker inner = scheduler.createWorker();
inner.schedule(Functionals.fromRunnable(task, inner));
return task;
}
Expand Down Expand Up @@ -1593,7 +1593,7 @@ public static <T> FutureTask<Void> forEachFuture(
Action0 onCompleted,
Scheduler scheduler) {
FutureTask<Void> task = OperationForEachFuture.forEachFuture(source, onNext, onError, onCompleted);
final Inner inner = scheduler.createInner();
final Worker inner = scheduler.createWorker();
inner.schedule(Functionals.fromRunnable(task, inner));
return task;
}
Expand Down Expand Up @@ -1800,7 +1800,7 @@ public void call(Subscriber<? super U> t1) {
}
}, csub);

final Inner inner = scheduler.createInner();
final Worker inner = scheduler.createWorker();
csub.set(inner);

inner.schedule(new Action0() {
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/rx/util/async/operators/Functionals.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package rx.util.async.operators;

import rx.Scheduler.Inner;
import rx.Scheduler.Worker;
import rx.functions.Action0;
import rx.functions.Action1;

Expand Down Expand Up @@ -66,7 +66,7 @@ public void call() {
* @param run the Runnable to run when the Action0 is called
* @return the Action0 wrapping the Runnable
*/
public static Action0 fromRunnable(Runnable run, Inner inner) {
public static Action0 fromRunnable(Runnable run, Worker inner) {
if (run == null) {
throw new NullPointerException("run");
}
Expand All @@ -75,9 +75,9 @@ public static Action0 fromRunnable(Runnable run, Inner inner) {
/** An Action1 which wraps and calls a Runnable. */
private static final class ActionWrappingRunnable implements Action0 {
final Runnable run;
final Inner inner;
final Worker inner;

public ActionWrappingRunnable(Runnable run, Inner inner) {
public ActionWrappingRunnable(Runnable run, Worker inner) {
this.run = run;
this.inner = inner;
}
Expand Down

0 comments on commit a8a1904

Please sign in to comment.