Skip to content

Commit

Permalink
inner() -> createInner()
Browse files Browse the repository at this point in the history
  • Loading branch information
benjchristensen committed Apr 18, 2014
1 parent 6b6c0ed commit b770193
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/main/java/rx/schedulers/SwingScheduler.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public static SwingScheduler getInstance() {
}

@Override
public Inner inner() {
public Inner createInner() {
return new InnerSwingScheduler();
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/rx/subscriptions/SwingSubscriptions.java
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/rx/swing/sources/SwingTestHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/rx/schedulers/SwingSchedulerTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);

Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit b770193

Please sign in to comment.