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 ad8ef00 commit 0a3756e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions src/main/scala/rx/lang/scala/JavaConversions.scala
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ object JavaConversions {
implicit def scalaSchedulerToJavaScheduler(s: Scheduler): rx.Scheduler = s.asJavaScheduler
implicit def javaSchedulerToScalaScheduler(s: rx.Scheduler): Scheduler = Scheduler(s)

implicit def scalaInnerToJavaInner(s: Inner): rx.Scheduler.Inner = s.asJavaInner
implicit def javaInnerToScalaInner(s: rx.Scheduler.Inner): Inner = Inner(s)
implicit def scalaWorkerToJavaWorker(s: Worker): rx.Scheduler.Worker = s.asJavaWorker
implicit def javaWorkerToScalaWorker(s: rx.Scheduler.Worker): Worker = Worker(s)


implicit def toJavaObserver[T](s: Observer[T]): rx.Observer[_ >: T] = s.asJavaObserver
Expand Down
16 changes: 8 additions & 8 deletions src/main/scala/rx/lang/scala/Scheduler.scala
Original file line number Diff line number Diff line change
Expand Up @@ -42,22 +42,22 @@ trait Scheduler {
*/
def now: Long = this.asJavaScheduler.now()

def createInner: Inner = this.asJavaScheduler.createInner()
def createWorker: Worker = this.asJavaScheduler.createWorker()

}

object Inner {
def apply(inner: rx.Scheduler.Inner): Inner = new Inner { private[scala] val asJavaInner = inner }
object Worker {
def apply(worker: rx.Scheduler.Worker): Worker = new Worker { private[scala] val asJavaWorker = worker }
}

trait Inner extends Subscription {
private [scala] val asJavaInner: rx.Scheduler.Inner
trait Worker extends Subscription {
private [scala] val asJavaWorker: rx.Scheduler.Worker

/**
* Schedules a cancelable action to be executed in delayTime.
*/
def schedule(action: Unit => Unit, delayTime: Duration): Subscription =
this.asJavaInner.schedule(
this.asJavaWorker.schedule(
new Action0 {
override def call(): Unit = action()
},
Expand All @@ -67,7 +67,7 @@ trait Inner extends Subscription {
/**
* Schedules a cancelable action to be executed immediately.
*/
def schedule(action: Unit => Unit): Subscription = this.asJavaInner.schedule(
def schedule(action: Unit => Unit): Subscription = this.asJavaWorker.schedule(
new Action0 {
override def call(): Unit = action()
}
Expand All @@ -76,7 +76,7 @@ trait Inner extends Subscription {
/**
* @return the scheduler's notion of current absolute time in milliseconds.
*/
def now: Long = this.asJavaInner.now()
def now: Long = this.asJavaWorker.now()
}


Expand Down

0 comments on commit 0a3756e

Please sign in to comment.