Merge pull request #1863 from retronym/ticket/6641-2.10.x

SI-6641 Deprecate SwingWorker

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
+}