Sort & format.
git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/1.6@4318 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/src/com/google/gwt/dev/GWTShell.java b/dev/core/src/com/google/gwt/dev/GWTShell.java
index d40783b..49a239d 100644
--- a/dev/core/src/com/google/gwt/dev/GWTShell.java
+++ b/dev/core/src/com/google/gwt/dev/GWTShell.java
@@ -183,17 +183,6 @@
}
@Override
- protected boolean initModule(String moduleName) {
- /*
- * Not used in legacy mode due to GWTShellServlet playing this role.
- *
- * TODO: something smarter here and actually make GWTShellServlet less
- * magic?
- */
- return false;
- }
-
- @Override
protected void doShutDownServer() {
// Stop the HTTP server.
//
@@ -214,4 +203,15 @@
}
return EmbeddedTomcatServer.getPort();
}
+
+ @Override
+ protected boolean initModule(String moduleName) {
+ /*
+ * Not used in legacy mode due to GWTShellServlet playing this role.
+ *
+ * TODO: something smarter here and actually make GWTShellServlet less
+ * magic?
+ */
+ return false;
+ }
}
diff --git a/dev/core/src/com/google/gwt/dev/HostedMode.java b/dev/core/src/com/google/gwt/dev/HostedMode.java
index 71dc0f5..951775d 100644
--- a/dev/core/src/com/google/gwt/dev/HostedMode.java
+++ b/dev/core/src/com/google/gwt/dev/HostedMode.java
@@ -233,42 +233,6 @@
}
@Override
- protected boolean initModule(String moduleName) {
- ModuleDef module = modulesByName.get(moduleName);
- if (module == null) {
- getTopLogger().log(
- TreeLogger.WARN,
- "Unknown module requested '"
- + moduleName
- + "'; all active GWT modules must be specified in the command line arguments");
- return false;
- }
- try {
- boolean shouldRefreshPage = false;
- if (module.isGwtXmlFileStale()) {
- shouldRefreshPage = true;
- module = loadModule(getTopLogger(), module.getCanonicalName(), false);
- }
- link(getTopLogger(), module, true);
- return shouldRefreshPage;
- } catch (UnableToCompleteException e) {
- // Already logged.
- return false;
- }
- }
-
- /*
- * Overridden to keep our map up to date.
- */
- @Override
- protected ModuleDef loadModule(TreeLogger logger, String moduleName,
- boolean refresh) throws UnableToCompleteException {
- ModuleDef module = super.loadModule(logger, moduleName, refresh);
- modulesByName.put(module.getName(), module);
- return module;
- }
-
- @Override
protected void doShutDownServer() {
if (server != null) {
try {
@@ -342,6 +306,42 @@
return -1;
}
+ @Override
+ protected boolean initModule(String moduleName) {
+ ModuleDef module = modulesByName.get(moduleName);
+ if (module == null) {
+ getTopLogger().log(
+ TreeLogger.WARN,
+ "Unknown module requested '"
+ + moduleName
+ + "'; all active GWT modules must be specified in the command line arguments");
+ return false;
+ }
+ try {
+ boolean shouldRefreshPage = false;
+ if (module.isGwtXmlFileStale()) {
+ shouldRefreshPage = true;
+ module = loadModule(getTopLogger(), module.getCanonicalName(), false);
+ }
+ link(getTopLogger(), module, true);
+ return shouldRefreshPage;
+ } catch (UnableToCompleteException e) {
+ // Already logged.
+ return false;
+ }
+ }
+
+ /*
+ * Overridden to keep our map up to date.
+ */
+ @Override
+ protected ModuleDef loadModule(TreeLogger logger, String moduleName,
+ boolean refresh) throws UnableToCompleteException {
+ ModuleDef module = super.loadModule(logger, moduleName, refresh);
+ modulesByName.put(module.getName(), module);
+ return module;
+ }
+
/**
* Perform an initial hosted mode link, without overwriting newer or
* unmodified files in the output folder.
diff --git a/dev/core/src/com/google/gwt/dev/HostedModeBase.java b/dev/core/src/com/google/gwt/dev/HostedModeBase.java
index f3d8078..4c8a781 100644
--- a/dev/core/src/com/google/gwt/dev/HostedModeBase.java
+++ b/dev/core/src/com/google/gwt/dev/HostedModeBase.java
@@ -479,18 +479,18 @@
}
/**
+ * Compiles all modules.
+ */
+ protected abstract void compile(TreeLogger logger)
+ throws UnableToCompleteException;
+
+ /**
* Compiles a module (legacy only).
*/
@Deprecated
protected abstract void compile(TreeLogger logger, ModuleDef moduleDef)
throws UnableToCompleteException;
- /**
- * Compiles all modules.
- */
- protected abstract void compile(TreeLogger logger)
- throws UnableToCompleteException;
-
protected abstract HostedModeBaseOptions createOptions();
protected abstract ArtifactAcceptor doCreateArtifactAcceptor(ModuleDef module);
@@ -530,6 +530,8 @@
return true;
}
+ protected abstract void doShutDownServer();
+
protected boolean doStartup() {
loadRequiredNativeLibs();
@@ -542,6 +544,8 @@
return true;
}
+ protected abstract int doStartUpServer();
+
/**
* Derived classes can override to set a default port.
*/
@@ -663,10 +667,6 @@
return true;
}
- protected abstract void doShutDownServer();
-
- protected abstract int doStartUpServer();
-
private Shell createTrackedBrowserShell() {
final Shell shell = new Shell(display);
FillLayout fillLayout = new FillLayout();
