Skip to content

Commit e797905

Browse files
benjchristensenbenjchristensen
committed
inner() -> createInner()
See #997 (comment)
1 parent 5604c18 commit e797905

File tree

47 files changed

+87
-88
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+87
-88
lines changed

‎language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/Scheduler.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ trait Scheduler {
4242
*/
4343
def now: Long = this.asJavaScheduler.now()
4444

45-
def inner: Inner = this.asJavaScheduler.inner()
45+
def createInner: Inner = this.asJavaScheduler.createInner()
4646

4747
}
4848

‎rxjava-contrib/rxjava-android/src/main/java/rx/android/schedulers/HandlerThreadScheduler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public HandlerThreadScheduler(Handler handler) {
4343
}
4444

4545
@Override
46-
public Inner inner() {
46+
public Inner createInner() {
4747
return new InnerHandlerThreadScheduler(handler);
4848
}
4949

‎rxjava-contrib/rxjava-android/src/main/java/rx/android/subscriptions/AndroidSubscriptions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public void call() {
4242
if (Looper.getMainLooper() == Looper.myLooper()) {
4343
unsubscribe.call();
4444
} else {
45-
final Inner inner = AndroidSchedulers.mainThread().inner();
45+
final Inner inner = AndroidSchedulers.mainThread().createInner();
4646
inner.schedule(new Action0() {
4747
@Override
4848
public void call() {

‎rxjava-contrib/rxjava-android/src/test/java/rx/android/schedulers/HandlerThreadSchedulerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void shouldScheduleImmediateActionOnHandlerThread() {
4545
final Action0 action = mock(Action0.class);
4646

4747
Scheduler scheduler = new HandlerThreadScheduler(handler);
48-
Inner inner = scheduler.inner();
48+
Inner inner = scheduler.createInner();
4949
inner.schedule(action);
5050

5151
// verify that we post to the given Handler
@@ -64,7 +64,7 @@ public void shouldScheduleDelayedActionOnHandlerThread() {
6464
final Action0 action = mock(Action0.class);
6565

6666
Scheduler scheduler = new HandlerThreadScheduler(handler);
67-
Inner inner = scheduler.inner();
67+
Inner inner = scheduler.createInner();
6868
inner.schedule(action, 1L, TimeUnit.SECONDS);
6969

7070
// verify that we post to the given Handler

‎rxjava-contrib/rxjava-async-util/src/main/java/rx/util/async/Async.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ public static <R> Func0<Observable<R>> toAsync(final Func0<? extends R> func, fi
599599
@Override
600600
public Observable<R> call() {
601601
final AsyncSubject<R> subject = AsyncSubject.create();
602-
final Inner inner = scheduler.inner();
602+
final Inner inner = scheduler.createInner();
603603
inner.schedule(new Action0() {
604604
@Override
605605
public void call() {
@@ -659,7 +659,7 @@ public static <T1, R> Func1<T1, Observable<R>> toAsync(final Func1<? super T1, ?
659659
@Override
660660
public Observable<R> call(final T1 t1) {
661661
final AsyncSubject<R> subject = AsyncSubject.create();
662-
final Inner inner = scheduler.inner();
662+
final Inner inner = scheduler.createInner();
663663
inner.schedule(new Action0() {
664664
@Override
665665
public void call() {
@@ -721,7 +721,7 @@ public static <T1, T2, R> Func2<T1, T2, Observable<R>> toAsync(final Func2<? sup
721721
@Override
722722
public Observable<R> call(final T1 t1, final T2 t2) {
723723
final AsyncSubject<R> subject = AsyncSubject.create();
724-
final Inner inner = scheduler.inner();
724+
final Inner inner = scheduler.createInner();
725725
inner.schedule(new Action0() {
726726
@Override
727727
public void call() {
@@ -785,7 +785,7 @@ public static <T1, T2, T3, R> Func3<T1, T2, T3, Observable<R>> toAsync(final Fun
785785
@Override
786786
public Observable<R> call(final T1 t1, final T2 t2, final T3 t3) {
787787
final AsyncSubject<R> subject = AsyncSubject.create();
788-
final Inner inner = scheduler.inner();
788+
final Inner inner = scheduler.createInner();
789789
inner.schedule(new Action0() {
790790
@Override
791791
public void call() {
@@ -851,7 +851,7 @@ public static <T1, T2, T3, T4, R> Func4<T1, T2, T3, T4, Observable<R>> toAsync(f
851851
@Override
852852
public Observable<R> call(final T1 t1, final T2 t2, final T3 t3, final T4 t4) {
853853
final AsyncSubject<R> subject = AsyncSubject.create();
854-
final Inner inner = scheduler.inner();
854+
final Inner inner = scheduler.createInner();
855855
inner.schedule(new Action0() {
856856
@Override
857857
public void call() {
@@ -919,7 +919,7 @@ public static <T1, T2, T3, T4, T5, R> Func5<T1, T2, T3, T4, T5, Observable<R>> t
919919
@Override
920920
public Observable<R> call(final T1 t1, final T2 t2, final T3 t3, final T4 t4, final T5 t5) {
921921
final AsyncSubject<R> subject = AsyncSubject.create();
922-
final Inner inner = scheduler.inner();
922+
final Inner inner = scheduler.createInner();
923923
inner.schedule(new Action0() {
924924
@Override
925925
public void call() {
@@ -989,7 +989,7 @@ public static <T1, T2, T3, T4, T5, T6, R> Func6<T1, T2, T3, T4, T5, T6, Observab
989989
@Override
990990
public Observable<R> call(final T1 t1, final T2 t2, final T3 t3, final T4 t4, final T5 t5, final T6 t6) {
991991
final AsyncSubject<R> subject = AsyncSubject.create();
992-
final Inner inner = scheduler.inner();
992+
final Inner inner = scheduler.createInner();
993993
inner.schedule(new Action0() {
994994
@Override
995995
public void call() {
@@ -1061,7 +1061,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Func7<T1, T2, T3, T4, T5, T6, T7,
10611061
@Override
10621062
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) {
10631063
final AsyncSubject<R> subject = AsyncSubject.create();
1064-
final Inner inner = scheduler.inner();
1064+
final Inner inner = scheduler.createInner();
10651065
inner.schedule(new Action0() {
10661066
@Override
10671067
public void call() {
@@ -1135,7 +1135,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Func8<T1, T2, T3, T4, T5, T6,
11351135
@Override
11361136
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) {
11371137
final AsyncSubject<R> subject = AsyncSubject.create();
1138-
final Inner inner = scheduler.inner();
1138+
final Inner inner = scheduler.createInner();
11391139
inner.schedule(new Action0() {
11401140
@Override
11411141
public void call() {
@@ -1211,7 +1211,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Func9<T1, T2, T3, T4, T5,
12111211
@Override
12121212
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) {
12131213
final AsyncSubject<R> subject = AsyncSubject.create();
1214-
final Inner inner = scheduler.inner();
1214+
final Inner inner = scheduler.createInner();
12151215
inner.schedule(new Action0() {
12161216
@Override
12171217
public void call() {
@@ -1267,7 +1267,7 @@ public static <R> FuncN<Observable<R>> toAsync(final FuncN<? extends R> func, fi
12671267
@Override
12681268
public Observable<R> call(final Object... args) {
12691269
final AsyncSubject<R> subject = AsyncSubject.create();
1270-
final Inner inner = scheduler.inner();
1270+
final Inner inner = scheduler.createInner();
12711271
inner.schedule(new Action0() {
12721272
@Override
12731273
public void call() {
@@ -1535,7 +1535,7 @@ public static <T> FutureTask<Void> forEachFuture(
15351535
Action1<? super T> onNext,
15361536
Scheduler scheduler) {
15371537
FutureTask<Void> task = OperationForEachFuture.forEachFuture(source, onNext);
1538-
final Inner inner = scheduler.inner();
1538+
final Inner inner = scheduler.createInner();
15391539
inner.schedule(Functionals.fromRunnable(task, inner));
15401540
return task;
15411541
}
@@ -1563,7 +1563,7 @@ public static <T> FutureTask<Void> forEachFuture(
15631563
Action1<? super Throwable> onError,
15641564
Scheduler scheduler) {
15651565
FutureTask<Void> task = OperationForEachFuture.forEachFuture(source, onNext, onError);
1566-
final Inner inner = scheduler.inner();
1566+
final Inner inner = scheduler.createInner();
15671567
inner.schedule(Functionals.fromRunnable(task, inner));
15681568
return task;
15691569
}
@@ -1593,7 +1593,7 @@ public static <T> FutureTask<Void> forEachFuture(
15931593
Action0 onCompleted,
15941594
Scheduler scheduler) {
15951595
FutureTask<Void> task = OperationForEachFuture.forEachFuture(source, onNext, onError, onCompleted);
1596-
final Inner inner = scheduler.inner();
1596+
final Inner inner = scheduler.createInner();
15971597
inner.schedule(Functionals.fromRunnable(task, inner));
15981598
return task;
15991599
}
@@ -1800,7 +1800,7 @@ public void call(Subscriber<? super U> t1) {
18001800
}
18011801
}, csub);
18021802

1803-
final Inner inner = scheduler.inner();
1803+
final Inner inner = scheduler.createInner();
18041804
csub.set(inner);
18051805

18061806
inner.schedule(new Action0() {

‎rxjava-contrib/rxjava-quasar/src/main/java/rx/quasar/NewFiberScheduler.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import rx.subscriptions.CompositeSubscription;
3030
import rx.subscriptions.Subscriptions;
3131
import rx.functions.Action0;
32-
import rx.functions.Action1;
3332

3433
/**
3534
* Schedules work on a new fiber.
@@ -56,7 +55,7 @@ private NewFiberScheduler() {
5655
}
5756

5857
@Override
59-
public Inner inner() {
58+
public Inner createInner() {
6059
return new EventLoopScheduler();
6160
}
6261

‎rxjava-contrib/rxjava-swing/src/main/java/rx/schedulers/SwingScheduler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public static SwingScheduler getInstance() {
4444
}
4545

4646
@Override
47-
public Inner inner() {
47+
public Inner createInner() {
4848
return new InnerSwingScheduler();
4949
}
5050

‎rxjava-contrib/rxjava-swing/src/main/java/rx/subscriptions/SwingSubscriptions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void call() {
4141
if (SwingUtilities.isEventDispatchThread()) {
4242
unsubscribe.call();
4343
} else {
44-
final Inner inner = SwingScheduler.getInstance().inner();
44+
final Inner inner = SwingScheduler.getInstance().createInner();
4545
inner.schedule(new Action0() {
4646
@Override
4747
public void call() {

‎rxjava-contrib/rxjava-swing/src/main/java/rx/swing/sources/SwingTestHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public static SwingTestHelper create() {
3535
}
3636

3737
public SwingTestHelper runInEventDispatchThread(final Action0 action) {
38-
Inner inner = SwingScheduler.getInstance().inner();
38+
Inner inner = SwingScheduler.getInstance().createInner();
3939
inner.schedule(new Action0() {
4040

4141
@Override

‎rxjava-contrib/rxjava-swing/src/test/java/rx/schedulers/SwingSchedulerTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public final class SwingSchedulerTest {
4848
@Test
4949
public void testInvalidDelayValues() {
5050
final SwingScheduler scheduler = new SwingScheduler();
51-
final Inner inner = scheduler.inner();
51+
final Inner inner = scheduler.createInner();
5252
final Action0 action = mock(Action0.class);
5353

5454
exception.expect(IllegalArgumentException.class);
@@ -67,7 +67,7 @@ public void testInvalidDelayValues() {
6767
@Test
6868
public void testPeriodicScheduling() throws Exception {
6969
final SwingScheduler scheduler = new SwingScheduler();
70-
final Inner inner = scheduler.inner();
70+
final Inner inner = scheduler.createInner();
7171

7272
final CountDownLatch latch = new CountDownLatch(4);
7373

@@ -98,7 +98,7 @@ public void call() {
9898
@Test
9999
public void testNestedActions() throws Exception {
100100
final SwingScheduler scheduler = new SwingScheduler();
101-
final Inner inner = scheduler.inner();
101+
final Inner inner = scheduler.createInner();
102102

103103
final Action0 firstStepStart = mock(Action0.class);
104104
final Action0 firstStepEnd = mock(Action0.class);

0 commit comments

Comments
 (0)