diff options
author | Paul Phillips <paulp@improving.org> | 2013-01-11 20:44:15 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2013-01-11 20:44:15 -0800 |
commit | eeee0b4318034109b689f2397db38bfcce237764 (patch) | |
tree | 1619fdecee2698b5bc92cf73917dd050d7381d3c | |
parent | 5f51e3f754d15415e21f79c2fc81995f89019edf (diff) | |
parent | c45491c84ed841a19a1bfaf7607ed7f694924940 (diff) | |
download | scala-eeee0b4318034109b689f2397db38bfcce237764.tar.gz scala-eeee0b4318034109b689f2397db38bfcce237764.tar.bz2 scala-eeee0b4318034109b689f2397db38bfcce237764.zip |
Merge pull request #1862 from retronym/ticket/6641-2.11.x
SI-6641 Cull scala.swing.SwingWorker
-rw-r--r-- | src/swing/scala/swing/SwingActor.scala | 31 | ||||
-rw-r--r-- | src/swing/scala/swing/SwingWorker.scala | 21 |
2 files changed, 0 insertions, 52 deletions
diff --git a/src/swing/scala/swing/SwingActor.scala b/src/swing/scala/swing/SwingActor.scala deleted file mode 100644 index c665fa4c00..0000000000 --- a/src/swing/scala/swing/SwingActor.scala +++ /dev/null @@ -1,31 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2007-2013, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ - -package scala.swing - -// Dummy to keep ant from recompiling on every run. -trait SwingActor { } - -/*object SwingActor { - /** - * Similar to Actor.actor, but creates an instance of a SwingActor. - */ - def apply(body: => Unit): Actor = - new SwingActor { def act() = body }.start() -} - -/** - * An actor that runs on the Swing event dispatching thread (EDT). - */ -abstract class SwingActor extends Actor { - override val scheduler = new SchedulerAdapter { - def execute(op: =>Unit) = Swing onEDT op - def onTerminate(a: Actor)(op: => Unit) {} - def terminated(a: Actor) {} - } -}*/ diff --git a/src/swing/scala/swing/SwingWorker.scala b/src/swing/scala/swing/SwingWorker.scala deleted file mode 100644 index 0e514e38a7..0000000000 --- a/src/swing/scala/swing/SwingWorker.scala +++ /dev/null @@ -1,21 +0,0 @@ -package scala.swing - -import scala.actors._ - -object SwingWorker { - -} - -abstract class SwingWorker extends Actor { - def queue() { - - } - - def done() { - - } - - private var _cancelled = false - def cancelled: Boolean = _cancelled - def cancelled_=(b: Boolean) { _cancelled = b } -}
\ No newline at end of file |