Author: [EMAIL PROTECTED]
Date: Fri Oct 3 08:32:40 2008
New Revision: 3706
Modified:
changes/spoon/runAsync/dev/core/src/com/google/gwt/dev/jjs/impl/FragmentLoaderCreator.java
changes/spoon/runAsync/dev/core/src/com/google/gwt/dev/jjs/impl/ReplaceRunAsyncs.java
Log:
Sort and format.
Modified:
changes/spoon/runAsync/dev/core/src/com/google/gwt/dev/jjs/impl/FragmentLoaderCreator.java
==============================================================================
---
changes/spoon/runAsync/dev/core/src/com/google/gwt/dev/jjs/impl/FragmentLoaderCreator.java
(original)
+++
changes/spoon/runAsync/dev/core/src/com/google/gwt/dev/jjs/impl/FragmentLoaderCreator.java
Fri Oct 3 08:32:40 2008
@@ -38,11 +38,11 @@
* handled by TypeTightener and LivenessAnalyzer.
*/
public class FragmentLoaderCreator {
- private static final String PROP_RUN_ASYNC_NEVER_RUNS
= "gwt.jjs.runAsyncNeverRuns";
+ public static final String ASYNC_FRAGMENT_LOADER
= "com.google.gwt.core.client.AsyncFragmentLoader";
public static final String ASYNC_LOADER_CLASS_PREFIX = "AsyncLoader";
public static final String ASYNC_LOADER_PACKAGE
= "com.google.gwt.lang.asyncloaders";
- public static final String ASYNC_FRAGMENT_LOADER
= "com.google.gwt.core.client.AsyncFragmentLoader";
public static final String RUN_ASYNC_CALLBACK
= "com.google.gwt.core.client.RunAsyncCallback";
+ private static final String PROP_RUN_ASYNC_NEVER_RUNS
= "gwt.jjs.runAsyncNeverRuns";
private final ArtifactSet artifactSet;
private final CompilationState compilationState;
@@ -111,28 +111,6 @@
+ " callbacks = null;");
}
- /**
- * Generate the <code>runAsync</code> method. Calls to
<code>GWT.runAsync</code>
- * are replaced by calls to this method.
- */
- private void generateRunAsyncMethod(PrintWriter srcWriter) {
- srcWriter.println("public static void runAsync(RunAsyncCallback
callback) {");
- srcWriter.println(getCallbackListSimpleName() + " newCallbackList =
new "
- + getCallbackListSimpleName() + "();");
- srcWriter.println("newCallbackList.callback = callback;");
- srcWriter.println("newCallbackList.next = callbacks;");
- srcWriter.println("callbacks = newCallbackList;");
- srcWriter.println("if (loaded) {");
- srcWriter.println("instance.runCallbacks();");
- srcWriter.println("return;");
- srcWriter.println("}");
- srcWriter.println("if (!loading) {");
- srcWriter.println("loading = true;");
- srcWriter.println("AsyncFragmentLoader.inject(" + entryNumber + ");");
- srcWriter.println("}");
- srcWriter.println("}");
- }
-
private void generateOnErrorMethod(PrintWriter srcWriter) {
srcWriter.println("public static void onError(Throwable e) {");
srcWriter.println("loading = false;");
@@ -151,6 +129,28 @@
srcWriter.println("instance.runCallbacks();");
srcWriter.println(ASYNC_FRAGMENT_LOADER
+ ".logEventProgress(\"runCallbacks" + entryNumber + "\",
\"end\");");
+ srcWriter.println("}");
+ }
+
+ /**
+ * Generate the <code>runAsync</code> method. Calls to
+ * <code>GWT.runAsync</code> are replaced by calls to this method.
+ */
+ private void generateRunAsyncMethod(PrintWriter srcWriter) {
+ srcWriter.println("public static void runAsync(RunAsyncCallback
callback) {");
+ srcWriter.println(getCallbackListSimpleName() + " newCallbackList =
new "
+ + getCallbackListSimpleName() + "();");
+ srcWriter.println("newCallbackList.callback = callback;");
+ srcWriter.println("newCallbackList.next = callbacks;");
+ srcWriter.println("callbacks = newCallbackList;");
+ srcWriter.println("if (loaded) {");
+ srcWriter.println("instance.runCallbacks();");
+ srcWriter.println("return;");
+ srcWriter.println("}");
+ srcWriter.println("if (!loading) {");
+ srcWriter.println("loading = true;");
+ srcWriter.println("AsyncFragmentLoader.inject(" + entryNumber + ");");
+ srcWriter.println("}");
srcWriter.println("}");
}
Modified:
changes/spoon/runAsync/dev/core/src/com/google/gwt/dev/jjs/impl/ReplaceRunAsyncs.java
==============================================================================
---
changes/spoon/runAsync/dev/core/src/com/google/gwt/dev/jjs/impl/ReplaceRunAsyncs.java
(original)
+++
changes/spoon/runAsync/dev/core/src/com/google/gwt/dev/jjs/impl/ReplaceRunAsyncs.java
Fri Oct 3 08:32:40 2008
@@ -30,8 +30,8 @@
*/
public class ReplaceRunAsyncs {
private class AsyncCreateVisitor extends JModVisitor {
- private int entryCount = 1;
private JMethod currentMethod;
+ private int entryCount = 1;
@Override
public void endVisit(JMethodCall x, Context ctx) {
@@ -94,31 +94,31 @@
return (JClassType) result;
}
- private JMethod getRunAsyncMethod(JClassType loaderType) {
+ private JMethod getOnLoadMethod(JClassType loaderType) {
assert loaderType != null;
assert loaderType.methods != null;
for (JMethod method : loaderType.methods) {
- if (method.getName().equals("runAsync")) {
+ if (method.getName().equals("onLoad")) {
assert (method.isStatic());
- assert (method.params.size() == 1);
- assert
(method.params.get(0).getType().getName().equals(FragmentLoaderCreator.RUN_ASYNC_CALLBACK));
+ assert (method.params.size() == 0);
return method;
}
}
+ assert false;
return null;
}
- private JMethod getOnLoadMethod(JClassType loaderType) {
+ private JMethod getRunAsyncMethod(JClassType loaderType) {
assert loaderType != null;
assert loaderType.methods != null;
for (JMethod method : loaderType.methods) {
- if (method.getName().equals("onLoad")) {
+ if (method.getName().equals("runAsync")) {
assert (method.isStatic());
- assert (method.params.size() == 0);
+ assert (method.params.size() == 1);
+ assert
(method.params.get(0).getType().getName().equals(FragmentLoaderCreator.RUN_ASYNC_CALLBACK));
return method;
}
}
- assert false;
return null;
}
}
--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---
