diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2012-11-09 23:49:42 +0100 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2013-01-08 13:55:13 +0100 |
commit | c45491c84ed841a19a1bfaf7607ed7f694924940 (patch) | |
tree | 555f968e5a2b4f7ecf8d32c76341cb099e2a0198 | |
parent | a03e77b8670faa133c76f4d7b29bf362246d20b5 (diff) | |
download | scala-c45491c84ed841a19a1bfaf7607ed7f694924940.tar.gz scala-c45491c84ed841a19a1bfaf7607ed7f694924940.tar.bz2 scala-c45491c84ed841a19a1bfaf7607ed7f694924940.zip |
SI-6641 Cull scala.swing.SwingWorker
It appears to do nothing much at all, refers to the now-deprecated
scala.actor package, and has a name clash with an important class
from java.swing.
Note that the POM for scala-swing does not declare the dependency.
The final nail in the coffin is it aides and abets the crash in
the crash in SI-6440.
Attempts to remove or even deprecate this in 2.10.0 were
missed the boat.
This commit removes them for 2.11.0, in contravention of
the deprecation policy. Given that they rely on the
scala-actors module which _is_ deprecated in 2.10.0,
and will likely be removed in 2.11.0, I contend that
this is a reasonable exception.
Actor.scala
-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 |