Skip to content

Commit

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

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

private static class InnerSwingScheduler extends Inner {
private static class InnerSwingScheduler extends Worker {

private final CompositeSubscription innerSubscription = new CompositeSubscription();

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/rx/subscriptions/SwingSubscriptions.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

import javax.swing.SwingUtilities;

import rx.Scheduler.Inner;
import rx.Scheduler.Worker;
import rx.Subscription;
import rx.functions.Action0;
import rx.schedulers.SwingScheduler;
Expand All @@ -41,7 +41,7 @@ public void call() {
if (SwingUtilities.isEventDispatchThread()) {
unsubscribe.call();
} else {
final Inner inner = SwingScheduler.getInstance().createInner();
final Worker inner = SwingScheduler.getInstance().createWorker();
inner.schedule(new Action0() {
@Override
public void call() {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/rx/swing/sources/SwingTestHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;

import rx.Scheduler.Inner;
import rx.Scheduler.Worker;
import rx.functions.Action0;
import rx.schedulers.SwingScheduler;

Expand All @@ -35,7 +35,7 @@ public static SwingTestHelper create() {
}

public SwingTestHelper runInEventDispatchThread(final Action0 action) {
Inner inner = SwingScheduler.getInstance().createInner();
Worker inner = SwingScheduler.getInstance().createWorker();
inner.schedule(new Action0() {

@Override
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/rx/schedulers/SwingSchedulerTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import org.junit.rules.ExpectedException;
import org.mockito.InOrder;

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

/**
Expand All @@ -48,7 +48,7 @@ public final class SwingSchedulerTest {
@Test
public void testInvalidDelayValues() {
final SwingScheduler scheduler = new SwingScheduler();
final Inner inner = scheduler.createInner();
final Worker inner = scheduler.createWorker();
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.createInner();
final Worker inner = scheduler.createWorker();

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.createInner();
final Worker inner = scheduler.createWorker();

final Action0 firstStepStart = mock(Action0.class);
final Action0 firstStepEnd = mock(Action0.class);
Expand Down

0 comments on commit af7373e

Please sign in to comment.