Removes property name references to SDM.
Change-Id: Ib99f353ea1d67060bd9df0cce3a8470bd837cc50
diff --git a/dev/core/super/javaemul/internal/InternalPreconditions.java b/dev/core/super/javaemul/internal/InternalPreconditions.java
index d547b34..1e97db7 100644
--- a/dev/core/super/javaemul/internal/InternalPreconditions.java
+++ b/dev/core/super/javaemul/internal/InternalPreconditions.java
@@ -23,9 +23,7 @@
// Some parts adapted from Guava
public final class InternalPreconditions {
private static final boolean CHECKED_MODE =
- System.getProperty("superdevmode", "on").equals("on");
- private static final boolean JSNI_CHECK =
- System.getProperty("checks.jsni", "ENABLED").equals("ENABLED");
+ System.getProperty("checkedMode", "ENABLED").equals("ENABLED");
private static final boolean TYPE_CHECK =
System.getProperty("checks.type", "ENABLED").equals("ENABLED");
private static final boolean API_CHECK =
diff --git a/user/src/com/google/gwt/core/Core.gwt.xml b/user/src/com/google/gwt/core/Core.gwt.xml
index 0f299be..9a64da2 100644
--- a/user/src/com/google/gwt/core/Core.gwt.xml
+++ b/user/src/com/google/gwt/core/Core.gwt.xml
@@ -27,6 +27,12 @@
<define-property name="superdevmode" values="off, on"/>
<set-property name="superdevmode" value="off"/>
+ <define-property name="debugMode" values="ENABLED,DISABLED" />
+ <set-property name="debugMode" value="DISABLED" />
+ <set-property name="debugMode" value="ENABLED">
+ <when-property-is name="superdevmode" value="on" />
+ </set-property>
+
<inherits name="com.google.gwt.dev.jjs.intrinsic.Intrinsic" />
<inherits name="com.google.gwt.core.CompilerParameters" />
<inherits name="com.google.gwt.emul.Emulation" />
@@ -76,6 +82,6 @@
<set-property name="gwt.logging.simpleConsoleHandler" value="ENABLED"/>
<set-property name="gwt.logging.enabled" value="TRUE">
- <when-property-is name="superdevmode" value="on"/>
+ <when-property-is name="debugMode" value="ENABLED"/>
</set-property>
</module>
diff --git a/user/src/com/google/gwt/logging/Logging.gwt.xml b/user/src/com/google/gwt/logging/Logging.gwt.xml
index 1c131ea..7e452d2 100644
--- a/user/src/com/google/gwt/logging/Logging.gwt.xml
+++ b/user/src/com/google/gwt/logging/Logging.gwt.xml
@@ -16,8 +16,8 @@
<inherits name="com.google.gwt.logging.LoggingDisabled"/>
<set-property name="gwt.logging.enabled" value="SEVERE"/>
- <!-- Preserve the logging level in superdevmode -->
+ <!-- Preserve the logging level in debugMode -->
<set-property name="gwt.logging.enabled" value="TRUE">
- <when-property-is name="superdevmode" value="on"/>
+ <when-property-is name="debugMode" value="ENABLED"/>
</set-property>
</module>
diff --git a/user/super/com/google/gwt/emul/Preconditions.gwt.xml b/user/super/com/google/gwt/emul/Preconditions.gwt.xml
index 5ef8a2b..ed11622 100644
--- a/user/super/com/google/gwt/emul/Preconditions.gwt.xml
+++ b/user/super/com/google/gwt/emul/Preconditions.gwt.xml
@@ -118,4 +118,10 @@
<!-- Default checkLevel is NORMAL -->
<set-property name="checks.checkLevel" value="NORMAL" />
+ <define-property name="checkedMode" values="ENABLED,DISABLED" />
+
+ <set-property name="checkedMode" value="DISABLED" />
+ <set-property name="checkedMode" value="ENABLED">
+ <when-property-is name="debugMode" value="ENABLED" />
+ </set-property>
</module>
diff --git a/user/super/com/google/gwt/emul/java/util/logging/Logger.java b/user/super/com/google/gwt/emul/java/util/logging/Logger.java
index 8c318a3..b57c24c 100644
--- a/user/super/com/google/gwt/emul/java/util/logging/Logger.java
+++ b/user/super/com/google/gwt/emul/java/util/logging/Logger.java
@@ -27,11 +27,11 @@
public static final String GLOBAL_LOGGER_NAME = "global";
- private static final boolean SUPER_DEV_MODE =
- System.getProperty("superdevmode", "off").equals("on");
+ private static final boolean DEBUG_MODE_ENABLED =
+ System.getProperty("debugMode", "DISABLED").equals("ENABLED");
private static final String LOGGING_ENABLED =
- System.getProperty("gwt.logging.enabled", SUPER_DEV_MODE ? "TRUE" : "FALSE");
+ System.getProperty("gwt.logging.enabled", DEBUG_MODE_ENABLED ? "TRUE" : "FALSE");
private static final boolean LOGGING_WARNING = LOGGING_ENABLED.equals("WARNING");
private static final boolean LOGGING_SEVERE = LOGGING_ENABLED.equals("SEVERE");
