commit bac83d638704fe3642ef9ee7219a51e00dd00027
author spoon@google.com <spoon@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Wed Apr 08 14:53:20 2009 +0000
committer spoon@google.com <spoon@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Wed Apr 08 14:53:20 2009 +0000
tree 064c7752d8048286013de69532986260ec836de4
parent 051ee6e127bc950bf90098e1b4f33c92e7954f8f

Another followup to r5190.  I accidentally left out this change
because it took effect in a different file than in the original patch.

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

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

diff --git a/dev/core/src/com/google/gwt/dev/jjs/CorrelationFactory.java b/dev/core/src/com/google/gwt/dev/jjs/CorrelationFactory.java
index 038bf50..88c961e 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/CorrelationFactory.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/CorrelationFactory.java
@@ -40,34 +40,42 @@
    * A dummy factory that always returns <code>null</code>.
    */
   public static final class DummyCorrelationFactory extends CorrelationFactory {
+    @Override
     public Correlation by(JField field) {
       return null;
     }
 
+    @Override
     public Correlation by(JMethod method) {
       return null;
     }
 
+    @Override
     public Correlation by(JReferenceType type) {
       return null;
     }
 
+    @Override
     public Correlation by(JsFunction function) {
       return null;
     }
 
+    @Override
     public Correlation by(JsName name) {
       return null;
     }
 
+    @Override
     public Correlation by(JsName name, boolean isAlias) {
       return null;
     }
 
+    @Override
     public Correlation by(Literal type) {
       return null;
     }
 
+    @Override
     public Correlation by(SourceOrigin origin) {
       return null;
     }
@@ -113,6 +121,7 @@
         sb.append(type.getJsniSignatureName());
       }
       sb.append(")");
+      sb.append(method.getOriginalReturnType().getJsniSignatureName());
       return sb.toString();
     }
 
@@ -123,6 +132,7 @@
     private final Map<Object, Correlation> canonicalMap = Collections.synchronizedMap(new ReferenceMap(
         ReferenceMap.WEAK, ReferenceMap.WEAK));
 
+    @Override
     public Correlation by(JField field) {
       Correlation toReturn = canonicalMap.get(field);
       if (toReturn == null) {
@@ -133,6 +143,7 @@
       return toReturn;
     }
 
+    @Override
     public Correlation by(JMethod method) {
       Correlation toReturn = canonicalMap.get(method);
       if (toReturn == null) {
@@ -143,6 +154,7 @@
       return toReturn;
     }
 
+    @Override
     public Correlation by(JReferenceType type) {
       Correlation toReturn = canonicalMap.get(type);
       if (toReturn == null) {
@@ -152,6 +164,7 @@
       return toReturn;
     }
 
+    @Override
     public Correlation by(JsFunction function) {
       Correlation toReturn = canonicalMap.get(function);
       if (toReturn == null) {
@@ -165,6 +178,7 @@
     /**
      * Creates a JS_NAME Correlation.
      */
+    @Override
     public Correlation by(JsName name) {
       return by(name, false);
     }
@@ -173,6 +187,7 @@
      * Creates either a JS_NAME or JS_ALIAS correlation, based on the value of
      * <code>isAlias</code>.
      */
+    @Override
     public Correlation by(JsName name, boolean isAlias) {
       Correlation toReturn = canonicalMap.get(name);
       if (toReturn == null) {
@@ -183,11 +198,13 @@
       return toReturn;
     }
 
+    @Override
     public Correlation by(Literal type) {
       assert LITERAL_CORRELATIONS.containsKey(type);
       return LITERAL_CORRELATIONS.get(type);
     }
 
+    @Override
     public Correlation by(SourceOrigin origin) {
       Correlation toReturn = canonicalMap.get(origin);
       if (toReturn == null) {