Modifies c.g.g.core.ext.soyc.impl.MemberFactory to have the correct
new constructor paramater type (JDeclarationType versus JReferenceType).
This allows -soyc compiles to again succeed.

Review by: scottb



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

dev/core/src/com/google/gwt/core/ext/soyc/impl/MemberFactory.java

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 273aa6b..83f9b01 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
@@ -16,6 +16,7 @@
 package com.google.gwt.core.ext.soyc.impl;
 
 import com.google.gwt.core.ext.soyc.Member;
+import com.google.gwt.dev.jjs.ast.JDeclaredType;
 import com.google.gwt.dev.jjs.ast.JField;
 import com.google.gwt.dev.jjs.ast.JMethod;
 import com.google.gwt.dev.jjs.ast.JReferenceType;
@@ -42,8 +43,8 @@
     return getOrCreate(method, StandardMethodMember.class, JMethod.class);
   }
 
-  public StandardClassMember get(JReferenceType type) {
-    return getOrCreate(type, StandardClassMember.class, JReferenceType.class);
+  public StandardClassMember get(JDeclaredType type) {
+    return getOrCreate(type, StandardClassMember.class, JDeclaredType.class);
   }
 
   public StandardFunctionMember get(JsFunction function) {

dev/core/src/com/google/gwt/core/ext/soyc/impl/StoryRecorderImpl.java

diff --git a/dev/core/src/com/google/gwt/core/ext/soyc/impl/StoryRecorderImpl.java b/dev/core/src/com/google/gwt/core/ext/soyc/impl/StoryRecorderImpl.java
index 0682381..1ad9cdf 100644
--- a/dev/core/src/com/google/gwt/core/ext/soyc/impl/StoryRecorderImpl.java
+++ b/dev/core/src/com/google/gwt/core/ext/soyc/impl/StoryRecorderImpl.java
@@ -27,6 +27,7 @@
 import com.google.gwt.dev.jjs.Correlation;
 import com.google.gwt.dev.jjs.SourceInfo;
 import com.google.gwt.dev.jjs.Correlation.Axis;
+import com.google.gwt.dev.jjs.ast.JDeclaredType;
 import com.google.gwt.dev.jjs.ast.JField;
 import com.google.gwt.dev.jjs.ast.JMethod;
 import com.google.gwt.dev.jjs.ast.JProgram;
@@ -230,7 +231,7 @@
 
           switch (c.getAxis()) {
             case CLASS: {
-              JReferenceType type = c.getType();
+              JDeclaredType type = c.getType();
               StandardClassMember member = memberFactory.get(type);
               membersByCorrelation.put(c, member);
               classesMutable.add(member);
@@ -238,7 +239,7 @@
             }
             case FIELD: {
               JField field = c.getField();
-              JReferenceType type = c.getType();
+              JDeclaredType type = c.getType();
               StandardFieldMember member = memberFactory.get(field);
               memberFactory.get(type).addField(member);
               membersByCorrelation.put(c, member);
@@ -253,7 +254,7 @@
             }
             case METHOD: {
               JMethod method = c.getMethod();
-              JReferenceType type = c.getType();
+              JDeclaredType type = c.getType();
               StandardMethodMember member = memberFactory.get(method);
               memberFactory.get(type).addMethod(member);
               membersByCorrelation.put(c, member);

dev/core/src/com/google/gwt/dev/jjs/Correlation.java

diff --git a/dev/core/src/com/google/gwt/dev/jjs/Correlation.java b/dev/core/src/com/google/gwt/dev/jjs/Correlation.java
index c527440..0768df3 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/Correlation.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/Correlation.java
@@ -15,9 +15,9 @@
  */
 package com.google.gwt.dev.jjs;
 
+import com.google.gwt.dev.jjs.ast.JDeclaredType;
 import com.google.gwt.dev.jjs.ast.JField;
 import com.google.gwt.dev.jjs.ast.JMethod;
-import com.google.gwt.dev.jjs.ast.JReferenceType;
 import com.google.gwt.dev.js.ast.JsFunction;
 import com.google.gwt.dev.js.ast.JsName;
 
@@ -270,9 +270,9 @@
     }
   }
 
-  public JReferenceType getType() {
+  public JDeclaredType getType() {
     if (axis == Axis.CLASS) {
-      return (JReferenceType) astReference;
+      return (JDeclaredType) astReference;
     } else if (axis == Axis.METHOD) {
       return ((JMethod) astReference).getEnclosingType();
     } else if (axis == Axis.FIELD) {