Sort & format.
Review by: jat@google.com
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@7937 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/src/com/google/gwt/dev/DevMode.java b/dev/core/src/com/google/gwt/dev/DevMode.java
index 8fa62d2..4b1f0b0 100644
--- a/dev/core/src/com/google/gwt/dev/DevMode.java
+++ b/dev/core/src/com/google/gwt/dev/DevMode.java
@@ -67,7 +67,7 @@
if (options.isNoServer()) {
return null;
} else {
- return new String[] {getTag(), JettyLauncher.class.getName()};
+ return new String[]{getTag(), JettyLauncher.class.getName()};
}
}
@@ -83,7 +83,7 @@
@Override
public String[] getTagArgs() {
- return new String[] {"servletContainerLauncher[:args]"};
+ return new String[]{"servletContainerLauncher[:args]"};
}
@Override
@@ -145,7 +145,7 @@
@Override
public String[] getTagArgs() {
- return new String[] {"url"};
+ return new String[]{"url"};
}
@Override
diff --git a/dev/core/src/com/google/gwt/dev/DevModeBase.java b/dev/core/src/com/google/gwt/dev/DevModeBase.java
index 0aafe2a..b7a9eb7 100644
--- a/dev/core/src/com/google/gwt/dev/DevModeBase.java
+++ b/dev/core/src/com/google/gwt/dev/DevModeBase.java
@@ -121,7 +121,7 @@
@Override
public String[] getDefaultArgs() {
- return new String[] {BIND_ADDRESS_TAG, DEFAULT_BIND_ADDRESS};
+ return new String[]{BIND_ADDRESS_TAG, DEFAULT_BIND_ADDRESS};
}
@Override
@@ -137,7 +137,7 @@
@Override
public String[] getTagArgs() {
- return new String[] {"host-name-or-address"};
+ return new String[]{"host-name-or-address"};
}
@Override
@@ -177,7 +177,7 @@
@Override
public String[] getTagArgs() {
- return new String[] {"blacklist-string"};
+ return new String[]{"blacklist-string"};
}
@Override
@@ -202,7 +202,7 @@
@Override
public String[] getDefaultArgs() {
- return new String[] {CODE_SERVER_PORT_TAG, DEFAULT_PORT};
+ return new String[]{CODE_SERVER_PORT_TAG, DEFAULT_PORT};
}
@Override
@@ -218,7 +218,7 @@
@Override
public String[] getTagArgs() {
- return new String[] {"port-number | \"auto\""};
+ return new String[]{"port-number | \"auto\""};
}
@Override
@@ -259,7 +259,7 @@
@Override
public String[] getTagArgs() {
- return new String[] {"directory"};
+ return new String[]{"directory"};
}
@Override
@@ -309,7 +309,7 @@
@Override
public String[] getDefaultArgs() {
- return new String[] {getTag(), "8888"};
+ return new String[]{getTag(), "8888"};
}
@Override
@@ -324,7 +324,7 @@
@Override
public String[] getTagArgs() {
- return new String[] {"port-number | \"auto\""};
+ return new String[]{"port-number | \"auto\""};
}
@Override
@@ -363,7 +363,7 @@
@Override
public String[] getTagArgs() {
- return new String[] {"port-number:client-id-string | host-string:port-number:client-id-string"};
+ return new String[]{"port-number:client-id-string | host-string:port-number:client-id-string"};
}
@Override
@@ -419,7 +419,7 @@
@Override
public String[] getTagArgs() {
- return new String[] {"whitelist-string"};
+ return new String[]{"whitelist-string"};
}
@Override
@@ -689,6 +689,8 @@
return buf.toString();
}
+ protected TreeLogger.Type baseLogLevelForUI = null;
+
protected String bindAddress;
protected int codeServerPort;
@@ -700,7 +702,6 @@
protected final HostedModeBaseOptions options;
protected DevModeUI ui = null;
- protected TreeLogger.Type baseLogLevelForUI = null;
private final Semaphore blockUntilDone = new Semaphore(0);
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 6782c8b..4663d23 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
@@ -475,13 +475,13 @@
System.setProperty("build.compiler", antJavaC);
}
- private final Object privateInstanceLock = new Object();
-
// default value used if setBaseLogLevel isn't called
private TreeLogger.Type baseLogLevel = TreeLogger.INFO;
private String bindAddress = null;
+ private final Object privateInstanceLock = new Object();
+
@Override
public String getName() {
return "Jetty";
diff --git a/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerWarDir.java b/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerWarDir.java
index e430f05..5077850 100644
--- a/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerWarDir.java
+++ b/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerWarDir.java
@@ -31,7 +31,7 @@
}
public String[] getDefaultArgs() {
- return new String[] {getTag(), "war"};
+ return new String[]{getTag(), "war"};
}
public String getPurpose() {
diff --git a/user/src/com/google/gwt/junit/CompileStrategy.java b/user/src/com/google/gwt/junit/CompileStrategy.java
index 48b2518..b6917b7 100644
--- a/user/src/com/google/gwt/junit/CompileStrategy.java
+++ b/user/src/com/google/gwt/junit/CompileStrategy.java
@@ -67,7 +67,7 @@
TestInfo testInfo = new TestInfo(testCase.getSyntheticModuleName(),
testCase.getClass().getName(), testCase.getName());
List<TestInfo[]> testBlocks = new ArrayList<TestInfo[]>(1);
- testBlocks.add(new TestInfo[] {testInfo});
+ testBlocks.add(new TestInfo[]{testInfo});
getMessageQueue().addTestBlocks(testBlocks, false);
}
}
@@ -167,7 +167,7 @@
* but also includes JUnit support.
*/
ModuleDef moduleDef = ModuleDefLoader.createSyntheticModule(treeLogger,
- syntheticModuleName, new String[] {
+ syntheticModuleName, new String[]{
moduleName, strategy.getModuleInherit()}, false);
// Replace any user entry points with our test runner.
diff --git a/user/src/com/google/gwt/junit/JUnitShell.java b/user/src/com/google/gwt/junit/JUnitShell.java
index 62dbb3a..4c0e927 100644
--- a/user/src/com/google/gwt/junit/JUnitShell.java
+++ b/user/src/com/google/gwt/junit/JUnitShell.java
@@ -128,7 +128,7 @@
registerHandler(new ArgHandlerPort(options) {
@Override
public String[] getDefaultArgs() {
- return new String[] {"-port", "auto"};
+ return new String[]{"-port", "auto"};
}
});
@@ -136,7 +136,7 @@
registerHandler(new ArgHandlerCodeServerPort(options) {
@Override
public String[] getDefaultArgs() {
- return new String[] {this.getTag(), "auto"};
+ return new String[]{this.getTag(), "auto"};
}
});
@@ -197,7 +197,7 @@
public String getTag() {
return "-web";
}
-
+
@Override
public boolean isUndocumented() {
return true;
@@ -209,7 +209,7 @@
return true;
}
});
-
+
registerHandler(new ArgHandlerFlag() {
@Override
public String getPurpose() {
@@ -231,7 +231,7 @@
registerHandler(new ArgHandlerInt() {
@Override
public String[] getDefaultArgs() {
- return new String[] {getTag(), "5"};
+ return new String[]{getTag(), "5"};
}
@Override
@@ -246,7 +246,7 @@
@Override
public String[] getTagArgs() {
- return new String[] {"minutes"};
+ return new String[]{"minutes"};
}
@Override
@@ -263,7 +263,7 @@
registerHandler(new ArgHandlerInt() {
@Override
public String[] getDefaultArgs() {
- return new String[] {getTag(), "1"};
+ return new String[]{getTag(), "1"};
}
@Override
@@ -279,7 +279,7 @@
@Override
public String[] getTagArgs() {
- return new String[] {"minutes"};
+ return new String[]{"minutes"};
}
@Override
@@ -310,7 +310,7 @@
@Override
public String[] getTagArgs() {
- return new String[] {"runstyle[:args]"};
+ return new String[]{"runstyle[:args]"};
}
@Override
@@ -338,7 +338,7 @@
@Override
public String[] getTagArgs() {
- return new String[] {"none|class|module"};
+ return new String[]{"none|class|module"};
}
@Override
@@ -392,7 +392,7 @@
@Override
public String[] getTagArgs() {
- return new String[] {"simple|all|parallel"};
+ return new String[]{"simple|all|parallel"};
}
@Override
@@ -446,7 +446,7 @@
@Override
public String[] getTagArgs() {
- return new String[] {"1"};
+ return new String[]{"1"};
}
@Override
@@ -479,7 +479,7 @@
@Override
public String[] getTagArgs() {
- return new String[] {"userAgents"};
+ return new String[]{"userAgents"};
}
@Override
@@ -673,13 +673,12 @@
throw new JUnitFatalLaunchException("Error processing shell arguments");
}
// Always bind to the wildcard address and substitute the host address in
- // URLs. Note that connectAddress isn't actually used here, as we
+ // URLs. Note that connectAddress isn't actually used here, as we
// override it from the runsStyle in getModuleUrl, but we set it to match
// what will actually be used anyway to avoid confusion.
unitTestShell.options.setBindAddress("0.0.0.0");
try {
- unitTestShell.options.setConnectAddress(
- InetAddress.getLocalHost().getHostAddress());
+ unitTestShell.options.setConnectAddress(InetAddress.getLocalHost().getHostAddress());
} catch (UnknownHostException e) {
throw new JUnitFatalLaunchException("Unable to resolve my address");
}
@@ -694,14 +693,6 @@
}
/**
- * The amount of time to wait for all clients to complete a single test
- * method, in milliseconds, measured from when the <i>last</i> client
- * connects (and thus starts the test). Set by the -testMethodTimeout
- * argument.
- */
- private long baseTestMethodTimeoutMillis;
-
- /**
* The amount of time to wait for all clients to have contacted the server and
* begin running the test. "Contacted" does not necessarily mean "the test has
* begun," e.g. for linker errors stopping the test initialization.
@@ -709,6 +700,13 @@
private long baseTestBeginTimeoutMillis;
/**
+ * The amount of time to wait for all clients to complete a single test
+ * method, in milliseconds, measured from when the <i>last</i> client connects
+ * (and thus starts the test). Set by the -testMethodTimeout argument.
+ */
+ private long baseTestMethodTimeoutMillis;
+
+ /**
* Determines how to batch up tests for execution.
*/
private BatchingStrategy batchingStrategy = new NoBatchingStrategy();
@@ -776,8 +774,8 @@
private String[] remoteUserAgents;
/**
- * What type of test we're running; Local development, local production,
- * or remote production.
+ * What type of test we're running; Local development, local production, or
+ * remote production.
*/
private RunStyle runStyle = null;
@@ -1108,8 +1106,8 @@
} catch (InvocationTargetException e) {
caught = e;
}
- getTopLogger().log(TreeLogger.ERROR, "Unable to create runStyle \""
- + runStyleName + "\"", caught);
+ getTopLogger().log(TreeLogger.ERROR,
+ "Unable to create runStyle \"" + runStyleName + "\"", caught);
return -1;
}
