Author: j...@google.com
Date: Tue Dec 23 22:38:21 2008
New Revision: 4371
Modified:
trunk/dev/core/src/com/google/gwt/core/ext/linker/impl/StandardCompilationAnalysis.java
trunk/dev/core/src/com/google/gwt/core/linker/soyc/SoycReportLinker.java
trunk/dev/core/src/com/google/gwt/dev/jjs/impl/ReplaceRunAsyncs.java
trunk/user/test/com/google/gwt/dev/jjs/test/RunAsyncTest.java
Log:
Sort/format/remove checkstyle warnings.
Patch by: jat
Review by: kprobst (TBR)
Modified:
trunk/dev/core/src/com/google/gwt/core/ext/linker/impl/StandardCompilationAnalysis.java
==============================================================================
---
trunk/dev/core/src/com/google/gwt/core/ext/linker/impl/StandardCompilationAnalysis.java
(original)
+++
trunk/dev/core/src/com/google/gwt/core/ext/linker/impl/StandardCompilationAnalysis.java
Tue Dec 23 22:38:21 2008
@@ -116,7 +116,7 @@
private transient Map<Correlation, Member> membersByCorrelation = new
IdentityHashMap<Correlation, Member>();
/**
- * Map from split point numbers to the method where they were set
+ * Map from split point numbers to the method where they were set.
*/
private Map<Integer, String> splitPointMap = new TreeMap<Integer,
String>();
@@ -200,14 +200,13 @@
return new Iterable<Snippet>() {
public Iterator<Snippet> iterator() {
- assert stories != null;
return new SnippetIterator(stories);
}
};
}
@Override
- public Map<Integer, String> getSplitPointMap(){
+ public Map<Integer, String> getSplitPointMap() {
return splitPointMap;
}
Modified:
trunk/dev/core/src/com/google/gwt/core/linker/soyc/SoycReportLinker.java
==============================================================================
---
trunk/dev/core/src/com/google/gwt/core/linker/soyc/SoycReportLinker.java
(original)
+++
trunk/dev/core/src/com/google/gwt/core/linker/soyc/SoycReportLinker.java
Tue Dec 23 22:38:21 2008
@@ -65,7 +65,6 @@
@LinkerOrder(Order.PRE)
public class SoycReportLinker extends AbstractLinker {
-
public String escapeXml(String unescaped) {
String escaped = unescaped.replaceAll("\\&", "&");
escaped = escaped.replaceAll("\\<", "<");
@@ -176,13 +175,12 @@
if (methodAliases.size() > 0) {
htmlOut.indentOut();
htmlOut.indentOut();
-
+
curLine = "</aliases>";
htmlOut.printRaw(curLine);
htmlOut.newline();
htmlOut.indentOut();
htmlOut.indentOut();
-
}
}
@@ -234,7 +232,6 @@
htmlOut.newline();
htmlOut.indentIn();
htmlOut.indentIn();
-
}
for (Member dependency : dependencies) {
curLine = "<on idref=\"" + dependency.getSourceName() + "\"/>";
@@ -244,14 +241,12 @@
if (dependencies.size() > 0) {
htmlOut.indentOut();
htmlOut.indentOut();
-
curLine = "</depends>";
htmlOut.printRaw(curLine);
htmlOut.newline();
htmlOut.indentOut();
htmlOut.indentOut();
-
}
}
@@ -261,7 +256,6 @@
if (fields.size() > 0) {
htmlOut.indentIn();
htmlOut.indentIn();
-
}
for (FieldMember field : fields) {
curLine = "<field id=\"" + field.getSourceName() + "\" jsName=\""
@@ -276,7 +270,6 @@
if (fields.size() > 0) {
htmlOut.indentOut();
htmlOut.indentOut();
-
}
}
@@ -313,7 +306,6 @@
htmlOut.newline();
htmlOut.indentIn();
htmlOut.indentIn();
-
}
for (Member dependency : dependencies) {
curLine = "<on idref=\"" + dependency.getSourceName() + "\"/>";
@@ -323,13 +315,12 @@
if (dependencies.size() > 0) {
htmlOut.indentOut();
htmlOut.indentOut();
-
+
curLine = "</depends>";
htmlOut.printRaw(curLine);
htmlOut.newline();
htmlOut.indentOut();
htmlOut.indentOut();
-
curLine = "</function>";
htmlOut.printRaw(curLine);
@@ -349,7 +340,6 @@
htmlOut.newline();
htmlOut.indentIn();
htmlOut.indentIn();
-
for (Snippet snippet : report.getSnippets(fragment)) {
Range range = snippet.getRange();
@@ -372,7 +362,6 @@
htmlOut.indentOut();
htmlOut.indentOut();
-
curLine = "</js>";
htmlOut.printRaw(curLine);
@@ -406,7 +395,6 @@
htmlOut.newline();
htmlOut.indentIn();
htmlOut.indentIn();
-
for (Map.Entry<CompilationResult, String> entry :
partialPathsByResult.entrySet()) {
curLine = "<report href=\"" + entry.getValue() + "\">";
@@ -414,7 +402,6 @@
htmlOut.newline();
htmlOut.indentIn();
htmlOut.indentIn();
-
for (Map<SelectionProperty, String> map :
entry.getKey().getPropertyMap()) {
@@ -424,7 +411,6 @@
htmlOut.newline();
htmlOut.indentIn();
htmlOut.indentIn();
-
} else {
curLine = "<permutation/>";
@@ -440,7 +426,6 @@
if (map.size() > 0) {
htmlOut.indentOut();
htmlOut.indentOut();
-
curLine = "</permutation>";
htmlOut.printRaw(curLine);
@@ -449,7 +434,6 @@
}
htmlOut.indentOut();
htmlOut.indentOut();
-
curLine = "</report>";
htmlOut.printRaw(curLine);
@@ -458,7 +442,6 @@
htmlOut.indentOut();
htmlOut.indentOut();
-
curLine = "</soyc-manifest>";
htmlOut.printRaw(curLine);
@@ -473,13 +456,13 @@
}
private void emitMembers(CompilationAnalysis report, HtmlTextOutput
htmlOut) {
-
+
String curLine = "<members>";
htmlOut.printRaw(curLine);
htmlOut.newline();
htmlOut.indentIn();
htmlOut.indentIn();
-
+
SortedMap<String, Set<ClassMember>> packageToClasses = new
TreeMap<String, Set<ClassMember>>();
emitPackages(report, htmlOut, packageToClasses);
@@ -498,13 +481,12 @@
if (methodDependencies.size() > 0) {
htmlOut.indentIn();
htmlOut.indentIn();
-
+
curLine = "<depends>";
htmlOut.printRaw(curLine);
htmlOut.newline();
htmlOut.indentIn();
htmlOut.indentIn();
-
for (Member methodDependency : methodDependencies) {
curLine = "<on idref=\"" + methodDependency.getSourceName()
+ "\"/>";
@@ -523,18 +505,18 @@
}
}
- private void emitMethodOverrides(HtmlTextOutput htmlOut,
Set<MethodMember> methodOverrides) {
+ private void emitMethodOverrides(HtmlTextOutput htmlOut,
+ Set<MethodMember> methodOverrides) {
String curLine;
if (methodOverrides.size() > 0) {
htmlOut.indentIn();
htmlOut.indentIn();
-
+
curLine = "<override>";
htmlOut.printRaw(curLine);
htmlOut.newline();
htmlOut.indentIn();
htmlOut.indentIn();
-
}
for (MethodMember overrideMethodMember : methodOverrides) {
curLine = "<of idref=\"" + overrideMethodMember.getSourceName()
+ "\"/>";
@@ -544,7 +526,7 @@
if (methodOverrides.size() > 0) {
htmlOut.indentOut();
htmlOut.indentOut();
-
+
curLine = "</override>";
htmlOut.printRaw(curLine);
htmlOut.newline();
@@ -559,7 +541,6 @@
if (methods.size() > 0) {
htmlOut.indentIn();
htmlOut.indentIn();
-
}
for (MethodMember method : methods) {
curLine = "<method ";
@@ -602,7 +583,6 @@
if (methods.size() > 0) {
htmlOut.indentOut();
htmlOut.indentOut();
-
}
}
@@ -614,13 +594,12 @@
if (overrides.size() > 0) {
htmlOut.indentIn();
htmlOut.indentIn();
-
+
curLine = "<override>";
htmlOut.printRaw(curLine);
htmlOut.newline();
htmlOut.indentIn();
htmlOut.indentIn();
-
}
for (ClassMember overrideClassMember : overrides) {
curLine = "<of idref=\"" + overrideClassMember.getSourceName()
+ "\"/>";
@@ -630,14 +609,12 @@
if (overrides.size() > 0) {
htmlOut.indentOut();
htmlOut.indentOut();
-
curLine = "</override>";
htmlOut.printRaw(curLine);
htmlOut.newline();
htmlOut.indentOut();
htmlOut.indentOut();
-
}
}
@@ -665,7 +642,6 @@
if (packageToClasses.get(packageName).size() > 0) {
htmlOut.indentIn();
htmlOut.indentIn();
-
}
emitClasses(htmlOut, packageToClasses, packageName);
if (packageToClasses.get(packageName).size() > 0) {
@@ -695,7 +671,6 @@
PrintWriter pw = new PrintWriter(out);
HtmlTextOutput htmlOut = new HtmlTextOutput(pw, false);
-
String curLine = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
htmlOut.printRaw(curLine);
htmlOut.newline();
@@ -704,20 +679,21 @@
htmlOut.newline();
htmlOut.indentIn();
htmlOut.indentIn();
-
-
- Map<Integer, String> splitPointMap = new TreeMap<Integer,
String>(report.getSplitPointMap());
- if (splitPointMap.size() > 0){
+
+ Map<Integer, String> splitPointMap = new TreeMap<Integer, String>(
+ report.getSplitPointMap());
+ if (splitPointMap.size() > 0) {
curLine = "<splitpoints>";
htmlOut.printRaw(curLine);
htmlOut.newline();
htmlOut.indentIn();
htmlOut.indentIn();
- for (Integer splitPointCount : splitPointMap.keySet()){
- curLine = "<splitpoint id=\"" + splitPointCount + "\" location=\""
+ splitPointMap.get(splitPointCount) + "\"/>";
+ for (Integer splitPointCount : splitPointMap.keySet()) {
+ curLine = "<splitpoint id=\"" + splitPointCount + "\" location=\""
+ + splitPointMap.get(splitPointCount) + "\"/>";
htmlOut.printRaw(curLine);
htmlOut.newline();
- }
+ }
htmlOut.indentOut();
htmlOut.indentOut();
curLine = "</splitpoints>";
@@ -756,7 +732,6 @@
if (stories.size() > 0) {
htmlOut.indentIn();
htmlOut.indentIn();
-
}
for (Story story : stories) {
@@ -775,14 +750,12 @@
if (origins.size() > 0) {
htmlOut.indentIn();
htmlOut.indentIn();
-
curLine = "<origins>";
htmlOut.printRaw(curLine);
htmlOut.newline();
htmlOut.indentIn();
htmlOut.indentIn();
-
}
for (Origin origin : origins) {
curLine = "<origin lineNumber=\""
@@ -794,7 +767,6 @@
if (origins.size() > 0) {
htmlOut.indentOut();
htmlOut.indentOut();
-
curLine = "</origins>";
htmlOut.printRaw(curLine);
@@ -815,7 +787,6 @@
htmlOut.indentIn();
htmlOut.indentIn();
-
}
for (Member correlation : correlations) {
curLine = "<by idref=\"" + correlation.getSourceName() + "\"/>";
@@ -825,7 +796,6 @@
if (correlations.size() > 0) {
htmlOut.indentOut();
htmlOut.indentOut();
-
curLine = "</correlations>";
htmlOut.printRaw(curLine);
@@ -842,7 +812,6 @@
if (stories.size() > 0) {
htmlOut.indentOut();
htmlOut.indentOut();
-
}
curLine = "</stories>";
htmlOut.printRaw(curLine);
Modified:
trunk/dev/core/src/com/google/gwt/dev/jjs/impl/ReplaceRunAsyncs.java
==============================================================================
--- trunk/dev/core/src/com/google/gwt/dev/jjs/impl/ReplaceRunAsyncs.java
(original)
+++ trunk/dev/core/src/com/google/gwt/dev/jjs/impl/ReplaceRunAsyncs.java
Tue Dec 23 22:38:21 2008
@@ -52,17 +52,18 @@
int entryNumber = entryCount++;
logger.log(TreeLogger.INFO, "Assigning split point #" + entryNumber
+ " in method " + fullMethodDescription(currentMethod));
-
+
String methodDescription = fullMethodDescription(currentMethod);
- if (methodCount.containsKey(methodDescription)){
- methodCount.put(methodDescription,
methodCount.get(methodDescription)+1);
- methodDescription += "#" +
Integer.toString(methodCount.get(methodDescription));
- }
- else{
+ if (methodCount.containsKey(methodDescription)) {
+ methodCount.put(methodDescription,
+ methodCount.get(methodDescription) + 1);
+ methodDescription += "#"
+ + Integer.toString(methodCount.get(methodDescription));
+ } else {
methodCount.put(methodDescription, 1);
}
splitPointMap.put(entryNumber, methodDescription);
-
+
JClassType loader = getFragmentLoader(entryNumber);
JMethod loadMethod = getRunAsyncMethod(loader);
assert loadMethod != null;
@@ -106,8 +107,7 @@
visitor.accept(program);
setNumEntriesInAsyncFragmentLoader(visitor.entryCount);
program.setSplitPointMap(visitor.splitPointMap);
-
-
+
return visitor.entryCount;
}
Modified: trunk/user/test/com/google/gwt/dev/jjs/test/RunAsyncTest.java
==============================================================================
--- trunk/user/test/com/google/gwt/dev/jjs/test/RunAsyncTest.java
(original)
+++ trunk/user/test/com/google/gwt/dev/jjs/test/RunAsyncTest.java Tue Dec
23 22:38:21 2008
@@ -18,7 +18,6 @@
import com.google.gwt.core.client.GWT;
import com.google.gwt.core.client.RunAsyncCallback;
import com.google.gwt.junit.client.GWTTestCase;
-import com.google.gwt.user.client.Window;
/**
* Tests runAsync in various ways.
--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---
