diff options
author | Paul Phillips <paulp@improving.org> | 2009-10-26 20:56:32 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2009-10-26 20:56:32 +0000 |
commit | 63b1fd9be6c8c9e28092d775037c695af4b264e3 (patch) | |
tree | 181a30267fd98dc79ac45ef1b10f4ce152dbb1b1 /src | |
parent | 35a8ab3cddd27550ea8f3329483b065a2d83fae8 (diff) | |
download | scala-63b1fd9be6c8c9e28092d775037c695af4b264e3.tar.gz scala-63b1fd9be6c8c9e28092d775037c695af4b264e3.tar.bz2 scala-63b1fd9be6c8c9e28092d775037c695af4b264e3.zip |
Modifications to the five accumulated ant-paras...
Modifications to the five accumulated ant-parasite files which are
slowly driving me mad by being recompiled on every single run. One
file renamed, one moved to the right directory, two given dummy
implementations since they're completely commented out, and the
actors package object changed to apply to scala.actors rather than
_root_.actors.
Diffstat (limited to 'src')
-rw-r--r-- | src/actors/scala/actors/package.scala | 1 | ||||
-rw-r--r-- | src/actors/scala/actors/scheduler/SingleThreadedScheduler.scala (renamed from src/actors/scala/actors/SingleThreadedScheduler.scala) | 0 | ||||
-rw-r--r-- | src/swing/scala/swing/RichWindow.scala (renamed from src/swing/scala/swing/RichWindows.scala) | 0 | ||||
-rw-r--r-- | src/swing/scala/swing/SwingActor.scala | 3 | ||||
-rw-r--r-- | src/swing/scala/swing/model/Matrix.scala | 4 |
5 files changed, 7 insertions, 1 deletions
diff --git a/src/actors/scala/actors/package.scala b/src/actors/scala/actors/package.scala index d74fb23086..7075518931 100644 --- a/src/actors/scala/actors/package.scala +++ b/src/actors/scala/actors/package.scala @@ -1,3 +1,4 @@ +package scala package object actors { @deprecated("use scala.actors.scheduler.ForkJoinScheduler instead") diff --git a/src/actors/scala/actors/SingleThreadedScheduler.scala b/src/actors/scala/actors/scheduler/SingleThreadedScheduler.scala index 0a9c41a0c0..0a9c41a0c0 100644 --- a/src/actors/scala/actors/SingleThreadedScheduler.scala +++ b/src/actors/scala/actors/scheduler/SingleThreadedScheduler.scala diff --git a/src/swing/scala/swing/RichWindows.scala b/src/swing/scala/swing/RichWindow.scala index cdcf918cc5..cdcf918cc5 100644 --- a/src/swing/scala/swing/RichWindows.scala +++ b/src/swing/scala/swing/RichWindow.scala diff --git a/src/swing/scala/swing/SwingActor.scala b/src/swing/scala/swing/SwingActor.scala index e8282ad2b2..2de0258b57 100644 --- a/src/swing/scala/swing/SwingActor.scala +++ b/src/swing/scala/swing/SwingActor.scala @@ -13,6 +13,9 @@ package scala.swing import scala.actors._ +// Dummy to keep ant from recompiling on every run. +trait SwingActor { } + /*object SwingActor { /** * Similar to Actor.actor, but creates an instance of a SwingActor. diff --git a/src/swing/scala/swing/model/Matrix.scala b/src/swing/scala/swing/model/Matrix.scala index 1de8cfbf6e..1e5d13b817 100644 --- a/src/swing/scala/swing/model/Matrix.scala +++ b/src/swing/scala/swing/model/Matrix.scala @@ -8,10 +8,12 @@ // $Id$ - package scala.swing package model +// Dummy to keep ant from recompiling on every run. +trait Matrix { } + /*trait Matrix[A] extends Function2[Int, Int, A] { val width: Int |