commit ca56e7639155649e5fd96c3e91f2a8d4c70f34b5
author jat@google.com <jat@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Tue Apr 28 18:03:08 2009 +0000
committer jat@google.com <jat@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Tue Apr 28 18:03:08 2009 +0000
tree 5b9e14666ea666a466e97bf717270a27321240e8
parent bad7dd609bcb122747c11c37113df72f4ff722df

Fix merge problem.

Patch by: jat
Review by: spoon (desk)


git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@5294 8db76d5a-ed1c-0410-87a9-c151d255dfc7

dev/core/src/com/google/gwt/dev/jjs/impl/CodeSplitter.java

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 dd7403c..2e48f7b 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
@@ -334,12 +334,12 @@
     Map<Integer, JMethod> splitPointToLoadMethod = new HashMap<Integer, JMethod>();
     // These methods aren't indexed, so scan the whole program
 
-    for (JReferenceType type : program.getDeclaredTypes()) {
+    for (JDeclaredType type : program.getDeclaredTypes()) {
       Matcher matcher = LOADER_CLASS_PATTERN.matcher(type.getName());
       if (matcher.matches()) {
         int sp = Integer.parseInt(matcher.group(1));
         JMethod loadMethod = null;
-        for (JMethod meth : type.methods) {
+        for (JMethod meth : type.getMethods()) {
           if (meth.getName().equals(
               FragmentLoaderCreator.LOADER_METHOD_RUN_ASYNC)) {
             loadMethod = meth;