Rename HostedMode to DevMode and HostedModeBase to DevModeBase.
Patch by: jat
Review by: amitmanjhi (verbal)
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@6408 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/src/com/google/gwt/dev/HostedModeBase.java b/dev/core/src/com/google/gwt/dev/DevModeBase.java
similarity index 98%
rename from dev/core/src/com/google/gwt/dev/HostedModeBase.java
rename to dev/core/src/com/google/gwt/dev/DevModeBase.java
index 48a753a..3dfb154 100644
--- a/dev/core/src/com/google/gwt/dev/HostedModeBase.java
+++ b/dev/core/src/com/google/gwt/dev/DevModeBase.java
@@ -67,7 +67,7 @@
* The main executable class for the hosted mode shell. This class must not have
* any GUI dependencies.
*/
-abstract class HostedModeBase implements DoneCallback {
+abstract class DevModeBase implements DoneCallback {
/**
* Implementation of BrowserWidgetHost that supports the abstract UI
@@ -79,7 +79,7 @@
if (isLegacyMode()) {
throw new UnsupportedOperationException();
}
- HostedModeBase.this.compile(getLogger());
+ DevModeBase.this.compile(getLogger());
}
@Deprecated
@@ -90,7 +90,7 @@
for (int i = 0; i < moduleNames.length; i++) {
String moduleName = moduleNames[i];
ModuleDef moduleDef = loadModule(getLogger(), moduleName, true);
- HostedModeBase.this.compile(getLogger(), moduleDef);
+ DevModeBase.this.compile(getLogger(), moduleDef);
}
}
@@ -136,16 +136,16 @@
}
public boolean initModule(String moduleName) {
- return HostedModeBase.this.initModule(moduleName);
+ return DevModeBase.this.initModule(moduleName);
}
@Deprecated
public boolean isLegacyMode() {
- return HostedModeBase.this instanceof GWTShell;
+ return DevModeBase.this instanceof GWTShell;
}
public String normalizeURL(String whatTheUserTyped) {
- return HostedModeBase.this.normalizeURL(whatTheUserTyped);
+ return DevModeBase.this.normalizeURL(whatTheUserTyped);
}
public void unloadModule(ModuleSpaceHost moduleSpaceHost) {
@@ -584,7 +584,7 @@
private TreeLogger topLogger;
- public HostedModeBase() {
+ public DevModeBase() {
// Set any platform specific system properties.
BootStrapPlatform.initHostedMode();
BootStrapPlatform.applyPlatformHacks();
diff --git a/dev/core/src/com/google/gwt/dev/GWTMain.java b/dev/core/src/com/google/gwt/dev/GWTMain.java
index 880c1c8..25f2632 100644
--- a/dev/core/src/com/google/gwt/dev/GWTMain.java
+++ b/dev/core/src/com/google/gwt/dev/GWTMain.java
@@ -31,7 +31,7 @@
System.err.println(About.getGwtVersion());
}
System.err.println("Available main classes:");
- System.err.println(addSpaces(HostedMode.class.getName(),
+ System.err.println(addSpaces(DevMode.class.getName(),
"runs the development shell"));
System.err.println(addSpaces(Compiler.class.getName(),
"compiles a GWT module"));
diff --git a/dev/core/src/com/google/gwt/dev/HeadlessUI.java b/dev/core/src/com/google/gwt/dev/HeadlessUI.java
index 44c522c..6a6ce61 100644
--- a/dev/core/src/com/google/gwt/dev/HeadlessUI.java
+++ b/dev/core/src/com/google/gwt/dev/HeadlessUI.java
@@ -17,7 +17,7 @@
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.TreeLogger.Type;
-import com.google.gwt.dev.HostedModeBase.HostedModeBaseOptions;
+import com.google.gwt.dev.DevModeBase.HostedModeBaseOptions;
import com.google.gwt.dev.ui.DevModeUI;
/**
diff --git a/dev/core/src/com/google/gwt/dev/SwingUI.java b/dev/core/src/com/google/gwt/dev/SwingUI.java
index 20b61c9..e6f3970 100644
--- a/dev/core/src/com/google/gwt/dev/SwingUI.java
+++ b/dev/core/src/com/google/gwt/dev/SwingUI.java
@@ -17,7 +17,7 @@
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.TreeLogger.Type;
-import com.google.gwt.dev.HostedModeBase.HostedModeBaseOptions;
+import com.google.gwt.dev.DevModeBase.HostedModeBaseOptions;
import com.google.gwt.dev.WebServerPanel.RestartAction;
import com.google.gwt.dev.shell.ShellMainWindow;
import com.google.gwt.dev.ui.DevModeUI;
diff --git a/dev/core/src/com/google/gwt/dev/shell/jetty/JettyLauncher.java b/dev/core/src/com/google/gwt/dev/shell/jetty/JettyLauncher.java
index a430b48..ce1ebe4 100644
--- a/dev/core/src/com/google/gwt/dev/shell/jetty/JettyLauncher.java
+++ b/dev/core/src/com/google/gwt/dev/shell/jetty/JettyLauncher.java
@@ -405,7 +405,7 @@
private final TreeLogger logger;
/**
- * In the usual case of launching {@link com.google.gwt.dev.HostedMode},
+ * In the usual case of launching {@link com.google.gwt.dev.DevMode},
* this will always by the system app ClassLoader.
*/
private final ClassLoader systemClassLoader = Thread.currentThread().getContextClassLoader();
diff --git a/dev/core/test/com/google/gwt/dev/HostedModeTest.java b/dev/core/test/com/google/gwt/dev/HostedModeTest.java
index d3a5975..195e2d8 100644
--- a/dev/core/test/com/google/gwt/dev/HostedModeTest.java
+++ b/dev/core/test/com/google/gwt/dev/HostedModeTest.java
@@ -18,7 +18,7 @@
import com.google.gwt.core.ext.ServletContainer;
import com.google.gwt.core.ext.ServletContainerLauncher;
import com.google.gwt.core.ext.TreeLogger;
-import com.google.gwt.dev.HostedMode.HostedModeOptionsImpl;
+import com.google.gwt.dev.DevMode.HostedModeOptionsImpl;
import com.google.gwt.dev.jjs.JsOutputOption;
import com.google.gwt.dev.shell.BrowserWidgetHostChecker;
@@ -26,7 +26,7 @@
import java.net.BindException;
/**
- * Test for {@link HostedMode}.
+ * Test for {@link DevMode}.
*/
public class HostedModeTest extends ArgProcessorTestBase {
@@ -38,11 +38,11 @@
}
}
- private final HostedMode.ArgProcessor argProcessor;
+ private final DevMode.ArgProcessor argProcessor;
private final HostedModeOptionsImpl options = new HostedModeOptionsImpl();
public HostedModeTest() {
- argProcessor = new HostedMode.ArgProcessor(options);
+ argProcessor = new DevMode.ArgProcessor(options);
}
public void testAllValidArgs() {
diff --git a/dev/oophm/overlay/com/google/gwt/dev/HostedMode.java b/dev/oophm/overlay/com/google/gwt/dev/DevMode.java
similarity index 98%
rename from dev/oophm/overlay/com/google/gwt/dev/HostedMode.java
rename to dev/oophm/overlay/com/google/gwt/dev/DevMode.java
index 084991b..9b41b03 100644
--- a/dev/oophm/overlay/com/google/gwt/dev/HostedMode.java
+++ b/dev/oophm/overlay/com/google/gwt/dev/DevMode.java
@@ -48,7 +48,7 @@
* this class is to be determined. Consider this class as having <b>no</b>
* public API other than {@link #main(String[])}.
*/
-public class HostedMode extends HostedModeBase
+public class DevMode extends DevModeBase
implements RestartServerCallback {
/**
@@ -143,7 +143,7 @@
}
}
- static class ArgProcessor extends HostedModeBase.ArgProcessor {
+ static class ArgProcessor extends DevModeBase.ArgProcessor {
public ArgProcessor(HostedModeOptions options) {
super(options, false);
registerHandler(new ArgHandlerServer(options));
@@ -162,7 +162,7 @@
@Override
protected String getName() {
- return HostedMode.class.getName();
+ return DevMode.class.getName();
}
}
@@ -243,7 +243,7 @@
* shutdown AWT related threads, since the contract for their termination is
* still implementation-dependent.
*/
- HostedMode hostedMode = new HostedMode();
+ DevMode hostedMode = new DevMode();
if (new ArgProcessor(hostedMode.options).processArgs(args)) {
hostedMode.run();
// Exit w/ success code.
@@ -284,7 +284,7 @@
/**
* Default constructor for testing; no public API yet.
*/
- HostedMode() {
+ DevMode() {
}
/**
diff --git a/dev/oophm/overlay/com/google/gwt/dev/GWTShell.java b/dev/oophm/overlay/com/google/gwt/dev/GWTShell.java
index 5008ef9..b543211 100644
--- a/dev/oophm/overlay/com/google/gwt/dev/GWTShell.java
+++ b/dev/oophm/overlay/com/google/gwt/dev/GWTShell.java
@@ -36,7 +36,7 @@
*/
@SuppressWarnings("deprecation")
@Deprecated
-public class GWTShell extends HostedModeBase {
+public class GWTShell extends DevModeBase {
/**
* Handles the list of startup urls that can be passed at the end of the
@@ -70,7 +70,7 @@
/**
* The GWTShell argument processor.
*/
- protected static class ArgProcessor extends HostedModeBase.ArgProcessor {
+ protected static class ArgProcessor extends DevModeBase.ArgProcessor {
public ArgProcessor(ShellOptionsImpl options, boolean forceServer,
boolean noURLs) {
super(options, forceServer);
diff --git a/user/src/com/google/gwt/user/tools/WebAppCreator.java b/user/src/com/google/gwt/user/tools/WebAppCreator.java
index b07261a..b6f4530 100644
--- a/user/src/com/google/gwt/user/tools/WebAppCreator.java
+++ b/user/src/com/google/gwt/user/tools/WebAppCreator.java
@@ -18,7 +18,7 @@
import com.google.gwt.dev.About;
import com.google.gwt.dev.ArgProcessorBase;
import com.google.gwt.dev.Compiler;
-import com.google.gwt.dev.HostedMode;
+import com.google.gwt.dev.DevMode;
import com.google.gwt.dev.util.Util;
import com.google.gwt.user.tools.util.ArgHandlerIgnore;
import com.google.gwt.user.tools.util.ArgHandlerOverwrite;
@@ -259,7 +259,7 @@
replacements.put("@gwtOophmPath", gwtOophmPath);
replacements.put("@gwtVersion", About.getGwtVersionNum());
replacements.put("@gwtModuleDtd", gwtModuleDtd);
- replacements.put("@shellClass", HostedMode.class.getName());
+ replacements.put("@shellClass", DevMode.class.getName());
replacements.put("@compileClass", Compiler.class.getName());
replacements.put("@startupUrl", moduleShortName + ".html");
replacements.put("@antVmargs", isMacOsX
