From b7701934f994917a7f568a55dc80f5e3bc506fd3 Mon Sep 17 00:00:00 2001 From: Ben Christensen Date: Fri, 18 Apr 2014 09:19:33 -0700 Subject: [PATCH] inner() -> createInner() See https://github.com/Netflix/RxJava/issues/997#issuecomment-40818768 --- src/main/java/rx/schedulers/SwingScheduler.java | 2 +- src/main/java/rx/subscriptions/SwingSubscriptions.java | 2 +- src/main/java/rx/swing/sources/SwingTestHelper.java | 2 +- src/test/java/rx/schedulers/SwingSchedulerTest.java | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/rx/schedulers/SwingScheduler.java b/src/main/java/rx/schedulers/SwingScheduler.java index f6cd4d1..a7d4fff 100644 --- a/src/main/java/rx/schedulers/SwingScheduler.java +++ b/src/main/java/rx/schedulers/SwingScheduler.java @@ -44,7 +44,7 @@ public static SwingScheduler getInstance() { } @Override - public Inner inner() { + public Inner createInner() { return new InnerSwingScheduler(); } diff --git a/src/main/java/rx/subscriptions/SwingSubscriptions.java b/src/main/java/rx/subscriptions/SwingSubscriptions.java index 2a9bfcd..7f8d08b 100644 --- a/src/main/java/rx/subscriptions/SwingSubscriptions.java +++ b/src/main/java/rx/subscriptions/SwingSubscriptions.java @@ -41,7 +41,7 @@ public void call() { if (SwingUtilities.isEventDispatchThread()) { unsubscribe.call(); } else { - final Inner inner = SwingScheduler.getInstance().inner(); + final Inner inner = SwingScheduler.getInstance().createInner(); inner.schedule(new Action0() { @Override public void call() { diff --git a/src/main/java/rx/swing/sources/SwingTestHelper.java b/src/main/java/rx/swing/sources/SwingTestHelper.java index 8e458ac..5a15b28 100644 --- a/src/main/java/rx/swing/sources/SwingTestHelper.java +++ b/src/main/java/rx/swing/sources/SwingTestHelper.java @@ -35,7 +35,7 @@ public static SwingTestHelper create() { } public SwingTestHelper runInEventDispatchThread(final Action0 action) { - Inner inner = SwingScheduler.getInstance().inner(); + Inner inner = SwingScheduler.getInstance().createInner(); inner.schedule(new Action0() { @Override diff --git a/src/test/java/rx/schedulers/SwingSchedulerTest.java b/src/test/java/rx/schedulers/SwingSchedulerTest.java index 416f54e..9ba0dff 100644 --- a/src/test/java/rx/schedulers/SwingSchedulerTest.java +++ b/src/test/java/rx/schedulers/SwingSchedulerTest.java @@ -48,7 +48,7 @@ public final class SwingSchedulerTest { @Test public void testInvalidDelayValues() { final SwingScheduler scheduler = new SwingScheduler(); - final Inner inner = scheduler.inner(); + final Inner inner = scheduler.createInner(); final Action0 action = mock(Action0.class); exception.expect(IllegalArgumentException.class); @@ -67,7 +67,7 @@ public void testInvalidDelayValues() { @Test public void testPeriodicScheduling() throws Exception { final SwingScheduler scheduler = new SwingScheduler(); - final Inner inner = scheduler.inner(); + final Inner inner = scheduler.createInner(); final CountDownLatch latch = new CountDownLatch(4); @@ -98,7 +98,7 @@ public void call() { @Test public void testNestedActions() throws Exception { final SwingScheduler scheduler = new SwingScheduler(); - final Inner inner = scheduler.inner(); + final Inner inner = scheduler.createInner(); final Action0 firstStepStart = mock(Action0.class); final Action0 firstStepEnd = mock(Action0.class);