Reviewers: jbrosenberg, jat,
Description:
Allows DevMode to respect the -XdisableUpdateCheck option.
Please review this at http://gwt-code-reviews.appspot.com/1400803/
Affected files:
M dev/core/src/com/google/gwt/dev/DevMode.java
M dev/core/src/com/google/gwt/dev/DevModeBase.java
M dev/core/src/com/google/gwt/dev/GWTShell.java
M eclipse/samples/Hello/Hello.launch
M user/src/com/google/gwt/junit/JUnitShell.java
Index: dev/core/src/com/google/gwt/dev/DevMode.java
===================================================================
--- dev/core/src/com/google/gwt/dev/DevMode.java (revision 9934)
+++ dev/core/src/com/google/gwt/dev/DevMode.java (working copy)
@@ -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() {
Index: dev/core/src/com/google/gwt/dev/DevModeBase.java
===================================================================
--- dev/core/src/com/google/gwt/dev/DevModeBase.java (revision 9934)
+++ dev/core/src/com/google/gwt/dev/DevModeBase.java (working copy)
@@ -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 {
}
/**
@@ -471,6 +472,7 @@
private String remoteUIClientId;
private String remoteUIHost;
private int remoteUIHostPort;
+
private final List<String> startupURLs = new ArrayList<String>();
public void addStartupURL(String url) {
@@ -893,18 +895,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
Index: dev/core/src/com/google/gwt/dev/GWTShell.java
===================================================================
--- dev/core/src/com/google/gwt/dev/GWTShell.java (revision 9934)
+++ dev/core/src/com/google/gwt/dev/GWTShell.java (working copy)
@@ -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
Index: eclipse/samples/Hello/Hello.launch
===================================================================
--- eclipse/samples/Hello/Hello.launch (revision 9934)
+++ eclipse/samples/Hello/Hello.launch (working copy)
@@ -1,5 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/Hello"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables"
value="true"/>
<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
<listEntry value="<?xml version="1.0"
encoding="UTF-8"?> <runtimeClasspathEntry
containerPath="org.eclipse.jdt.launching.JRE_CONTAINER"
javaProject="Hello" path="1"
type="4"/> "/>
@@ -11,7 +17,7 @@
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH"
value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE"
value="com.google.gwt.dev.DevMode"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS"
value="-startupUrl Hello.html com.google.gwt.sample.hello.Hello"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS"
value="-startupUrl
Hello.html -XdisableUpdateCheck com.google.gwt.sample.hello.Hello"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR"
value="Hello"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS"
value="-ea -Xmx256M -Dgwt.devjar=${gwt_devjar}"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS"
value="-ea -Xmx256M -Dgwt.devjar=${gwt_devjar} -Dgwt.persistentunitcache"/>
</launchConfiguration>
Index: user/src/com/google/gwt/junit/JUnitShell.java
===================================================================
--- user/src/com/google/gwt/junit/JUnitShell.java (revision 9934)
+++ user/src/com/google/gwt/junit/JUnitShell.java (working copy)
@@ -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
