diff options
author | Paul Phillips <paulp@improving.org> | 2013-01-11 23:05:07 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2013-01-11 23:05:07 -0800 |
commit | a4bdeb846d7d1f5500c09e379044c8bbba41d861 (patch) | |
tree | dce47d9018c1e316b5df81d603d9c3581f32b19d | |
parent | f219ade08ed8174c7bded654e8070f4b61843513 (diff) | |
parent | 557caa3d757f236c835482f90c199801b4f073e3 (diff) | |
download | scala-a4bdeb846d7d1f5500c09e379044c8bbba41d861.tar.gz scala-a4bdeb846d7d1f5500c09e379044c8bbba41d861.tar.bz2 scala-a4bdeb846d7d1f5500c09e379044c8bbba41d861.zip |
Merge pull request #1863 from retronym/ticket/6641-2.10.x
SI-6641 Deprecate SwingWorker
-rw-r--r-- | src/swing/scala/swing/SwingActor.scala | 22 | ||||
-rw-r--r-- | src/swing/scala/swing/SwingWorker.scala | 4 |
2 files changed, 4 insertions, 22 deletions
diff --git a/src/swing/scala/swing/SwingActor.scala b/src/swing/scala/swing/SwingActor.scala index 6692180aac..035e979bee 100644 --- a/src/swing/scala/swing/SwingActor.scala +++ b/src/swing/scala/swing/SwingActor.scala @@ -10,26 +10,6 @@ package scala.swing -import scala.actors._ - // Dummy to keep ant from recompiling on every run. +@deprecated("Will be removed in 2.11.0", "2.10.1") 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 index 0e514e38a7..f4eeb5824a 100644 --- a/src/swing/scala/swing/SwingWorker.scala +++ b/src/swing/scala/swing/SwingWorker.scala @@ -2,10 +2,12 @@ package scala.swing import scala.actors._ +@deprecated("Will be removed in 2.11.0", "2.10.1") object SwingWorker { } +@deprecated("Depends on the deprecated package scala.actors. Will be removed in 2.11.0", "2.10.1") abstract class SwingWorker extends Actor { def queue() { @@ -18,4 +20,4 @@ abstract class SwingWorker extends Actor { private var _cancelled = false def cancelled: Boolean = _cancelled def cancelled_=(b: Boolean) { _cancelled = b } -}
\ No newline at end of file +} |