Auto code cleanup.
Review by: zundel@google.com
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@10196 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/src/com/google/gwt/core/ext/soyc/impl/AbstractMemberWithDependencies.java b/dev/core/src/com/google/gwt/core/ext/soyc/impl/AbstractMemberWithDependencies.java
index 7ce5c03..fd1eef9 100644
--- a/dev/core/src/com/google/gwt/core/ext/soyc/impl/AbstractMemberWithDependencies.java
+++ b/dev/core/src/com/google/gwt/core/ext/soyc/impl/AbstractMemberWithDependencies.java
@@ -25,11 +25,12 @@
/**
* Provides a common implementation of HasDependencies.
*/
-public abstract class AbstractMemberWithDependencies extends AbstractMember
- implements HasDependencies {
+public abstract class AbstractMemberWithDependencies extends AbstractMember implements
+ HasDependencies {
private final SortedSet<Member> dependencies = new TreeSet<Member>(
Member.TYPE_AND_SOURCE_NAME_COMPARATOR);
- private final SortedSet<Member> dependenciesView = Collections.unmodifiableSortedSet(dependencies);
+ private final SortedSet<Member> dependenciesView = Collections
+ .unmodifiableSortedSet(dependencies);
/**
* Add a dependency.
diff --git a/dev/core/src/com/google/gwt/core/ext/soyc/impl/DependencyRecorder.java b/dev/core/src/com/google/gwt/core/ext/soyc/impl/DependencyRecorder.java
index fcd2393..d44153b 100644
--- a/dev/core/src/com/google/gwt/core/ext/soyc/impl/DependencyRecorder.java
+++ b/dev/core/src/com/google/gwt/core/ext/soyc/impl/DependencyRecorder.java
@@ -36,9 +36,9 @@
public class DependencyRecorder implements MultipleDependencyGraphRecorder {
/**
* DependencyRecorder is not allowed to throw checked exceptions, because if
- * it did then {@link com.google.gwt.dev.jjs.impl.CodeSplitter} and {@link ControlFlowAnalyzer} would
- * throw exceptions all over the place. Instead, this class throws
- * NestedIOExceptions that wrap them.
+ * it did then {@link com.google.gwt.dev.jjs.impl.CodeSplitter} and
+ * {@link ControlFlowAnalyzer} would throw exceptions all over the place.
+ * Instead, this class throws NestedIOExceptions that wrap them.
*/
public static class NestedIOException extends RuntimeException {
public NestedIOException(IOException e) {
@@ -72,15 +72,13 @@
/**
* Used to record the dependencies of a specific method.
*/
- public void methodIsLiveBecause(JMethod liveMethod,
- ArrayList<JMethod> dependencyChain) {
+ public void methodIsLiveBecause(JMethod liveMethod, ArrayList<JMethod> dependencyChain) {
printMethodDependency(dependencyChain);
}
public void open() {
try {
- this.writer = new OutputStreamWriter(new GZIPOutputStream(finalOutput),
- "UTF-8");
+ this.writer = new OutputStreamWriter(new GZIPOutputStream(finalOutput), "UTF-8");
} catch (UnsupportedEncodingException e) {
throw new InternalCompilerException("UTF-8 is an unsupported encoding", e);
} catch (IOException e) {
@@ -107,8 +105,7 @@
*/
protected void recordDependenciesImpl(TreeLogger logger, JProgram jprogram) {
- logger = logger.branch(TreeLogger.DEBUG,
- "Creating dependencies file for the compile report");
+ logger = logger.branch(TreeLogger.DEBUG, "Creating dependencies file for the compile report");
ControlFlowAnalyzer dependencyAnalyzer = new ControlFlowAnalyzer(jprogram);
dependencyAnalyzer.setDependencyRecorder(this);
diff --git a/dev/core/src/com/google/gwt/core/ext/soyc/impl/MemberFactory.java b/dev/core/src/com/google/gwt/core/ext/soyc/impl/MemberFactory.java
index 541c096..6f3904a 100644
--- a/dev/core/src/com/google/gwt/core/ext/soyc/impl/MemberFactory.java
+++ b/dev/core/src/com/google/gwt/core/ext/soyc/impl/MemberFactory.java
@@ -33,6 +33,10 @@
public class MemberFactory {
private final Map<Class<?>, Map<?, ?>> map = new IdentityHashMap<Class<?>, Map<?, ?>>();
+ public StandardClassMember get(JDeclaredType type) {
+ return getOrCreate(type, StandardClassMember.class, JDeclaredType.class);
+ }
+
public StandardFieldMember get(JField field) {
return getOrCreate(field, StandardFieldMember.class, JField.class);
}
@@ -41,10 +45,6 @@
return getOrCreate(method, StandardMethodMember.class, JMethod.class);
}
- public StandardClassMember get(JDeclaredType type) {
- return getOrCreate(type, StandardClassMember.class, JDeclaredType.class);
- }
-
@SuppressWarnings("unchecked")
private <K, V extends Member> Map<K, V> getElementMap(Class<V> clazz) {
Map<K, V> elementMap = (Map<K, V>) map.get(clazz);
@@ -74,12 +74,10 @@
V toReturn = elementMap.get(key);
if (toReturn == null) {
try {
- Constructor<V> ctor = implClazz.getConstructor(MemberFactory.class,
- constructorParam);
+ Constructor<V> ctor = implClazz.getConstructor(MemberFactory.class, constructorParam);
toReturn = ctor.newInstance(this, key);
} catch (NoSuchMethodException e) {
- throw new RuntimeException(implClazz.getName()
- + " must declare a two-arg (MemberFactory, "
+ throw new RuntimeException(implClazz.getName() + " must declare a two-arg (MemberFactory, "
+ constructorParam.getName() + ") constructor", e);
} catch (IllegalArgumentException e) {
// Error on the part of this type
diff --git a/dev/core/src/com/google/gwt/core/ext/soyc/impl/SizeMapRecorder.java b/dev/core/src/com/google/gwt/core/ext/soyc/impl/SizeMapRecorder.java
index 605e72f..880868e 100644
--- a/dev/core/src/com/google/gwt/core/ext/soyc/impl/SizeMapRecorder.java
+++ b/dev/core/src/com/google/gwt/core/ext/soyc/impl/SizeMapRecorder.java
@@ -42,6 +42,24 @@
public class SizeMapRecorder {
/**
+ * A human-accessible type and description of a program reference. These are
+ * produced by
+ * {@link SizeMapRecorder#typedProgramReference(JsName, JavaToJavaScriptMap)}
+ * and used by
+ * {@link SizeMapRecorder#recordMap(TreeLogger, OutputStream, SizeBreakdown[], JavaToJavaScriptMap)}
+ * .
+ */
+ private static class TypedProgramReference {
+ public final String description;
+ public final String type;
+
+ public TypedProgramReference(String type, String description) {
+ this.type = type;
+ this.description = description;
+ }
+ }
+
+ /**
* Sorts by JsName.getIdent().
*/
private static final Comparator<JsName> JSNAME_SORT = new Comparator<JsName>() {
@@ -51,29 +69,11 @@
};
/**
- * A human-accessible type and description of a program reference. These are
- * produced by
- * {@link SizeMapRecorder#typedProgramReference(JsName, JavaToJavaScriptMap)}
- * and used by
- * {@link SizeMapRecorder#recordMap(TreeLogger, OutputStream, SizeBreakdown[], JavaToJavaScriptMap)}
- * .
- */
- private static class TypedProgramReference {
- public final String type;
- public final String description;
-
- public TypedProgramReference(String type, String description) {
- this.type = type;
- this.description = description;
- }
- }
-
- /**
* Returns the hexadecimal representation of a character.
*/
public static StringBuilder charToHex(char c) {
- char hexDigit[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
- 'A', 'B', 'C', 'D', 'E', 'F' };
+ char hexDigit[] =
+ {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
StringBuilder toReturn = new StringBuilder();
byte charByte = (byte) (c >>> 8);
toReturn.append(hexDigit[(charByte >> 4) & 0x0F]);
@@ -106,8 +106,8 @@
* &apos;
* @param builder a StringBuilder to be appended with the output.
*/
- public static void escapeXml(String code, int start, int end,
- boolean quoteApostrophe, StringBuilder builder) {
+ public static void escapeXml(String code, int start, int end, boolean quoteApostrophe,
+ StringBuilder builder) {
// See http://www.w3.org/TR/2006/REC-xml11-20060816/#charsets.
int lastIndex = 0;
int len = end - start;
@@ -129,12 +129,12 @@
builder.append("(invalid xml character: \\u" + charToHex(c[i]) + ")");
}
lastIndex = i + 1;
- } else if (((c[i] >= '\u007F') && (c[i] <= '\u0084')) ||
- ((c[i] >= '\u0086') && (c[i] <= '\u009F')) ||
- ((c[i] >= '\uD800') && (c[i] <= '\uDBFF')) ||
- ((c[i] >= '\uDC00') && (c[i] <= '\uDFFF')) ||
- ((c[i] >= '\uFDD0') && (c[i] <= '\uFDDF')) ||
- (c[i] == '\u00A0') || (c[i] == '\uFFFF') || (c[i] == '\uFFFE')) {
+ } else if (((c[i] >= '\u007F') && (c[i] <= '\u0084'))
+ || ((c[i] >= '\u0086') && (c[i] <= '\u009F'))
+ || ((c[i] >= '\uD800') && (c[i] <= '\uDBFF'))
+ || ((c[i] >= '\uDC00') && (c[i] <= '\uDFFF'))
+ || ((c[i] >= '\uFDD0') && (c[i] <= '\uFDDF')) || (c[i] == '\u00A0') || (c[i] == '\uFFFF')
+ || (c[i] == '\uFFFE')) {
builder.append(c, lastIndex, i - lastIndex);
builder.append("(invalid xml character: \\u" + charToHex(c[i]) + ")");
lastIndex = i + 1;
@@ -172,9 +172,8 @@
/**
* @param logger a TreeLogger
*/
- public static void recordMap(TreeLogger logger, OutputStream out,
- SizeBreakdown[] sizeBreakdowns, JavaToJavaScriptMap jjsmap,
- Map<JsName, String> obfuscateMap) throws IOException {
+ public static void recordMap(TreeLogger logger, OutputStream out, SizeBreakdown[] sizeBreakdowns,
+ JavaToJavaScriptMap jjsmap, Map<JsName, String> obfuscateMap) throws IOException {
out = new GZIPOutputStream(out);
Writer writer = new OutputStreamWriter(out, Util.DEFAULT_ENCODING);
@@ -182,18 +181,16 @@
writer.append("<sizemaps>\n");
for (int i = 0; i < sizeBreakdowns.length; i++) {
- writer.append("<sizemap fragment=\"" + i + "\" " + "size=\""
- + sizeBreakdowns[i].getSize() + "\">\n");
+ writer.append("<sizemap fragment=\"" + i + "\" " + "size=\"" + sizeBreakdowns[i].getSize()
+ + "\">\n");
Map<JsName, Integer> sizeMap = new TreeMap<JsName, Integer>(JSNAME_SORT);
sizeMap.putAll(sizeBreakdowns[i].getSizeMap());
for (Entry<JsName, Integer> sizeMapEntry : sizeMap.entrySet()) {
JsName name = sizeMapEntry.getKey();
int size = sizeMapEntry.getValue();
- TypedProgramReference typedRef = typedProgramReference(name, jjsmap,
- obfuscateMap);
- writer.append(" <size " + "type=\"" + escapeXml(typedRef.type)
- + "\" " + "ref=\"" + escapeXml(typedRef.description) + "\" "
- + "size=\"" + size + "\"/>\n");
+ TypedProgramReference typedRef = typedProgramReference(name, jjsmap, obfuscateMap);
+ writer.append(" <size " + "type=\"" + escapeXml(typedRef.type) + "\" " + "ref=\""
+ + escapeXml(typedRef.description) + "\" " + "size=\"" + size + "\"/>\n");
}
writer.append("</sizemap>\n");
}
diff --git a/dev/core/src/com/google/gwt/core/ext/soyc/impl/SplitPointRecorder.java b/dev/core/src/com/google/gwt/core/ext/soyc/impl/SplitPointRecorder.java
index dae8d5e..8630ef4 100644
--- a/dev/core/src/com/google/gwt/core/ext/soyc/impl/SplitPointRecorder.java
+++ b/dev/core/src/com/google/gwt/core/ext/soyc/impl/SplitPointRecorder.java
@@ -36,15 +36,13 @@
/**
* Used to record (runAsync) split points of a program.
*/
- public static void recordSplitPoints(JProgram jprogram, OutputStream out,
- TreeLogger logger) {
+ public static void recordSplitPoints(JProgram jprogram, OutputStream out, TreeLogger logger) {
- logger = logger.branch(TreeLogger.TRACE,
- "Creating split point map file for the compile report");
+ logger =
+ logger.branch(TreeLogger.TRACE, "Creating split point map file for the compile report");
try {
- OutputStreamWriter writer = new OutputStreamWriter(new GZIPOutputStream(
- out), "UTF-8");
+ OutputStreamWriter writer = new OutputStreamWriter(new GZIPOutputStream(out), "UTF-8");
PrintWriter pw = new PrintWriter(writer);
HtmlTextOutput htmlOut = new HtmlTextOutput(pw, false);
String curLine = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
@@ -67,13 +65,11 @@
for (int sp = 1; sp <= splitPointMap.size(); sp++) {
String location = splitPointMap.get(sp);
assert location != null;
- curLine = "<splitpoint id=\"" + sp + "\" location=\"" + location
- + "\"/>";
+ curLine = "<splitpoint id=\"" + sp + "\" location=\"" + location + "\"/>";
htmlOut.printRaw(curLine);
htmlOut.newline();
if (logger.isLoggable(TreeLogger.TRACE)) {
- logger.log(TreeLogger.TRACE, "Assigning split point #" + sp
- + " in method " + location);
+ logger.log(TreeLogger.TRACE, "Assigning split point #" + sp + " in method " + location);
}
}
htmlOut.indentOut();
@@ -133,12 +129,10 @@
if (replacement.getName() != null) {
methodDescription = replacement.getName();
} else {
- methodDescription = "@"
- + fullMethodDescription(replacement.getEnclosingMethod());
+ methodDescription = "@" + fullMethodDescription(replacement.getEnclosingMethod());
if (counts.containsKey(methodDescription)) {
counts.put(methodDescription, counts.get(methodDescription) + 1);
- methodDescription += "#"
- + Integer.toString(counts.get(methodDescription));
+ methodDescription += "#" + Integer.toString(counts.get(methodDescription));
} else {
counts.put(methodDescription, 1);
}
diff --git a/dev/core/src/com/google/gwt/core/ext/soyc/impl/StandardClassMember.java b/dev/core/src/com/google/gwt/core/ext/soyc/impl/StandardClassMember.java
index 7be5ba8..b011d54 100644
--- a/dev/core/src/com/google/gwt/core/ext/soyc/impl/StandardClassMember.java
+++ b/dev/core/src/com/google/gwt/core/ext/soyc/impl/StandardClassMember.java
@@ -32,8 +32,7 @@
* unmodifiable collections since it is exposed directly to user code via the
* Linker API.
*/
-public class StandardClassMember extends AbstractMemberWithDependencies
- implements ClassMember {
+public class StandardClassMember extends AbstractMemberWithDependencies implements ClassMember {
private final MemberFactory factory;
private final SortedSet<FieldMember> fields = new TreeSet<FieldMember>(
Member.SOURCE_NAME_COMPARATOR);
@@ -112,8 +111,7 @@
Set<JDeclaredType> toTraverse = new HashSet<JDeclaredType>();
toTraverse.add(type);
- SortedSet<ClassMember> overrides = new TreeSet<ClassMember>(
- Member.SOURCE_NAME_COMPARATOR);
+ SortedSet<ClassMember> overrides = new TreeSet<ClassMember>(Member.SOURCE_NAME_COMPARATOR);
while (!toTraverse.isEmpty()) {
JDeclaredType currentType = toTraverse.iterator().next();
diff --git a/dev/core/src/com/google/gwt/core/ext/soyc/impl/StandardFieldMember.java b/dev/core/src/com/google/gwt/core/ext/soyc/impl/StandardFieldMember.java
index c955338..522f599 100644
--- a/dev/core/src/com/google/gwt/core/ext/soyc/impl/StandardFieldMember.java
+++ b/dev/core/src/com/google/gwt/core/ext/soyc/impl/StandardFieldMember.java
@@ -31,8 +31,7 @@
*/
public StandardFieldMember(MemberFactory factory, JField field) {
this.enclosing = factory.get(field.getEnclosingType());
- this.sourceName = field.getEnclosingType().getName() + "::"
- + field.getName();
+ this.sourceName = field.getEnclosingType().getName() + "::" + field.getName();
}
public ClassMember getEnclosing() {
diff --git a/dev/core/src/com/google/gwt/core/ext/soyc/impl/StandardMethodMember.java b/dev/core/src/com/google/gwt/core/ext/soyc/impl/StandardMethodMember.java
index 7d83410..6e54d0c 100644
--- a/dev/core/src/com/google/gwt/core/ext/soyc/impl/StandardMethodMember.java
+++ b/dev/core/src/com/google/gwt/core/ext/soyc/impl/StandardMethodMember.java
@@ -23,8 +23,7 @@
/**
* An implementation of MethodMember.
*/
-public class StandardMethodMember extends AbstractMemberWithDependencies
- implements MethodMember {
+public class StandardMethodMember extends AbstractMemberWithDependencies implements MethodMember {
private final ClassMember enclosing;
private final String sourceName;
diff --git a/dev/core/src/com/google/gwt/core/ext/soyc/impl/StoryImpl.java b/dev/core/src/com/google/gwt/core/ext/soyc/impl/StoryImpl.java
index 4993a47..3c4e3b5 100644
--- a/dev/core/src/com/google/gwt/core/ext/soyc/impl/StoryImpl.java
+++ b/dev/core/src/com/google/gwt/core/ext/soyc/impl/StoryImpl.java
@@ -36,8 +36,8 @@
*/
public static final Comparator<Story> ID_COMPARATOR = new StoryImplComparator();
- private final int id;
private final int fragment;
+ private final int id;
private final int length;
private final String literalDescription;
private final SortedSet<Member> members;
@@ -46,8 +46,8 @@
* Standard constructor. This constructor will create unmodifiable versions of
* the collections passed into it.
*/
- public StoryImpl(int id, SortedSet<Member> members,
- String literalDescription, int fragment, int length) {
+ public StoryImpl(int id, SortedSet<Member> members, String literalDescription, int fragment,
+ int length) {
assert members != null;
assert fragment >= 0;
assert length > 0;
@@ -56,8 +56,7 @@
this.id = id;
this.fragment = fragment;
this.length = length;
- this.literalDescription = literalDescription == null ? null
- : literalDescription.intern();
+ this.literalDescription = literalDescription == null ? null : literalDescription.intern();
this.members = members;
}
diff --git a/dev/core/src/com/google/gwt/core/ext/soyc/impl/StoryRecorder.java b/dev/core/src/com/google/gwt/core/ext/soyc/impl/StoryRecorder.java
index 51bab4b..c1b935d 100644
--- a/dev/core/src/com/google/gwt/core/ext/soyc/impl/StoryRecorder.java
+++ b/dev/core/src/com/google/gwt/core/ext/soyc/impl/StoryRecorder.java
@@ -78,7 +78,7 @@
private int curHighestFragment = 0;
private OutputStream gzipStream;
-
+
private String[] js;
/**
@@ -90,18 +90,20 @@
* This is a class field for convenience, but it should be deleted at the end
* of the constructor.
*/
- private transient Map<Correlation, Member> membersByCorrelation = new IdentityHashMap<Correlation, Member>();
-
+ private transient Map<Correlation, Member> membersByCorrelation =
+ new IdentityHashMap<Correlation, Member>();
+
/**
* This is a class field for convenience, but it should be deleted at the end
* of the constructor.
*/
- private transient Map<SourceInfo, StoryImpl> storyCache = new IdentityHashMap<SourceInfo, StoryImpl>();
- private Map<Story, Integer> storyIds = new HashMap<Story, Integer>();
+ private transient Map<SourceInfo, StoryImpl> storyCache =
+ new IdentityHashMap<SourceInfo, StoryImpl>();
+ private final Map<Story, Integer> storyIds = new HashMap<Story, Integer>();
private StoryRecorder() {
}
-
+
protected void recordStoriesImpl(TreeLogger logger, OutputStream out,
List<Map<Range, SourceInfo>> sourceInfoMaps, String[] js) {
@@ -120,8 +122,7 @@
MemberFactory memberFactory = new MemberFactory();
// Record what we've seen so far
- TreeSet<ClassMember> classesMutable = new TreeSet<ClassMember>(
- Member.SOURCE_NAME_COMPARATOR);
+ TreeSet<ClassMember> classesMutable = new TreeSet<ClassMember>(Member.SOURCE_NAME_COMPARATOR);
Set<SourceInfo> sourceInfoSeen = new HashSet<SourceInfo>();
builder.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<soyc>\n<stories>\n");
@@ -129,9 +130,8 @@
int fragment = 0;
for (Map<Range, SourceInfo> sourceInfoMap : sourceInfoMaps) {
lastEnd = 0;
- analyzeFragment(memberFactory, classesMutable, sourceInfoMap,
- sourceInfoSeen, fragment++);
-
+ analyzeFragment(memberFactory, classesMutable, sourceInfoMap, sourceInfoSeen, fragment++);
+
// Flush output to improve memory locality
flushOutput();
}
@@ -153,17 +153,15 @@
logger.log(TreeLogger.ERROR, "Could not write dependency file.", e);
}
}
-
- private void analyzeFragment(MemberFactory memberFactory,
- TreeSet<ClassMember> classesMutable,
- Map<Range, SourceInfo> sourceInfoMap, Set<SourceInfo> sourceInfoSeen,
- int fragment) throws IOException {
+
+ private void analyzeFragment(MemberFactory memberFactory, TreeSet<ClassMember> classesMutable,
+ Map<Range, SourceInfo> sourceInfoMap, Set<SourceInfo> sourceInfoSeen, int fragment)
+ throws IOException {
/*
* We want to iterate over the Ranges so that enclosing Ranges come before
* their enclosed Ranges...
*/
- Range[] dependencyOrder = sourceInfoMap.keySet().toArray(
- new Range[sourceInfoMap.size()]);
+ Range[] dependencyOrder = sourceInfoMap.keySet().toArray(new Range[sourceInfoMap.size()]);
Arrays.sort(dependencyOrder, Range.DEPENDENCY_ORDER_COMPARATOR);
Stack<RangeInfo> dependencyScope = new Stack<RangeInfo>();
@@ -264,7 +262,7 @@
builder.append("<by idref=\"");
builder.append(correlation.getSourceName());
builder.append("\"/>\n");
-
+
flushOutput();
}
builder.append("</correlations>\n");
@@ -300,8 +298,7 @@
* the right length, possibly sub-dividing the super-enclosing Range in the
* process.
*/
- private void popAndRecord(Stack<RangeInfo> dependencyScope, int fragment)
- throws IOException {
+ private void popAndRecord(Stack<RangeInfo> dependencyScope, int fragment) throws IOException {
RangeInfo rangeInfo = dependencyScope.pop();
Range toStore = rangeInfo.range;
@@ -325,15 +322,14 @@
* sub-range previously stored.
*/
if (lastEnd < toStore.getEnd()) {
- Range newRange = new Range(Math.max(lastEnd, toStore.getStart()),
- toStore.getEnd());
+ Range newRange = new Range(Math.max(lastEnd, toStore.getStart()), toStore.getEnd());
recordStory(rangeInfo.info, fragment, newRange.length(), newRange);
lastEnd += newRange.length();
}
}
- private void recordStory(SourceInfo info, int fragment, int length,
- Range range) throws IOException {
+ private void recordStory(SourceInfo info, int fragment, int length, Range range)
+ throws IOException {
assert info != null;
assert storyCache != null;
@@ -343,8 +339,7 @@
StoryImpl theStory;
if (!storyCache.containsKey(info)) {
- SortedSet<Member> members = new TreeSet<Member>(
- Member.TYPE_AND_SOURCE_NAME_COMPARATOR);
+ SortedSet<Member> members = new TreeSet<Member>(Member.TYPE_AND_SOURCE_NAME_COMPARATOR);
for (Correlation c : info.getCorrelations()) {
Member m = membersByCorrelation.get(c);
if (m != null) {
@@ -358,8 +353,7 @@
literalType = literalCorrelation.getLiteral().getDescription();
}
- theStory = new StoryImpl(storyCache.size(), members, literalType,
- fragment, length);
+ theStory = new StoryImpl(storyCache.size(), members, literalType, fragment, length);
storyCache.put(info, theStory);
} else {
// Use a copy-constructed instance
diff --git a/dev/core/src/com/google/gwt/dev/jdt/AbstractCompiler.java b/dev/core/src/com/google/gwt/dev/jdt/AbstractCompiler.java
index cd5aa1b..3daf323 100644
--- a/dev/core/src/com/google/gwt/dev/jdt/AbstractCompiler.java
+++ b/dev/core/src/com/google/gwt/dev/jdt/AbstractCompiler.java
@@ -1,12 +1,12 @@
/*
* 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
@@ -138,24 +138,27 @@
*/
private class CompilerImpl extends Compiler {
+ private Map<String, BinaryTypeBinding> bindings;
private Set<CompilationUnitDeclaration> cuds;
- private Map<String,BinaryTypeBinding> bindings;
private long jdtProcessNanos;
- public CompilerImpl(INameEnvironment environment,
- IErrorHandlingPolicy policy, CompilerOptions compilerOptions,
- ICompilerRequestor requestor, IProblemFactory problemFactory) {
+ public CompilerImpl(INameEnvironment environment, IErrorHandlingPolicy policy,
+ CompilerOptions compilerOptions, ICompilerRequestor requestor,
+ IProblemFactory problemFactory) {
super(environment, policy, compilerOptions, requestor, problemFactory);
}
@Override
- public void accept(IBinaryType binaryType, PackageBinding packageBinding, AccessRestriction accessRestriction) {
+ public void accept(IBinaryType binaryType, PackageBinding packageBinding,
+ AccessRestriction accessRestriction) {
// Do the same thing as super.accept(), but record the BinaryTypeBinding
// that is generated from lookupEnvironment.
if (this.options.verbose) {
- out.println(Messages.bind(Messages.compilation_loadBinary, new String(binaryType.getName())));
+ out.println(Messages.bind(Messages.compilation_loadBinary, new String(binaryType
+ .getName())));
}
- BinaryTypeBinding binding = lookupEnvironment.createBinaryTypeFrom(binaryType, packageBinding, accessRestriction);
+ BinaryTypeBinding binding =
+ lookupEnvironment.createBinaryTypeFrom(binaryType, packageBinding, accessRestriction);
String name = CharOperation.toString(binding.compoundName);
if (bindings != null) {
bindings.put(name, binding);
@@ -164,8 +167,8 @@
@Override
public void compile(ICompilationUnit[] sourceUnits) {
- SpeedTracerLogger.Event compileEvent = SpeedTracerLogger.start(
- CompilerEventType.JDT_COMPILER_SANDBOX);
+ SpeedTracerLogger.Event compileEvent =
+ SpeedTracerLogger.start(CompilerEventType.JDT_COMPILER_SANDBOX);
try {
super.compile(sourceUnits);
} finally {
@@ -236,16 +239,15 @@
ICompilationUnit cu = unit.compilationResult.compilationUnit;
String loc = String.valueOf(cu.getFileName());
- TreeLogger branch = logger.branch(TreeLogger.SPAM,
- "Scanning for additional dependencies: " + loc, null);
+ TreeLogger branch =
+ logger.branch(TreeLogger.SPAM, "Scanning for additional dependencies: " + loc, null);
// Examine the cud for magic types.
//
String[] typeNames = outer.doFindAdditionalTypesUsingJsni(branch, unit);
addAdditionalTypes(branch, typeNames);
- typeNames = outer.doFindAdditionalTypesUsingArtificialRescues(branch,
- unit);
+ typeNames = outer.doFindAdditionalTypesUsingArtificialRescues(branch, unit);
addAdditionalTypes(branch, typeNames);
typeNames = outer.doFindAdditionalTypesUsingRebinds(branch, unit);
@@ -278,9 +280,8 @@
}
}
- private void compile(ICompilationUnit[] units,
- Set<CompilationUnitDeclaration> cuds,
- Map<String,BinaryTypeBinding> bindings) {
+ private void compile(ICompilationUnit[] units, Set<CompilationUnitDeclaration> cuds,
+ Map<String, BinaryTypeBinding> bindings) {
this.bindings = bindings;
this.cuds = cuds;
compile(units);
@@ -351,8 +352,8 @@
public NameEnvironmentAnswer findType(char[][] compoundTypeName) {
String qname = CharOperation.toString(compoundTypeName);
- TreeLogger branch = logger.branch(TreeLogger.SPAM,
- "Compiler is asking about '" + qname + "'", null);
+ TreeLogger branch =
+ logger.branch(TreeLogger.SPAM, "Compiler is asking about '" + qname + "'", null);
if (isPackage(qname)) {
branch.log(TreeLogger.SPAM, "Found to be a package", null);
@@ -377,8 +378,7 @@
return new NameEnvironmentAnswer(icu, null);
} else {
ClassLoader classLoader = getClassLoader();
- URL resourceURL = classLoader.getResource(className.replace('.', '/')
- + ".class");
+ URL resourceURL = classLoader.getResource(className.replace('.', '/') + ".class");
if (resourceURL != null) {
/*
* We know that there is a .class file that matches the name that we
@@ -534,29 +534,27 @@
}
}
- private static final Comparator<CompilationUnitDeclaration> CUD_COMPARATOR = new Comparator<CompilationUnitDeclaration>() {
+ private static final Comparator<CompilationUnitDeclaration> CUD_COMPARATOR =
+ new Comparator<CompilationUnitDeclaration>() {
- public int compare(CompilationUnitDeclaration cud1,
- CompilationUnitDeclaration cud2) {
- ICompilationUnit cu1 = cud1.compilationResult().getCompilationUnit();
- ICompilationUnit cu2 = cud2.compilationResult().getCompilationUnit();
- char[][] package1 = cu1.getPackageName();
- char[][] package2 = cu2.getPackageName();
- for (int i = 0, c = Math.min(package1.length, package2.length); i < c; ++i) {
- int result = CharArrayComparator.INSTANCE.compare(package1[i],
- package2[i]);
- if (result != 0) {
- return result;
+ public int compare(CompilationUnitDeclaration cud1, CompilationUnitDeclaration cud2) {
+ ICompilationUnit cu1 = cud1.compilationResult().getCompilationUnit();
+ ICompilationUnit cu2 = cud2.compilationResult().getCompilationUnit();
+ char[][] package1 = cu1.getPackageName();
+ char[][] package2 = cu2.getPackageName();
+ for (int i = 0, c = Math.min(package1.length, package2.length); i < c; ++i) {
+ int result = CharArrayComparator.INSTANCE.compare(package1[i], package2[i]);
+ if (result != 0) {
+ return result;
+ }
+ }
+ int result = package2.length - package1.length;
+ if (result != 0) {
+ return result;
+ }
+ return CharArrayComparator.INSTANCE.compare(cu1.getMainTypeName(), cu2.getMainTypeName());
}
- }
- int result = package2.length - package1.length;
- if (result != 0) {
- return result;
- }
- return CharArrayComparator.INSTANCE.compare(cu1.getMainTypeName(),
- cu2.getMainTypeName());
- }
- };
+ };
public static CompilerOptions getCompilerOptions() {
CompilerOptions options = JdtCompiler.getCompilerOptions();
@@ -567,29 +565,28 @@
return options;
}
- private Sandbox sandbox;
protected CompilationState compilationState;
+ private Sandbox sandbox;
- protected AbstractCompiler(CompilationState compilationState,
- boolean doGenerateBytes) {
+ protected AbstractCompiler(CompilationState compilationState, boolean doGenerateBytes) {
this.compilationState = compilationState;
this.sandbox = new Sandbox(this, doGenerateBytes);
}
- protected final CompilationResults compile(TreeLogger logger,
- ICompilationUnit[] units) {
+ protected final CompilationResults compile(TreeLogger logger, ICompilationUnit[] units) {
// Any additional compilation units that are found to be needed will be
// pulled in while processing compilation units. See CompilerImpl.process().
//
sandbox.logger = logger;
try {
- Set<CompilationUnitDeclaration> cuds = new TreeSet<CompilationUnitDeclaration>(CUD_COMPARATOR);
- LinkedHashMap<String,BinaryTypeBinding> bindings =
- new LinkedHashMap<String,BinaryTypeBinding>();
+ Set<CompilationUnitDeclaration> cuds =
+ new TreeSet<CompilationUnitDeclaration>(CUD_COMPARATOR);
+ LinkedHashMap<String, BinaryTypeBinding> bindings =
+ new LinkedHashMap<String, BinaryTypeBinding>();
sandbox.compiler.compile(units, cuds, bindings);
- return new CompilationResults(cuds.toArray(
- new CompilationUnitDeclaration[cuds.size()]), bindings);
+ return new CompilationResults(cuds.toArray(new CompilationUnitDeclaration[cuds.size()]),
+ bindings);
} finally {
sandbox.clear();
sandbox = null;
@@ -600,8 +597,8 @@
* @param logger a {@link TreeLogger}
* @param cud a {@link CompilationUnitDeclaration}
*/
- protected String[] doFindAdditionalTypesUsingArtificialRescues(
- TreeLogger logger, CompilationUnitDeclaration cud) {
+ protected String[] doFindAdditionalTypesUsingArtificialRescues(TreeLogger logger,
+ CompilationUnitDeclaration cud) {
return Empty.STRINGS;
}
diff --git a/dev/core/src/com/google/gwt/dev/jdt/BasicWebModeCompiler.java b/dev/core/src/com/google/gwt/dev/jdt/BasicWebModeCompiler.java
index 5b56b96..eaf1dee 100644
--- a/dev/core/src/com/google/gwt/dev/jdt/BasicWebModeCompiler.java
+++ b/dev/core/src/com/google/gwt/dev/jdt/BasicWebModeCompiler.java
@@ -40,21 +40,19 @@
*/
public class BasicWebModeCompiler extends AbstractCompiler {
- public static CompilationResults getCompilationUnitDeclarations(
- TreeLogger logger, CompilationState state,
- TypeLinker linker, String... seedTypeNames)
+ public static CompilationResults getCompilationUnitDeclarations(TreeLogger logger,
+ CompilationState state, TypeLinker linker, String... seedTypeNames)
throws UnableToCompleteException {
- return new BasicWebModeCompiler(state,
- linker).getCompilationUnitDeclarations(logger, seedTypeNames);
+ return new BasicWebModeCompiler(state, linker).getCompilationUnitDeclarations(logger,
+ seedTypeNames);
}
- private TypeLinker linker;
-
+ private final TypeLinker linker;
+
/**
* Construct a BasicWebModeCompiler.
*/
- public BasicWebModeCompiler(CompilationState compilationState,
- TypeLinker linker) {
+ public BasicWebModeCompiler(CompilationState compilationState, TypeLinker linker) {
super(compilationState, false);
this.linker = linker;
}
@@ -62,9 +60,8 @@
/**
* Build the initial set of compilation units.
*/
- public CompilationResults getCompilationUnitDeclarations(
- TreeLogger logger, String[] seedTypeNames,
- ICompilationUnit... additionalUnits) throws UnableToCompleteException {
+ public CompilationResults getCompilationUnitDeclarations(TreeLogger logger,
+ String[] seedTypeNames, ICompilationUnit... additionalUnits) throws UnableToCompleteException {
Map<String, CompiledClass> classMapBySource = compilationState.getClassFileMapBySource();
@@ -78,17 +75,16 @@
List<ICompilationUnit> icus =
new ArrayList<ICompilationUnit>(seedTypeNames.length + additionalUnits.length);
-
+
Collections.addAll(icus, additionalUnits);
for (String seedTypeName : seedTypeNames) {
- CompilationUnit unit = getUnitForType(logger, classMapBySource,
- seedTypeName);
+ CompilationUnit unit = getUnitForType(logger, classMapBySource, seedTypeName);
if (unit == null) {
continue;
}
-
+
if (alreadyAdded.add(unit)) {
icus.add(new CompilationUnitAdapter(unit));
}
@@ -98,8 +94,7 @@
* Compile, which will pull in everything else via the
* doFindAdditionalTypesUsingFoo() methods.
*/
- CompilationResults units = compile(logger, icus.toArray(
- new ICompilationUnit[icus.size()]));
+ CompilationResults units = compile(logger, icus.toArray(new ICompilationUnit[icus.size()]));
Memory.maybeDumpMemory("WebModeCompiler");
return units;
}
@@ -137,8 +132,7 @@
if (linker.isExternalType(typeName)) {
return null;
}
- logger.log(TreeLogger.ERROR, "Unable to find compilation unit for type '"
- + typeName + "'");
+ logger.log(TreeLogger.ERROR, "Unable to find compilation unit for type '" + typeName + "'");
throw new UnableToCompleteException();
}
diff --git a/dev/core/src/com/google/gwt/dev/jdt/FindDeferredBindingSitesVisitor.java b/dev/core/src/com/google/gwt/dev/jdt/FindDeferredBindingSitesVisitor.java
index 1842886..6f03ac9 100644
--- a/dev/core/src/com/google/gwt/dev/jdt/FindDeferredBindingSitesVisitor.java
+++ b/dev/core/src/com/google/gwt/dev/jdt/FindDeferredBindingSitesVisitor.java
@@ -54,9 +54,9 @@
}
}
+ public static final String ASYNC_MAGIC_METHOD = "runAsync";
public static final String MAGIC_CLASS = "com.google.gwt.core.client.GWT";
public static final String REBIND_MAGIC_METHOD = "create";
- public static final String ASYNC_MAGIC_METHOD = "runAsync";
public static void reportRebindProblem(MessageSendSite site, String message) {
MessageSend messageSend = site.messageSend;
@@ -97,21 +97,18 @@
Expression[] args = messageSend.arguments;
if (rebindMagicMethod) {
if (args.length != 1) {
- reportRebindProblem(site,
- "GWT.create() should take exactly one argument");
+ reportRebindProblem(site, "GWT.create() should take exactly one argument");
return;
}
if (!(args[0] instanceof ClassLiteralAccess)) {
- reportRebindProblem(site,
- "Only class literals may be used as arguments to GWT.create()");
+ reportRebindProblem(site, "Only class literals may be used as arguments to GWT.create()");
return;
}
} else {
assert asyncMagicMethod;
if (args.length != 1 && args.length != 2) {
- reportRebindProblem(site,
- "GWT.runAsync() should take one or two arguments");
+ reportRebindProblem(site, "GWT.runAsync() should take one or two arguments");
return;
}
if (args.length == 2) {
diff --git a/dev/core/src/com/google/gwt/dev/jdt/FindJsniRefVisitor.java b/dev/core/src/com/google/gwt/dev/jdt/FindJsniRefVisitor.java
index 8d2cb36..2fe19cf 100644
--- a/dev/core/src/com/google/gwt/dev/jdt/FindJsniRefVisitor.java
+++ b/dev/core/src/com/google/gwt/dev/jdt/FindJsniRefVisitor.java
@@ -70,8 +70,8 @@
return false;
}
- private void findJsniRefsAccurately(MethodDeclaration methodDeclaration,
- String jsniCode) throws InternalCompilerException {
+ private void findJsniRefsAccurately(MethodDeclaration methodDeclaration, String jsniCode)
+ throws InternalCompilerException {
JsProgram jsProgram = new JsProgram();
String syntheticFnHeader = "function(";
@@ -91,8 +91,7 @@
StringReader sr = new StringReader(syntheticFnHeader + '\n' + jsniCode);
try {
// start at -1 to avoid counting our synthetic header
- List<JsStatement> result = JsParser.parse(SourceOrigin.UNKNOWN,
- jsProgram.getScope(), sr);
+ List<JsStatement> result = JsParser.parse(SourceOrigin.UNKNOWN, jsProgram.getScope(), sr);
new JsVisitor() {
@Override
public void endVisit(JsNameRef x, JsContext ctx) {
@@ -111,8 +110,9 @@
private String getJSNICode(MethodDeclaration methodDeclaration) {
char[] source = methodDeclaration.compilationResult().getCompilationUnit().getContents();
- String jsniCode = String.valueOf(source, methodDeclaration.bodyStart,
- methodDeclaration.bodyEnd - methodDeclaration.bodyStart + 1);
+ String jsniCode =
+ String.valueOf(source, methodDeclaration.bodyStart, methodDeclaration.bodyEnd
+ - methodDeclaration.bodyStart + 1);
int startPos = jsniCode.indexOf(JsniCollector.JSNI_BLOCK_START);
int endPos = jsniCode.lastIndexOf(JsniCollector.JSNI_BLOCK_END);
if (startPos < 0 || endPos < 0) {
diff --git a/dev/core/src/com/google/gwt/dev/jdt/RebindOracle.java b/dev/core/src/com/google/gwt/dev/jdt/RebindOracle.java
index 6681196..503ba43 100644
--- a/dev/core/src/com/google/gwt/dev/jdt/RebindOracle.java
+++ b/dev/core/src/com/google/gwt/dev/jdt/RebindOracle.java
@@ -28,9 +28,8 @@
* caller must ensure that the result type is instantiable.
*
* @return the substitute type name, which may be the requested type itself;
- * this method must not return <code>null</code> if sourceTypeName
- * is not <code>null</code>
+ * this method must not return <code>null</code> if sourceTypeName is
+ * not <code>null</code>
*/
- String rebind(TreeLogger logger, String sourceTypeName)
- throws UnableToCompleteException;
+ String rebind(TreeLogger logger, String sourceTypeName) throws UnableToCompleteException;
}
diff --git a/dev/core/src/com/google/gwt/dev/jdt/TypeRefVisitor.java b/dev/core/src/com/google/gwt/dev/jdt/TypeRefVisitor.java
index b1c3a88..b1daa4f 100644
--- a/dev/core/src/com/google/gwt/dev/jdt/TypeRefVisitor.java
+++ b/dev/core/src/com/google/gwt/dev/jdt/TypeRefVisitor.java
@@ -144,11 +144,9 @@
}
@Override
- public boolean visit(CompilationUnitDeclaration cud,
- CompilationUnitScope scope) {
+ public boolean visit(CompilationUnitDeclaration cud, CompilationUnitScope scope) {
if (this.cud != cud) {
- throw new IllegalStateException(
- "I will only visit the cud I was initialized with");
+ throw new IllegalStateException("I will only visit the cud I was initialized with");
}
return true;
}
diff --git a/dev/core/src/com/google/gwt/dev/jdt/WebModeCompilerFrontEnd.java b/dev/core/src/com/google/gwt/dev/jdt/WebModeCompilerFrontEnd.java
index 62c9cbe..aa43758 100644
--- a/dev/core/src/com/google/gwt/dev/jdt/WebModeCompilerFrontEnd.java
+++ b/dev/core/src/com/google/gwt/dev/jdt/WebModeCompilerFrontEnd.java
@@ -1,12 +1,12 @@
/*
* 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
@@ -28,9 +28,9 @@
import org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;
import org.eclipse.jdt.internal.compiler.env.ICompilationUnit;
+import org.eclipse.jdt.internal.compiler.lookup.Binding;
import org.eclipse.jdt.internal.compiler.lookup.MethodBinding;
import org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;
-import org.eclipse.jdt.internal.compiler.lookup.TypeBinding;
import java.util.Collections;
import java.util.HashMap;
@@ -45,15 +45,14 @@
*/
public class WebModeCompilerFrontEnd extends BasicWebModeCompiler {
- public static CompilationResults getCompilationUnitDeclarations(
- TreeLogger logger, String[] seedTypeNames,
- RebindPermutationOracle rebindPermOracle, TypeLinker linker,
+ public static CompilationResults getCompilationUnitDeclarations(TreeLogger logger,
+ String[] seedTypeNames, RebindPermutationOracle rebindPermOracle, TypeLinker linker,
ICompilationUnit... additionalUnits) throws UnableToCompleteException {
Event getCompilationUnitsEvent =
SpeedTracerLogger.start(CompilerEventType.GET_COMPILATION_UNITS);
- CompilationResults results = new WebModeCompilerFrontEnd(rebindPermOracle,
- linker).getCompilationUnitDeclarations(logger, seedTypeNames,
- additionalUnits);
+ CompilationResults results =
+ new WebModeCompilerFrontEnd(rebindPermOracle, linker).getCompilationUnitDeclarations(
+ logger, seedTypeNames, additionalUnits);
getCompilationUnitsEvent.end();
return results;
}
@@ -67,20 +66,17 @@
* generator infrastructure, and therefore needs access to more parts of the
* compiler than WebModeCompilerFrontEnd currently has.
*/
- private WebModeCompilerFrontEnd(RebindPermutationOracle rebindPermOracle,
- TypeLinker linker) {
+ private WebModeCompilerFrontEnd(RebindPermutationOracle rebindPermOracle, TypeLinker linker) {
super(rebindPermOracle.getCompilationState(), linker);
this.rebindPermOracle = rebindPermOracle;
- this.fragmentLoaderCreator = new FragmentLoaderCreator(
- rebindPermOracle.getGeneratorContext());
+ this.fragmentLoaderCreator = new FragmentLoaderCreator(rebindPermOracle.getGeneratorContext());
}
@Override
- protected String[] doFindAdditionalTypesUsingArtificialRescues(
- TreeLogger logger, CompilationUnitDeclaration cud) {
+ protected String[] doFindAdditionalTypesUsingArtificialRescues(TreeLogger logger,
+ CompilationUnitDeclaration cud) {
List<String> types = ArtificialRescueChecker.collectReferencedTypes(cud);
- return types.isEmpty() ? Empty.STRINGS
- : types.toArray(new String[types.size()]);
+ return types.isEmpty() ? Empty.STRINGS : types.toArray(new String[types.size()]);
}
/**
@@ -103,14 +99,13 @@
String reqType = entry.getKey();
MessageSendSite site = entry.getValue();
try {
- String[] resultTypes = rebindPermOracle.getAllPossibleRebindAnswers(
- logger, reqType);
+ String[] resultTypes = rebindPermOracle.getAllPossibleRebindAnswers(logger, reqType);
rebindAnswers.put(reqType, resultTypes);
Collections.addAll(dependentTypeNames, resultTypes);
doFinish = true;
} catch (UnableToCompleteException e) {
- FindDeferredBindingSitesVisitor.reportRebindProblem(site,
- "Failed to resolve '" + reqType + "' via deferred binding");
+ FindDeferredBindingSitesVisitor.reportRebindProblem(site, "Failed to resolve '" + reqType
+ + "' via deferred binding");
rebindAnswers.put(reqType, new String[0]);
}
}
@@ -153,8 +148,7 @@
return dependentTypeNames.toArray(new String[dependentTypeNames.size()]);
}
- private void checkRebindResultInstantiable(MessageSendSite site,
- String typeName) {
+ private void checkRebindResultInstantiable(MessageSendSite site, String typeName) {
/*
* This causes the compiler to find the additional type, possibly winding
* its back to ask for the compilation unit from the source oracle.
@@ -163,37 +157,35 @@
// Sanity check rebind results.
if (type == null) {
- FindDeferredBindingSitesVisitor.reportRebindProblem(site,
- "Rebind result '" + typeName + "' could not be found");
+ FindDeferredBindingSitesVisitor.reportRebindProblem(site, "Rebind result '" + typeName
+ + "' could not be found");
return;
}
if (!type.isClass()) {
- FindDeferredBindingSitesVisitor.reportRebindProblem(site,
- "Rebind result '" + typeName + "' must be a class");
+ FindDeferredBindingSitesVisitor.reportRebindProblem(site, "Rebind result '" + typeName
+ + "' must be a class");
return;
}
if (type.isAbstract()) {
- FindDeferredBindingSitesVisitor.reportRebindProblem(site,
- "Rebind result '" + typeName + "' cannot be abstract");
+ FindDeferredBindingSitesVisitor.reportRebindProblem(site, "Rebind result '" + typeName
+ + "' cannot be abstract");
return;
}
if (type.isNestedType() && !type.isStatic()) {
- FindDeferredBindingSitesVisitor.reportRebindProblem(site,
- "Rebind result '" + typeName
- + "' cannot be a non-static nested class");
+ FindDeferredBindingSitesVisitor.reportRebindProblem(site, "Rebind result '" + typeName
+ + "' cannot be a non-static nested class");
return;
}
if (type.isLocalType()) {
- FindDeferredBindingSitesVisitor.reportRebindProblem(site,
- "Rebind result '" + typeName + "' cannot be a local class");
+ FindDeferredBindingSitesVisitor.reportRebindProblem(site, "Rebind result '" + typeName
+ + "' cannot be a local class");
return;
}
// Look for a noArg ctor.
- MethodBinding noArgCtor = type.getExactConstructor(TypeBinding.NO_PARAMETERS);
+ MethodBinding noArgCtor = type.getExactConstructor(Binding.NO_PARAMETERS);
if (noArgCtor == null) {
- FindDeferredBindingSitesVisitor.reportRebindProblem(site,
- "Rebind result '" + typeName
- + "' has no default (zero argument) constructors");
+ FindDeferredBindingSitesVisitor.reportRebindProblem(site, "Rebind result '" + typeName
+ + "' has no default (zero argument) constructors");
return;
}
}
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 7dba928..0845492 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java
@@ -260,8 +260,7 @@
PropertyOracle[] propertyOracles = permutation.getPropertyOracles();
int permutationId = permutation.getId();
if (logger.isLoggable(TreeLogger.INFO)) {
- logger.log(TreeLogger.INFO, "Compiling permutation " + permutationId
- + "...");
+ logger.log(TreeLogger.INFO, "Compiling permutation " + permutationId + "...");
}
long permStart = System.currentTimeMillis();
try {
@@ -455,8 +454,7 @@
logTrackingStats(logger);
if (logger.isLoggable(TreeLogger.TRACE)) {
- logger.log(TreeLogger.TRACE,
- "Permutation took " + (System.currentTimeMillis() - permStart)
+ logger.log(TreeLogger.TRACE, "Permutation took " + (System.currentTimeMillis() - permStart)
+ " ms");
}
return toReturn;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/CodeSplitter.java b/dev/core/src/com/google/gwt/dev/jjs/impl/CodeSplitter.java
index 3b37593..9add414 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/CodeSplitter.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/CodeSplitter.java
@@ -882,10 +882,8 @@
}
}
if (logger.isLoggable(TreeLogger.DEBUG)) {
- logger.log(TreeLogger.DEBUG, "Fixed up load-order dependencies by moving "
- + numFixups
- + " strings in class literal constructors to fragment 0, out of "
- + numClassLitStrings);
+ logger.log(TreeLogger.DEBUG, "Fixed up load-order dependencies by moving " + numFixups
+ + " strings in class literal constructors to fragment 0, out of " + numClassLitStrings);
}
}
@@ -908,10 +906,8 @@
}
if (logger.isLoggable(TreeLogger.DEBUG)) {
- logger.log(TreeLogger.DEBUG, "Fixed up load-order dependencies by moving "
- + numFixups
- + " strings used to initialize fields to fragment 0, out of "
- + +numFieldStrings);
+ logger.log(TreeLogger.DEBUG, "Fixed up load-order dependencies by moving " + numFixups
+ + " strings used to initialize fields to fragment 0, out of " + +numFieldStrings);
}
}
@@ -941,9 +937,8 @@
if (logger.isLoggable(TreeLogger.DEBUG)) {
logger.log(TreeLogger.DEBUG,
- "Fixed up load-order dependencies for instance methods by moving "
- + numFixups + " types to fragment 0, out of "
- + jprogram.getDeclaredTypes().size());
+ "Fixed up load-order dependencies for instance methods by moving " + numFixups
+ + " types to fragment 0, out of " + jprogram.getDeclaredTypes().size());
}
}
@@ -967,10 +962,8 @@
}
if (logger.isLoggable(TreeLogger.DEBUG)) {
- logger.log(TreeLogger.DEBUG,
- "Fixed up load-order dependencies on supertypes by moving " + numFixups
- + " types to fragment 0, out of "
- + jprogram.getDeclaredTypes().size());
+ logger.log(TreeLogger.DEBUG, "Fixed up load-order dependencies on supertypes by moving "
+ + numFixups + " types to fragment 0, out of " + jprogram.getDeclaredTypes().size());
}
}
diff --git a/dev/core/src/com/google/gwt/dev/js/JsUnusedFunctionRemover.java b/dev/core/src/com/google/gwt/dev/js/JsUnusedFunctionRemover.java
index b51a5e3..042fdbf5 100644
--- a/dev/core/src/com/google/gwt/dev/js/JsUnusedFunctionRemover.java
+++ b/dev/core/src/com/google/gwt/dev/js/JsUnusedFunctionRemover.java
@@ -36,8 +36,6 @@
* Removes JsFunctions that are never referenced in the program.
*/
public class JsUnusedFunctionRemover {
- public static final String NAME = JsUnusedFunctionRemover.class.getSimpleName();
-
/**
* Finds all functions in the program.
*/
@@ -93,16 +91,18 @@
}
}
+ public static final String NAME = JsUnusedFunctionRemover.class.getSimpleName();
+
public static OptimizerStats exec(JsProgram program) {
- Event optimizeJsEvent = SpeedTracerLogger.start(
- CompilerEventType.OPTIMIZE_JS, "optimizer", NAME);
+ Event optimizeJsEvent =
+ SpeedTracerLogger.start(CompilerEventType.OPTIMIZE_JS, "optimizer", NAME);
OptimizerStats stats = new JsUnusedFunctionRemover(program).execImpl();
optimizeJsEvent.end("didChange", "" + stats.didChange());
return stats;
}
- private final Map<JsName, JsFunction> toRemove = new HashMap<JsName, JsFunction>();
private final JsProgram program;
+ private final Map<JsName, JsFunction> toRemove = new HashMap<JsName, JsFunction>();
public JsUnusedFunctionRemover(JsProgram program) {
this.program = program;
diff --git a/dev/core/test/com/google/gwt/dev/jjs/JavaAstConstructor.java b/dev/core/test/com/google/gwt/dev/jjs/JavaAstConstructor.java
index ad305cc..98c3c23 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/JavaAstConstructor.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/JavaAstConstructor.java
@@ -51,8 +51,7 @@
*/
public class JavaAstConstructor {
- public static final MockJavaResource ARRAY = new MockJavaResource(
- "com.google.gwt.lang.Array") {
+ public static final MockJavaResource ARRAY = new MockJavaResource("com.google.gwt.lang.Array") {
@Override
public CharSequence getContent() {
StringBuffer code = new StringBuffer();
@@ -64,8 +63,7 @@
return code;
}
};
- public static final MockJavaResource CAST = new MockJavaResource(
- "com.google.gwt.lang.Cast") {
+ public static final MockJavaResource CAST = new MockJavaResource("com.google.gwt.lang.Cast") {
@Override
public CharSequence getContent() {
StringBuffer code = new StringBuffer();
@@ -81,8 +79,7 @@
return code;
}
};
- public static final MockJavaResource CLASS = new MockJavaResource(
- "java.lang.Class") {
+ public static final MockJavaResource CLASS = new MockJavaResource("java.lang.Class") {
@Override
public CharSequence getContent() {
StringBuffer code = new StringBuffer();
@@ -112,8 +109,7 @@
return code;
}
};
- public static final MockJavaResource ENUM = new MockJavaResource(
- "java.lang.Enum") {
+ public static final MockJavaResource ENUM = new MockJavaResource("java.lang.Enum") {
@Override
public CharSequence getContent() {
StringBuffer code = new StringBuffer();
@@ -135,22 +131,22 @@
return code;
}
};
- public static final MockJavaResource GWT = new MockJavaResource(
- "com.google.gwt.core.client.GWT") {
- @Override
- public CharSequence getContent() {
- StringBuffer code = new StringBuffer();
- code.append("package com.google.gwt.core.client;\n");
- code.append("public final class GWT {\n");
- code.append(" public boolean isClient() { return true; };\n");
- code.append(" public boolean isProdMode() { return true; };\n");
- code.append(" public boolean isScript() { return true; };\n");
- code.append(" public static void runAsync(RunAsyncCallback callback) { }\n");
- code.append(" public static void runAsync(Class<?> name, RunAsyncCallback callback) { }\n");
- code.append("}\n");
- return code;
- }
- };
+ public static final MockJavaResource GWT =
+ new MockJavaResource("com.google.gwt.core.client.GWT") {
+ @Override
+ public CharSequence getContent() {
+ StringBuffer code = new StringBuffer();
+ code.append("package com.google.gwt.core.client;\n");
+ code.append("public final class GWT {\n");
+ code.append(" public boolean isClient() { return true; };\n");
+ code.append(" public boolean isProdMode() { return true; };\n");
+ code.append(" public boolean isScript() { return true; };\n");
+ code.append(" public static void runAsync(RunAsyncCallback callback) { }\n");
+ code.append(" public static void runAsync(Class<?> name, RunAsyncCallback callback) { }\n");
+ code.append("}\n");
+ return code;
+ }
+ };
public static final MockJavaResource RUNASYNCCALLBACK = new MockJavaResource(
"com.google.gwt.core.client.RunAsyncCallback") {
@Override
@@ -161,8 +157,7 @@
return code;
}
};
- public static final MockJavaResource STATS = new MockJavaResource(
- "com.google.gwt.lang.Stats") {
+ public static final MockJavaResource STATS = new MockJavaResource("com.google.gwt.lang.Stats") {
@Override
public CharSequence getContent() {
StringBuffer code = new StringBuffer();
@@ -174,23 +169,21 @@
}
};
- public static JProgram construct(TreeLogger logger, CompilationState state,
- String... entryPoints) throws UnableToCompleteException {
- return construct(logger, state, TypeLinker.NULL_TYPE_LINKER,
- entryPoints);
+ public static JProgram construct(TreeLogger logger, CompilationState state, String... entryPoints)
+ throws UnableToCompleteException {
+ return construct(logger, state, TypeLinker.NULL_TYPE_LINKER, entryPoints);
}
- public static JProgram construct(TreeLogger logger, CompilationState state,
- TypeLinker linker, String... entryPoints)
- throws UnableToCompleteException {
+ public static JProgram construct(TreeLogger logger, CompilationState state, TypeLinker linker,
+ String... entryPoints) throws UnableToCompleteException {
Set<String> allRootTypes = new TreeSet<String>(Arrays.asList(entryPoints));
for (MockJavaResource resource : getCompilerTypes()) {
allRootTypes.add(resource.getTypeName());
}
- CompilationResults units =
- BasicWebModeCompiler.getCompilationUnitDeclarations(logger, state,
- linker, allRootTypes.toArray(new String[allRootTypes.size()]));
+ CompilationResults units =
+ BasicWebModeCompiler.getCompilationUnitDeclarations(logger, state, linker, allRootTypes
+ .toArray(new String[allRootTypes.size()]));
CompilationUnitDeclaration[] goldenCuds = units.compiledUnits;
@@ -219,8 +212,7 @@
* JSNI.
*/
TypeMap typeMap = new TypeMap(jprogram);
- TypeDeclaration[] allTypeDeclarations = BuildTypeMap.exec(typeMap,
- units, jsProgram, linker);
+ TypeDeclaration[] allTypeDeclarations = BuildTypeMap.exec(typeMap, units, jsProgram, linker);
// BuildTypeMap can uncover syntactic JSNI errors; report & abort
JavaToJavaScriptCompiler.checkForErrors(logger, goldenCuds, true);
@@ -263,8 +255,7 @@
// Replace the basic Class and Enum with a compiler-specific one.
result.remove(JavaResourceBase.CLASS);
result.remove(JavaResourceBase.ENUM);
- Collections.addAll(result, ARRAY, CAST, CLASS, CLASSLITERALHOLDER, ENUM, GWT,
- RUNASYNCCALLBACK);
+ Collections.addAll(result, ARRAY, CAST, CLASS, CLASSLITERALHOLDER, ENUM, GWT, RUNASYNCCALLBACK);
return result.toArray(new MockJavaResource[result.size()]);
}
}
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/CodeSplitterTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/CodeSplitterTest.java
index 1a4d726..187b660 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/CodeSplitterTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/CodeSplitterTest.java
@@ -30,8 +30,7 @@
JProgram program = compileSnippet("void", "");
ControlFlowAnalyzer cfa = CodeSplitter.computeInitiallyLive(program);
- assertTrue(cfa.getInstantiatedTypes().contains(
- findType(program, "com.google.gwt.lang.Array")));
+ assertTrue(cfa.getInstantiatedTypes().contains(findType(program, "com.google.gwt.lang.Array")));
assertTrue(cfa.getLiveFieldsAndMethods().contains(
findMethod(findType(program, "com.google.gwt.lang.Array"), "getClass")));
}
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/ReplaceRunAsyncsErrorMessagesTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/ReplaceRunAsyncsErrorMessagesTest.java
index d71ca6f..d91d4d2 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/ReplaceRunAsyncsErrorMessagesTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/ReplaceRunAsyncsErrorMessagesTest.java
@@ -70,8 +70,8 @@
}
private void addAsyncLoader(final int sp) {
- sourceOracle.addOrReplace(new MockJavaResource(
- "com.google.gwt.lang.asyncloaders.AsyncLoader" + sp) {
+ sourceOracle.addOrReplace(new MockJavaResource("com.google.gwt.lang.asyncloaders.AsyncLoader"
+ + sp) {
@Override
public CharSequence getContent() {
StringBuffer code = new StringBuffer();
@@ -88,16 +88,15 @@
addSnippetImport("com.google.gwt.lang.asyncloaders.AsyncLoader" + sp);
- sourceOracle.addOrReplace(new MockJavaResource(
- "com.google.gwt.lang.asyncloaders.AsyncLoader" + sp
- + FragmentLoaderCreator.CALLBACK_LIST_SUFFIX) {
+ sourceOracle.addOrReplace(new MockJavaResource("com.google.gwt.lang.asyncloaders.AsyncLoader"
+ + sp + FragmentLoaderCreator.CALLBACK_LIST_SUFFIX) {
@Override
public CharSequence getContent() {
StringBuffer code = new StringBuffer();
code.append("package com.google.gwt.lang.asyncloaders;\n");
code.append("import com.google.gwt.core.client.RunAsyncCallback;");
- code.append("public class AsyncLoader" + sp
- + FragmentLoaderCreator.CALLBACK_LIST_SUFFIX + "{\n");
+ code.append("public class AsyncLoader" + sp + FragmentLoaderCreator.CALLBACK_LIST_SUFFIX
+ + "{\n");
code.append(" RunAsyncCallback callback;\n");
code.append("}\n");
return code;
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/RunAsyncNameTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/RunAsyncNameTest.java
index 758c9b8..e35dd65 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/RunAsyncNameTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/RunAsyncNameTest.java
@@ -60,8 +60,7 @@
builder.setLowestLogLevel(TreeLogger.ERROR);
builder.expectError("Errors in '/mock/test/EntryPoint.java'", null);
builder.expectError(
- "Line 5: Only class literals may be used to name a call to GWT.runAsync()",
- null);
+ "Line 5: Only class literals may be used to name a call to GWT.runAsync()", null);
builder.expectError("Cannot proceed due to previous errors", null);
logger = builder.createLogger();
this.logger = logger;
diff --git a/user/src/com/google/gwt/core/client/impl/AsyncFragmentLoader.java b/user/src/com/google/gwt/core/client/impl/AsyncFragmentLoader.java
index a7c3bdc..c95c5ea 100644
--- a/user/src/com/google/gwt/core/client/impl/AsyncFragmentLoader.java
+++ b/user/src/com/google/gwt/core/client/impl/AsyncFragmentLoader.java
@@ -36,28 +36,27 @@
*
* <p>
* Since the precise way to load code depends on the linker, linkers should
- * specify a rebind of {@link LoadingStrategy}. The default rebind is
+ * specify a rebind of {@link LoadingStrategy}. The default rebind is
* {@link XhrLoadingStrategy}.
*/
public class AsyncFragmentLoader {
/**
- * An interface for handlers of load completion. On a failed download,
- * this callback should be invoked or else the requested download will
- * hang indefinitely. On a successful download, it's optional to call
- * this method. If it is called at all, it must be called after
- * the downloaded code has been installed, so that {@link AsyncFragmentLoader}
- * can distinguish successful from unsuccessful downloads.
- */
- public static interface LoadTerminatedHandler {
- void loadTerminated(Throwable reason);
- }
-
- /**
* A strategy for loading code fragments.
*/
public interface LoadingStrategy {
- void startLoadingFragment(int fragment,
- LoadTerminatedHandler loadTerminatedHandler);
+ void startLoadingFragment(int fragment, LoadTerminatedHandler loadTerminatedHandler);
+ }
+
+ /**
+ * An interface for handlers of load completion. On a failed download, this
+ * callback should be invoked or else the requested download will hang
+ * indefinitely. On a successful download, it's optional to call this method.
+ * If it is called at all, it must be called after the downloaded code has
+ * been installed, so that {@link AsyncFragmentLoader} can distinguish
+ * successful from unsuccessful downloads.
+ */
+ public static interface LoadTerminatedHandler {
+ void loadTerminated(Throwable reason);
}
/**
@@ -69,8 +68,7 @@
* so that they can be optional. A value of <code>null</code> for either one
* means that they are not specified.
*/
- void logEventProgress(String eventGroup, String type, int fragment,
- int size);
+ void logEventProgress(String eventGroup, String type, int fragment, int size);
}
/**
@@ -101,11 +99,10 @@
return $stats(data);
}-*/;
- public void logEventProgress(String eventGroup, String type,
- int fragment, int size) {
+ public void logEventProgress(String eventGroup, String type, int fragment, int size) {
@SuppressWarnings("unused")
- boolean toss = isStatsAvailable()
- && stats(createStatsEvent(eventGroup, type, fragment, size));
+ boolean toss =
+ isStatsAvailable() && stats(createStatsEvent(eventGroup, type, fragment, size));
}
private native JavaScriptObject createStatsEvent(String eventGroup,
@@ -139,8 +136,7 @@
private final int statusCode;
public HttpDownloadFailure(String url, int statusCode, String statusText) {
- super("Download of " + url + " failed with status " + statusCode + "("
- + statusText + ")");
+ super("Download of " + url + " failed with status " + statusCode + "(" + statusText + ")");
this.statusCode = statusCode;
}
@@ -150,8 +146,8 @@
}
/**
- * An exception indicating than at HTTP download succeeded, but installing
- * its body failed.
+ * An exception indicating than at HTTP download succeeded, but installing its
+ * body failed.
*/
static class HttpInstallFailure extends RuntimeException {
public HttpInstallFailure(String url, String text, Throwable rootCause) {
@@ -209,7 +205,7 @@
*/
private class ResetAfterDownloadFailure implements LoadTerminatedHandler {
private final int fragment;
-
+
public ResetAfterDownloadFailure(int myFragment) {
this.fragment = myFragment;
}
@@ -260,15 +256,14 @@
}
/**
- * The standard instance of AsyncFragmentLoader used in a web browser. If
- * not in GWT (i.e our vanilla JUnit tests, or if referenced in a server
- * context), this filed is {@code null}. In GWT, the parameters to this call
- * are rewritten by {@link com.google.gwt.dev.jjs.impl.ReplaceRunAsyncs}. So
- * this must be a method call of exactly two arguments, or that magic fails.
+ * The standard instance of AsyncFragmentLoader used in a web browser. If not
+ * in GWT (i.e our vanilla JUnit tests, or if referenced in a server context),
+ * this filed is {@code null}. In GWT, the parameters to this call are
+ * rewritten by {@link com.google.gwt.dev.jjs.impl.ReplaceRunAsyncs}. So this
+ * must be a method call of exactly two arguments, or that magic fails.
*/
- public static AsyncFragmentLoader BROWSER_LOADER =
- makeBrowserLoader(1, new int[] {});
-
+ public static AsyncFragmentLoader BROWSER_LOADER = makeBrowserLoader(1, new int[]{});
+
/**
* A helper static method that invokes
* BROWSER_LOADER.leftoversFragmentHasLoaded(). Such a call is generated by
@@ -281,16 +276,15 @@
/**
* Creates the loader stored as {@link #BROWSER_LOADER}.
+ *
* @returns {@code null} if not in GWT client code, where
- * {@link GWT#create(Class)} cannot be used, or a fragment loader for
- * the user's application otherwise.
+ * {@link GWT#create(Class)} cannot be used, or a fragment loader for
+ * the user's application otherwise.
*/
- private static AsyncFragmentLoader makeBrowserLoader(int numFragments,
- int initialLoad[]) {
+ private static AsyncFragmentLoader makeBrowserLoader(int numFragments, int initialLoad[]) {
if (GWT.isClient()) {
- return new AsyncFragmentLoader(numFragments, initialLoad,
- (LoadingStrategy) GWT.create(LoadingStrategy.class),
- (Logger) GWT.create(Logger.class));
+ return new AsyncFragmentLoader(numFragments, initialLoad, (LoadingStrategy) GWT
+ .create(LoadingStrategy.class), (Logger) GWT.create(Logger.class));
} else {
return null;
}
@@ -306,8 +300,8 @@
* loaded. This array will hold the initial sequence of bases followed by the
* leftovers fragment. It is filled in by
* {@link com.google.gwt.dev.jjs.impl.CodeSplitter} modifying the initializer
- * to {@link #BROWSER_LOADER}. The list does <em>not</em> include the leftovers
- * fragment, which must be loaded once all of these are finished.
+ * to {@link #BROWSER_LOADER}. The list does <em>not</em> include the
+ * leftovers fragment, which must be loaded once all of these are finished.
*/
private final int[] initialLoadSequence;
@@ -410,7 +404,7 @@
}
public boolean isAlreadyLoaded(int splitPoint) {
- return isLoaded[splitPoint];
+ return isLoaded[splitPoint];
}
public boolean isLoading(int splitPoint) {
@@ -464,8 +458,7 @@
* queue will be removed later.
*/
private void clearRequestsAlreadyLoaded() {
- while (requestedExclusives.size() > 0
- && isLoaded[requestedExclusives.peek()]) {
+ while (requestedExclusives.size() > 0 && isLoaded[requestedExclusives.peek()]) {
int offset = requestedExclusives.remove();
if (offset < pendingDownloadErrorHandlers.length) {
pendingDownloadErrorHandlers[offset] = null;
@@ -480,16 +473,15 @@
}
private String downloadGroup(int fragment) {
- return (fragment == leftoversFragment()) ? LwmLabels.LEFTOVERS_DOWNLOAD
- : LwmLabels.downloadGroupForExclusive(fragment);
+ return (fragment == leftoversFragment()) ? LwmLabels.LEFTOVERS_DOWNLOAD : LwmLabels
+ .downloadGroupForExclusive(fragment);
}
/**
* Return whether all initial fragments have completed loading.
*/
private boolean haveInitialFragmentsLoaded() {
- return remainingInitialFragments != null
- && remainingInitialFragments.size() == 0;
+ return remainingInitialFragments != null && remainingInitialFragments.size() == 0;
}
/**
@@ -497,8 +489,7 @@
*/
private void initializeRemainingInitialFragments() {
if (remainingInitialFragments == null) {
- remainingInitialFragments = new BoundedIntQueue(
- initialLoadSequence.length + 1);
+ remainingInitialFragments = new BoundedIntQueue(initialLoadSequence.length + 1);
for (int sp : initialLoadSequence) {
remainingInitialFragments.add(sp);
}
@@ -544,8 +535,7 @@
* <code>fragment</code> and <code>size</code> objects are allowed to be
* <code>null</code>.
*/
- private void logEventProgress(String eventGroup, String type, int fragment,
- int size) {
+ private void logEventProgress(String eventGroup, String type, int fragment, int size) {
logger.logEventProgress(eventGroup, type, fragment, size);
}
@@ -558,8 +548,7 @@
assert (fragmentLoading < 0);
fragmentLoading = fragment;
logDownloadStart(fragment);
- loadingStrategy.startLoadingFragment(fragment,
- new ResetAfterDownloadFailure(fragment));
+ loadingStrategy.startLoadingFragment(fragment, new ResetAfterDownloadFailure(fragment));
}
/**
diff --git a/user/test/com/google/gwt/dev/jjs/test/RunAsyncTest.java b/user/test/com/google/gwt/dev/jjs/test/RunAsyncTest.java
index e3a49e0..44a5adf 100644
--- a/user/test/com/google/gwt/dev/jjs/test/RunAsyncTest.java
+++ b/user/test/com/google/gwt/dev/jjs/test/RunAsyncTest.java
@@ -110,8 +110,8 @@
public void testUnhandledExceptions() {
// Create an exception that will be thrown from an onSuccess method
- final RuntimeException toThrow = new RuntimeException(
- "Should be caught by the uncaught exception handler");
+ final RuntimeException toThrow =
+ new RuntimeException("Should be caught by the uncaught exception handler");
// save the original handler
final UncaughtExceptionHandler originalHandler = GWT.getUncaughtExceptionHandler();
