summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2010-11-25 13:40:28 +0000
committerPaul Phillips <paulp@improving.org>2010-11-25 13:40:28 +0000
commitfcc17475480627b41ec8f67da99a5ddd5617ddb0 (patch)
treef6b05805fcb162e2091223535488c70bf15749c6
parente83bcb3fc5cff4dab80120728bdfb23ca1ff70fd (diff)
downloadscala-fcc17475480627b41ec8f67da99a5ddd5617ddb0.tar.gz
scala-fcc17475480627b41ec8f67da99a5ddd5617ddb0.tar.bz2
scala-fcc17475480627b41ec8f67da99a5ddd5617ddb0.zip
Temporarily reverted sun.misc.* using code unti...
Temporarily reverted sun.misc.* using code until reflective version is complete. No review.
-rw-r--r--src/compiler/scala/tools/nsc/interpreter/JLineReader.scala10
-rw-r--r--src/compiler/scala/tools/util/SignalManager.scala7
2 files changed, 10 insertions, 7 deletions
diff --git a/src/compiler/scala/tools/nsc/interpreter/JLineReader.scala b/src/compiler/scala/tools/nsc/interpreter/JLineReader.scala
index 2fe436fd2f..c7289ad7e8 100644
--- a/src/compiler/scala/tools/nsc/interpreter/JLineReader.scala
+++ b/src/compiler/scala/tools/nsc/interpreter/JLineReader.scala
@@ -8,7 +8,7 @@ package interpreter
import java.io.File
import jline.{ ConsoleReader, ArgumentCompletor, History => JHistory }
-import scala.tools.util.SignalManager
+// import scala.tools.util.SignalManager
/** Reads from the console using JLine */
class JLineReader(interpreter: Interpreter) extends InteractiveReader {
@@ -21,10 +21,10 @@ class JLineReader(interpreter: Interpreter) extends InteractiveReader {
/** Requires two interrupt signals within three seconds
* of one another to initiate exit.
*/
- SignalManager.requireInterval(3, SignalManager.INT) {
- case true => Console.println("\nPress ctrl-C again to exit.")
- case false => System.exit(1)
- }
+ // SignalManager.requireInterval(3, SignalManager.INT) {
+ // case true => Console.println("\nPress ctrl-C again to exit.")
+ // case false => System.exit(1)
+ // }
val consoleReader = {
val r = new jline.ConsoleReader()
diff --git a/src/compiler/scala/tools/util/SignalManager.scala b/src/compiler/scala/tools/util/SignalManager.scala
index a6513ecb50..e44bc31081 100644
--- a/src/compiler/scala/tools/util/SignalManager.scala
+++ b/src/compiler/scala/tools/util/SignalManager.scala
@@ -6,6 +6,10 @@
package scala.tools
package util
+class SignalManager // dummy for ant
+
+/** Disabled.
+
import sun.misc.{ Signal, SignalHandler }
import SignalHandler._
import nsc.io.timer
@@ -93,5 +97,4 @@ object SignalManager extends SignalManager {
}
}
-
-
+*/