commit b2d397f69cc8ab9b90c1ae7e77827caaca0e73bd
author Roberto Lublinerman <rluble@google.com> Tue Apr 28 13:33:38 2015 -0700
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 28 20:49:50 2015 +0000
tree 288234cd6a70953fac9dc7b9019a3df2bdcc1b20
parent 1fa9f84029352fbe411cf886f61ce370a7374de4

Restore -style PRETTY as a default for regular superdevmode.

Change-Id: I67acff303848e82ddbb2632d86edbf2eb81805a4

dev/codeserver/java/com/google/gwt/dev/codeserver/Options.java

diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/Options.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/Options.java
index ad623bd..260e8a5 100644
--- a/dev/codeserver/java/com/google/gwt/dev/codeserver/Options.java
+++ b/dev/codeserver/java/com/google/gwt/dev/codeserver/Options.java
@@ -91,7 +91,9 @@
   private OptionMethodNameDisplayMode.Mode methodNameDisplayMode =
       OptionMethodNameDisplayMode.Mode.NONE;
   private boolean closureFormattedOutput = false;
-  private JsOutputOption output = JsOutputOption.OBFUSCATED;
+  // Incremental superdevmod has different defaults than devmode and regular superdevmode; we use
+  // null here means not set by the user (and the right default is computed by getOutput().
+  private JsOutputOption output = null;
 
   private final ListMultimap<String, String> properties = LinkedListMultimap.create();
 
@@ -313,6 +315,9 @@
   }
 
   JsOutputOption getOutput() {
+    if (output == null) {
+      return isIncrementalCompileEnabled() ? JsOutputOption.OBFUSCATED : JsOutputOption.PRETTY;
+    }
     return output;
   }