diff options
| author | Janek Bogucki <janekdb@gmail.com> | 2015-07-20 18:40:04 +0100 |
|---|---|---|
| committer | Janek Bogucki <janekdb@gmail.com> | 2015-07-20 18:40:04 +0100 |
| commit | f712d68ea69551ff745caffce04159bc140bcedc (patch) | |
| tree | 64657c76636b5d63b2ff08d00b08dfd320a440f7 | |
| parent | 100a234882a86a249ebe586b4e75fede58c098c3 (diff) | |
| download | scala-f712d68ea69551ff745caffce04159bc140bcedc.tar.gz scala-f712d68ea69551ff745caffce04159bc140bcedc.tar.bz2 scala-f712d68ea69551ff745caffce04159bc140bcedc.zip | |
Align noTraceSuppression val names to system property name
For vals based on the scala.control.noTraceSuppression system property
align the val name to the property name.
Deprecate the existing val.
| -rw-r--r-- | src/library/scala/sys/SystemProperties.scala | 4 | ||||
| -rw-r--r-- | src/library/scala/util/control/NoStackTrace.scala | 4 | ||||
| -rw-r--r-- | test/disabled/run/applet-prop.scala | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/library/scala/sys/SystemProperties.scala b/src/library/scala/sys/SystemProperties.scala index 6f8b13a89b..3ee4f6c708 100644 --- a/src/library/scala/sys/SystemProperties.scala +++ b/src/library/scala/sys/SystemProperties.scala @@ -86,6 +86,8 @@ object SystemProperties { lazy val headless = bool("java.awt.headless", "system should not utilize a display device") lazy val preferIPv4Stack = bool("java.net.preferIPv4Stack", "system should prefer IPv4 sockets") lazy val preferIPv6Addresses = bool("java.net.preferIPv6Addresses", "system should prefer IPv6 addresses") - lazy val noTraceSupression = bool("scala.control.noTraceSuppression", "scala should not suppress any stack trace creation") + lazy val noTraceSuppression = bool("scala.control.noTraceSuppression", "scala should not suppress any stack trace creation") + @deprecated("Use noTraceSuppression", "2.12.0") + def noTraceSupression = noTraceSuppression } diff --git a/src/library/scala/util/control/NoStackTrace.scala b/src/library/scala/util/control/NoStackTrace.scala index b33b6a18dd..3c42944af1 100644 --- a/src/library/scala/util/control/NoStackTrace.scala +++ b/src/library/scala/util/control/NoStackTrace.scala @@ -26,7 +26,7 @@ trait NoStackTrace extends Throwable { object NoStackTrace { final def noSuppression = _noSuppression - // two-stage init to make checkinit happy, since sys.SystemProperties.noTraceSupression.value calls back into NoStackTrace.noSuppression + // two-stage init to make checkinit happy, since sys.SystemProperties.noTraceSuppression.value calls back into NoStackTrace.noSuppression final private var _noSuppression = false - _noSuppression = sys.SystemProperties.noTraceSupression.value + _noSuppression = sys.SystemProperties.noTraceSuppression.value } diff --git a/test/disabled/run/applet-prop.scala b/test/disabled/run/applet-prop.scala index 9c29dfd979..7a98c25cab 100644 --- a/test/disabled/run/applet-prop.scala +++ b/test/disabled/run/applet-prop.scala @@ -8,7 +8,7 @@ class S extends javax.swing.JApplet { object Test extends SecurityTest { val s = new S - // lazy val TestKey = sys.SystemProperties.noTraceSupression.key + // lazy val TestKey = sys.SystemProperties.noTraceSuppression.key // def hitPerm() = new Throwable with scala.util.control.ControlThrowable { } // // var throwing = false |