Fix checkstyle errors.
git-svn-id: https://google-web-toolkit.googlecode.com/svn/branches/farewellSwt@6170 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/HostedModeBase.java
index aea57f1..ce7e6b4 100644
--- a/dev/core/src/com/google/gwt/dev/HostedModeBase.java
+++ b/dev/core/src/com/google/gwt/dev/HostedModeBase.java
@@ -27,7 +27,6 @@
import com.google.gwt.dev.shell.BrowserWidgetHostChecker;
import com.google.gwt.dev.shell.BrowserWindowController;
import com.google.gwt.dev.shell.CheckForUpdates;
-import com.google.gwt.dev.shell.ModuleSpaceHost;
import com.google.gwt.dev.shell.ShellModuleSpaceHost;
import com.google.gwt.dev.util.Util;
import com.google.gwt.dev.util.arg.ArgHandlerDisableAggressiveOptimization;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java b/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java
index a689889..28261e8 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java
@@ -1046,8 +1046,9 @@
ControlFlowAnalyzer cfa = new ControlFlowAnalyzer(program);
cfa.setDependencyRecorder(deps);
for (List<JMethod> entryList : program.entryMethods) {
- for (JMethod entry : entryList)
+ for (JMethod entry : entryList) {
cfa.traverseFrom(entry);
+ }
}
deps.endDependencyGraph();
diff --git a/dev/core/src/com/google/gwt/soyc/MakeTopLevelHtmlForPerm.java b/dev/core/src/com/google/gwt/soyc/MakeTopLevelHtmlForPerm.java
index d58e825..9c63ffb 100644
--- a/dev/core/src/com/google/gwt/soyc/MakeTopLevelHtmlForPerm.java
+++ b/dev/core/src/com/google/gwt/soyc/MakeTopLevelHtmlForPerm.java
@@ -1409,8 +1409,7 @@
out.println("<tr><td>Some code is initial (<a href=\""
+ dependenciesFileName("initial", packageName, permutationId) + "#"
+ className + "\">see why</a>)</td></tr>");
- }
- else {
+ } else {
out.println("<tr><td>Some code is initial</td></tr>");
}
}
diff --git a/dev/oophm/src/com/google/gwt/dev/OophmHostedModeBase.java b/dev/oophm/src/com/google/gwt/dev/OophmHostedModeBase.java
index 43bbc2e..e16468c 100644
--- a/dev/oophm/src/com/google/gwt/dev/OophmHostedModeBase.java
+++ b/dev/oophm/src/com/google/gwt/dev/OophmHostedModeBase.java
@@ -77,39 +77,6 @@
void removeTab(ModuleTabPanel tabPanel);
}
- abstract static class ArgProcessor extends HostedModeBase.ArgProcessor {
- public ArgProcessor(OophmHostedModeBaseOptions options, boolean forceServer) {
- super(options, forceServer);
- registerHandler(new ArgHandlerPortHosted(options));
- }
- }
-
- interface OophmHostedModeBaseOptions extends HostedModeBaseOptions,
- OptionPortHosted {
- }
-
- /**
- * Concrete class to implement all shell options.
- */
- static class OophmHostedModeBaseOptionsImpl extends HostedModeBaseOptionsImpl
- implements OophmHostedModeBaseOptions {
- private int portHosted;
-
- public int getPortHosted() {
- return portHosted;
- }
-
- public void setPortHosted(int port) {
- portHosted = port;
- }
- }
-
- protected interface OptionPortHosted {
- int getPortHosted();
-
- void setPortHosted(int portHosted);
- }
-
/**
* Handles the -portHosted command line flag.
*/
@@ -157,6 +124,39 @@
}
}
+ protected interface OptionPortHosted {
+ int getPortHosted();
+
+ void setPortHosted(int portHosted);
+ }
+
+ abstract static class ArgProcessor extends HostedModeBase.ArgProcessor {
+ public ArgProcessor(OophmHostedModeBaseOptions options, boolean forceServer) {
+ super(options, forceServer);
+ registerHandler(new ArgHandlerPortHosted(options));
+ }
+ }
+
+ interface OophmHostedModeBaseOptions extends HostedModeBaseOptions,
+ OptionPortHosted {
+ }
+
+ /**
+ * Concrete class to implement all shell options.
+ */
+ static class OophmHostedModeBaseOptionsImpl extends HostedModeBaseOptionsImpl
+ implements OophmHostedModeBaseOptions {
+ private int portHosted;
+
+ public int getPortHosted() {
+ return portHosted;
+ }
+
+ public void setPortHosted(int port) {
+ portHosted = port;
+ }
+ }
+
private class OophmBrowserWidgetHostImpl extends BrowserWidgetHostImpl {
private final Map<ModuleSpaceHost, ModulePanel> moduleTabs = new IdentityHashMap<ModuleSpaceHost, ModulePanel>();
private final Map<DevelModeTabKey, ModuleTabPanel> tabPanels = new HashMap<DevelModeTabKey, ModuleTabPanel>();
@@ -326,6 +326,8 @@
}
}
+ protected int codeServerPort;
+
protected BrowserListener listener;
/**
@@ -350,8 +352,6 @@
private AbstractTreeLogger topLogger;
- protected int codeServerPort;
-
public OophmHostedModeBase() {
super();
}
