From a2ba179e2bb0d19998d1cc0fb03bbb32fc35ef48 Mon Sep 17 00:00:00 2001 From: Ben Christensen Date: Fri, 18 Apr 2014 20:53:57 -0700 Subject: [PATCH] Remove ExecutorScheduler - New ComputationScheduler - see https://github.com/Netflix/RxJava/issues/711 and https://github.com/Netflix/RxJava/issues/713 --- .../scala/schedulers/ExecutorScheduler.scala | 41 ------------------- 1 file changed, 41 deletions(-) delete mode 100644 src/main/scala/rx/lang/scala/schedulers/ExecutorScheduler.scala diff --git a/src/main/scala/rx/lang/scala/schedulers/ExecutorScheduler.scala b/src/main/scala/rx/lang/scala/schedulers/ExecutorScheduler.scala deleted file mode 100644 index 0ffe30b2..00000000 --- a/src/main/scala/rx/lang/scala/schedulers/ExecutorScheduler.scala +++ /dev/null @@ -1,41 +0,0 @@ -/** - * Copyright 2013 Netflix, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package rx.lang.scala.schedulers - -import java.util.concurrent.{ScheduledExecutorService, Executor} -import rx.lang.scala.Scheduler - -object ExecutorScheduler { - - /** - * Returns a [[rx.lang.scala.Scheduler]] that queues work on an `java.util.concurrent.Executor`. - * - * Note that this does not support scheduled actions with a delay. - */ - def apply(executor: Executor): ExecutorScheduler = { - new ExecutorScheduler(rx.schedulers.Schedulers.executor(executor)) - } - - def apply(executor: ScheduledExecutorService): ExecutorScheduler = { - new ExecutorScheduler(rx.schedulers.Schedulers.executor(executor)) - } -} - -class ExecutorScheduler private[scala] (val asJavaScheduler: rx.Scheduler) - extends Scheduler {} - - -