Reverting unwanted parts of last commit.

scala · Oct 26, 2009 · af66ddc · af66ddc
1 parent f306861
commit af66ddc
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 25 deletions.
diff --git a/docs/examples/actors/fringe.scala b/docs/examples/actors/fringe.scala
@@ -2,8 +2,6 @@ package examples.actors
 
 import scala.actors.Actor._
 import scala.actors.{Channel, OutputChannel}
-import scala.actors.{Debug, Scheduler}
-import scala.actors.scheduler.ResizableThreadPoolScheduler
 
 /**
  @author Philipp Haller
@@ -20,13 +18,6 @@ object fringe extends Application {
   case class Equal(atom1: Option[Leaf], atom2: Option[Leaf])
   case class Extract(tree: Tree)
 
-  Debug.level = 3
-  Scheduler.impl = {
-    val s = new ResizableThreadPoolScheduler(false)
-    s.start()
-    s
-  }
-
   val comparator = actor {
     val extractor1 = actor(extractorBehavior())
     val extractor2 = actor(extractorBehavior())

diff --git a/docs/examples/actors/message.scala b/docs/examples/actors/message.scala
@@ -3,8 +3,6 @@ package examples.actors
 import scala.actors.{Actor, Scheduler}
 import scala.actors.Actor._
 import scala.actors.scheduler.SingleThreadedScheduler
-import scala.actors.{Debug, Scheduler}
-import scala.actors.scheduler.ResizableThreadPoolScheduler
 
 object message {
   def main(args: Array[String]) {
@@ -16,13 +14,7 @@ object message {
     }
     val nActors = 500
     val finalSum = n * nActors
-    //Scheduler.impl = new SingleThreadedScheduler
-    Debug.level = 3
-    Scheduler.impl = {
-      val s = new ResizableThreadPoolScheduler(false)
-      s.start()
-      s
-    }
+    Scheduler.impl = new SingleThreadedScheduler
 
     def beh(next: Actor, sum: Int) {
       react {
@@ -43,6 +35,6 @@ object message {
     val firstActor = actorChain(nActors, null)
     var i = n; while (i > 0) { firstActor ! 0; i -= 1 }
 
-    //Scheduler.shutdown()
+    Scheduler.shutdown()
   }
 }
diff --git a/test/files/neg/plugin-after-terminal/lib/plugins.jar.desired.sha1 b/test/files/neg/plugin-after-terminal/lib/plugins.jar.desired.sha1
@@ -1 +1 @@
-eeefa01bb3bc224f75a2ee3d82a82054f4532b5f ?plugins.jar
+cf80703ed94f5176dc099c60b32d0483322de9eb ?plugins.jar
diff --git a/test/files/neg/plugin-before-parser/lib/plugins.jar.desired.sha1 b/test/files/neg/plugin-before-parser/lib/plugins.jar.desired.sha1
@@ -1 +1 @@
-755fb75a6c635ca586f79e05c2785d55e52021cf ?plugins.jar
+2e05e73ed90aaf286fa6555d992c1da18de3ceca ?plugins.jar
diff --git a/test/files/neg/plugin-cyclic-dependency/lib/plugins.jar.desired.sha1 b/test/files/neg/plugin-cyclic-dependency/lib/plugins.jar.desired.sha1
@@ -1 +1 @@
-217093efbc909edc21564a42c7069a9561921872 ?plugins.jar
+d96a5f1b3885225a5e203ae59ae2f2f3e3c65c9b ?plugins.jar
diff --git a/test/files/neg/plugin-multiple-rafter/lib/plugins.jar.desired.sha1 b/test/files/neg/plugin-multiple-rafter/lib/plugins.jar.desired.sha1
@@ -1 +1 @@
-3be489ca675f18a64e0af8f5c7efcbe0f7cae2ab ?plugins.jar
+ee728763d50a19e725f729797d5afab05d395c4e ?plugins.jar
diff --git a/test/files/neg/plugin-rafter-before-1/lib/plugins.jar.desired.sha1 b/test/files/neg/plugin-rafter-before-1/lib/plugins.jar.desired.sha1
@@ -1 +1 @@
-aa034e5f24a9cc5c3d73e3fe79000c80e0028b81 ?plugins.jar
+398fa866d1d5c6608c9607dd1079afc12182119f ?plugins.jar
diff --git a/test/files/neg/plugin-rightafter-terminal/lib/plugins.jar.desired.sha1 b/test/files/neg/plugin-rightafter-terminal/lib/plugins.jar.desired.sha1
@@ -1 +1 @@
-6c9a6c7c3c5b86ece1d56476f7d6a35b6d7d7a03 ?plugins.jar
+b2166b6bc2a55264d959e613fa52695295db2281 ?plugins.jar
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		eeefa01bb3bc224f75a2ee3d82a82054f4532b5f ?plugins.jar
		cf80703ed94f5176dc099c60b32d0483322de9eb ?plugins.jar
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		755fb75a6c635ca586f79e05c2785d55e52021cf ?plugins.jar
		2e05e73ed90aaf286fa6555d992c1da18de3ceca ?plugins.jar
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		217093efbc909edc21564a42c7069a9561921872 ?plugins.jar
		d96a5f1b3885225a5e203ae59ae2f2f3e3c65c9b ?plugins.jar
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		3be489ca675f18a64e0af8f5c7efcbe0f7cae2ab ?plugins.jar
		ee728763d50a19e725f729797d5afab05d395c4e ?plugins.jar
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		aa034e5f24a9cc5c3d73e3fe79000c80e0028b81 ?plugins.jar
		398fa866d1d5c6608c9607dd1079afc12182119f ?plugins.jar
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		6c9a6c7c3c5b86ece1d56476f7d6a35b6d7d7a03 ?plugins.jar
		b2166b6bc2a55264d959e613fa52695295db2281 ?plugins.jar