Clean up checkstyle warnings and formatting.
Patch by: jat
Unreviewed
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@4667 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/src/com/google/gwt/dev/ArgHandlerOutDirDeprecated.java b/dev/core/src/com/google/gwt/dev/ArgHandlerOutDirDeprecated.java
index 13549a8..9845eaa 100644
--- a/dev/core/src/com/google/gwt/dev/ArgHandlerOutDirDeprecated.java
+++ b/dev/core/src/com/google/gwt/dev/ArgHandlerOutDirDeprecated.java
@@ -1,5 +1,17 @@
-/**
+/*
+ * Copyright 2008 Google Inc.
*
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
package com.google.gwt.dev;
@@ -14,15 +26,17 @@
public class ArgHandlerOutDirDeprecated extends ArgHandlerOutDir {
OptionOutDir option;
-
+
public ArgHandlerOutDirDeprecated(OptionOutDir option) {
this.option = option;
}
-
+
+ @Override
public String getPurpose() {
return super.getPurpose() + " (deprecated)";
}
+ @Override
public boolean isUndocumented() {
return true;
}
@@ -31,5 +45,5 @@
public void setDir(File dir) {
option.setOutDir(dir);
}
-
+
}
diff --git a/dev/core/src/com/google/gwt/dev/Link.java b/dev/core/src/com/google/gwt/dev/Link.java
index a84e8cf..e590129 100644
--- a/dev/core/src/com/google/gwt/dev/Link.java
+++ b/dev/core/src/com/google/gwt/dev/Link.java
@@ -99,6 +99,11 @@
return extraDir;
}
+ @Deprecated
+ public File getOutDir() {
+ return outDir;
+ }
+
public File getWarDir() {
return warDir;
}
@@ -107,19 +112,14 @@
this.extraDir = extraDir;
}
- public void setWarDir(File warDir) {
- this.warDir = warDir;
- }
-
- @Deprecated
- public File getOutDir() {
- return outDir;
- }
-
@Deprecated
public void setOutDir(File outDir) {
this.outDir = outDir;
}
+
+ public void setWarDir(File warDir) {
+ this.warDir = warDir;
+ }
}
public static void legacyLink(TreeLogger logger, ModuleDef module,
diff --git a/dev/core/src/com/google/gwt/dev/Precompile.java b/dev/core/src/com/google/gwt/dev/Precompile.java
index c16b494..daa5afc 100644
--- a/dev/core/src/com/google/gwt/dev/Precompile.java
+++ b/dev/core/src/com/google/gwt/dev/Precompile.java
@@ -159,14 +159,14 @@
jjsOptions.setAggressivelyOptimize(aggressivelyOptimize);
}
- public void setDraftCompile(boolean draft) {
- jjsOptions.setDraftCompile(draft);
- }
-
public void setDisableUpdateCheck(boolean disabled) {
disableUpdateCheck = disabled;
}
+ public void setDraftCompile(boolean draft) {
+ jjsOptions.setDraftCompile(draft);
+ }
+
public void setEnableAssertions(boolean enableAssertions) {
jjsOptions.setEnableAssertions(enableAssertions);
}
diff --git a/dev/core/src/com/google/gwt/dev/js/EvalFunctionsAtTopScope.java b/dev/core/src/com/google/gwt/dev/js/EvalFunctionsAtTopScope.java
index 9455037..b22a69c 100644
--- a/dev/core/src/com/google/gwt/dev/js/EvalFunctionsAtTopScope.java
+++ b/dev/core/src/com/google/gwt/dev/js/EvalFunctionsAtTopScope.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2009 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.dev.js;
import com.google.gwt.dev.js.ast.JsBlock;
@@ -15,15 +30,23 @@
import java.util.Stack;
/**
- * Force all functions to be evaluated at the top of the lexical scope in
- * which they reside. This makes {@link StaticEvalVisitor} simpler in that we
- * no longer have to worry about function declarations within expressions.
- * After this runs, only statements can contain declarations. Moved functions
- * will end up just before the statement in which they presently reside.
+ * Force all functions to be evaluated at the top of the lexical scope in which
+ * they reside. This makes {@link StaticEvalVisitor} simpler in that we no
+ * longer have to worry about function declarations within expressions. After
+ * this runs, only statements can contain declarations. Moved functions will end
+ * up just before the statement in which they presently reside.
*/
public class EvalFunctionsAtTopScope extends JsModVisitor {
+
+ public static void exec(JsProgram jsProgram) {
+ EvalFunctionsAtTopScope fev = new EvalFunctionsAtTopScope();
+ fev.accept(jsProgram);
+ }
+
private final Set<JsFunction> dontMove = new HashSet<JsFunction>();
+
private final Stack<ListIterator<JsStatement>> itrStack = new Stack<ListIterator<JsStatement>>();
+
private final Stack<JsBlock> scopeStack = new Stack<JsBlock>();
@Override
@@ -76,8 +99,8 @@
/*
* Reinsert this function into the statement immediately before the
* current statement. The current statement will have already been
- * returned from the current iterator's next(), so we have to
- * backshuffle one step to get in front of it.
+ * returned from the current iterator's next(), so we have to backshuffle
+ * one step to get in front of it.
*/
ListIterator<JsStatement> itr = itrStack.peek();
itr.previous();
@@ -104,9 +127,4 @@
scopeStack.push(x.getGlobalBlock());
return true;
}
-
- public static void exec(JsProgram jsProgram) {
- EvalFunctionsAtTopScope fev = new EvalFunctionsAtTopScope();
- fev.accept(jsProgram);
- }
-}
\ No newline at end of file
+}
diff --git a/dev/core/src/com/google/gwt/dev/resource/impl/ResourceOracleImpl.java b/dev/core/src/com/google/gwt/dev/resource/impl/ResourceOracleImpl.java
index 075bc13..cafdacc 100644
--- a/dev/core/src/com/google/gwt/dev/resource/impl/ResourceOracleImpl.java
+++ b/dev/core/src/com/google/gwt/dev/resource/impl/ResourceOracleImpl.java
@@ -15,6 +15,12 @@
*/
package com.google.gwt.dev.resource.impl;
+import com.google.gwt.core.ext.TreeLogger;
+import com.google.gwt.dev.resource.Resource;
+import com.google.gwt.dev.resource.ResourceOracle;
+import com.google.gwt.dev.util.msg.Message0;
+import com.google.gwt.dev.util.msg.Message1String;
+
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -34,12 +40,6 @@
import java.util.jar.JarFile;
import java.util.zip.ZipFile;
-import com.google.gwt.core.ext.TreeLogger;
-import com.google.gwt.dev.resource.Resource;
-import com.google.gwt.dev.resource.ResourceOracle;
-import com.google.gwt.dev.util.msg.Message0;
-import com.google.gwt.dev.util.msg.Message1String;
-
/**
* The normal implementation of {@link ResourceOracle}.
*
