Revision: 9936
Author:   [email protected]
Date:     Mon Apr  4 04:54:01 2011
Log:      Allows DevMode to respect the -XdisableUpdateCheck option.

Review at http://gwt-code-reviews.appspot.com/1400803

http://code.google.com/p/google-web-toolkit/source/detail?r=9936

Modified:
 /trunk/dev/core/src/com/google/gwt/dev/DevMode.java
 /trunk/dev/core/src/com/google/gwt/dev/DevModeBase.java
 /trunk/dev/core/src/com/google/gwt/dev/GWTShell.java
 /trunk/user/src/com/google/gwt/junit/JUnitShell.java

=======================================
--- /trunk/dev/core/src/com/google/gwt/dev/DevMode.java Thu Mar 24 15:47:57 2011 +++ /trunk/dev/core/src/com/google/gwt/dev/DevMode.java Mon Apr 4 04:54:01 2011
@@ -33,6 +33,7 @@
 import com.google.gwt.dev.util.OutputFileSetOnDirectory;
 import com.google.gwt.dev.util.Util;
 import com.google.gwt.dev.util.arg.ArgHandlerDeployDir;
+import com.google.gwt.dev.util.arg.ArgHandlerDisableUpdateCheck;
 import com.google.gwt.dev.util.arg.ArgHandlerExtraDir;
 import com.google.gwt.dev.util.arg.ArgHandlerModuleName;
 import com.google.gwt.dev.util.arg.ArgHandlerWarDir;
@@ -180,6 +181,7 @@
       registerHandler(new ArgHandlerDeployDir(options));
       registerHandler(new ArgHandlerExtraDir(options));
       registerHandler(new ArgHandlerWorkDirOptional(options));
+      registerHandler(new ArgHandlerDisableUpdateCheck(options));
       registerHandler(new ArgHandlerModuleName(options) {
         @Override
         public String getPurpose() {
=======================================
--- /trunk/dev/core/src/com/google/gwt/dev/DevModeBase.java Fri Mar 25 11:27:04 2011 +++ /trunk/dev/core/src/com/google/gwt/dev/DevModeBase.java Mon Apr 4 04:54:01 2011
@@ -43,6 +43,7 @@
 import com.google.gwt.dev.util.arg.ArgHandlerEnableGeneratorResultCaching;
 import com.google.gwt.dev.util.arg.ArgHandlerGenDir;
 import com.google.gwt.dev.util.arg.ArgHandlerLogLevel;
+import com.google.gwt.dev.util.arg.OptionDisableUpdateCheck;
 import com.google.gwt.dev.util.arg.OptionGenDir;
 import com.google.gwt.dev.util.arg.OptionLogLevel;
 import com.google.gwt.dev.util.log.speedtracer.DevModeEventType;
@@ -452,7 +453,7 @@
    */
protected interface HostedModeBaseOptions extends JJSOptions, OptionLogDir, OptionLogLevel, OptionGenDir, OptionNoServer, OptionPort, OptionCodeServerPort, OptionStartupURLs,
-      OptionRemoteUI, OptionBindAddress {
+      OptionRemoteUI, OptionBindAddress, OptionDisableUpdateCheck {
   }

   /**
@@ -893,18 +894,20 @@
     ui.setCallback(DoneEvent.getType(), this);

     // Check for updates
-    final TreeLogger logger = getTopLogger();
- final CheckForUpdates updateChecker = CheckForUpdates.createUpdateChecker(logger);
-    if (updateChecker != null) {
-      Thread checkerThread = new Thread("GWT Update Checker") {
-        @Override
-        public void run() {
-          CheckForUpdates
- .logUpdateAvailable(logger, updateChecker.check(checkForUpdatesInterval()));
-        }
-      };
-      checkerThread.setDaemon(true);
-      checkerThread.start();
+    if (!options.isUpdateCheckDisabled()) {
+      final TreeLogger logger = getTopLogger();
+ final CheckForUpdates updateChecker = CheckForUpdates.createUpdateChecker(logger);
+      if (updateChecker != null) {
+        Thread checkerThread = new Thread("GWT Update Checker") {
+          @Override
+          public void run() {
+            CheckForUpdates.logUpdateAvailable(logger, updateChecker
+                .check(checkForUpdatesInterval()));
+          }
+        };
+        checkerThread.setDaemon(true);
+        checkerThread.start();
+      }
     }

     // Accept connections from OOPHM clients
=======================================
--- /trunk/dev/core/src/com/google/gwt/dev/GWTShell.java Thu Mar 24 15:47:57 2011 +++ /trunk/dev/core/src/com/google/gwt/dev/GWTShell.java Mon Apr 4 04:54:01 2011
@@ -24,6 +24,7 @@
 import com.google.gwt.dev.shell.WorkDirs;
 import com.google.gwt.dev.shell.tomcat.EmbeddedTomcatServer;
 import com.google.gwt.dev.util.OutputFileSetOnDirectory;
+import com.google.gwt.dev.util.arg.ArgHandlerDisableUpdateCheck;
 import com.google.gwt.dev.util.arg.ArgHandlerOutDir;
 import com.google.gwt.util.tools.ArgHandlerExtra;

@@ -77,6 +78,7 @@
         registerHandler(new ArgHandlerStartupURLsExtra(options));
       }
       registerHandler(new ArgHandlerOutDir(options));
+      registerHandler(new ArgHandlerDisableUpdateCheck(options));
     }

     @Override
=======================================
--- /trunk/user/src/com/google/gwt/junit/JUnitShell.java Wed Mar 23 11:52:31 2011 +++ /trunk/user/src/com/google/gwt/junit/JUnitShell.java Mon Apr 4 04:54:01 2011
@@ -38,6 +38,7 @@
 import com.google.gwt.dev.util.arg.ArgHandlerDisableCastChecking;
 import com.google.gwt.dev.util.arg.ArgHandlerDisableClassMetadata;
 import com.google.gwt.dev.util.arg.ArgHandlerDisableRunAsync;
+import com.google.gwt.dev.util.arg.ArgHandlerDisableUpdateCheck;
 import com.google.gwt.dev.util.arg.ArgHandlerDraftCompile;
 import com.google.gwt.dev.util.arg.ArgHandlerEnableAssertions;
 import com.google.gwt.dev.util.arg.ArgHandlerEnableGeneratorResultCaching;
@@ -187,6 +188,7 @@
       registerHandler(new ArgHandlerDisableClassMetadata(options));
       registerHandler(new ArgHandlerDisableCastChecking(options));
       registerHandler(new ArgHandlerDisableRunAsync(options));
+      registerHandler(new ArgHandlerDisableUpdateCheck(options));
       registerHandler(new ArgHandlerDraftCompile(options));
       registerHandler(new ArgHandlerEnableGeneratorResultCaching(options));
       registerHandler(new ArgHandlerMaxPermsPerPrecompile(options));

--
http://groups.google.com/group/Google-Web-Toolkit-Contributors

Reply via email to