import eclipse 3.1 M4 compiler

[org.ibex.tool.git] / src / org / eclipse / jdt / internal / compiler / lookup / NestedTypeBinding.java

diff --git a/src/org/eclipse/jdt/internal/compiler/lookup/NestedTypeBinding.java b/src/org/eclipse/jdt/internal/compiler/lookup/NestedTypeBinding.java
index 8143f9b..2b78a5d 100644 (file)
--- a/src/org/eclipse/jdt/internal/compiler/lookup/NestedTypeBinding.java
+++ b/src/org/eclipse/jdt/internal/compiler/lookup/NestedTypeBinding.java
@@ -91,7 +91,7 @@ public class NestedTypeBinding extends SourceTypeBinding {
                if (synthLocal == null) return null;
        
                if (synthLocal.matchingField == null)
-                       synthLocal.matchingField = addSyntheticField(actualOuterLocalVariable);
+                       synthLocal.matchingField = addSyntheticFieldForInnerclass(actualOuterLocalVariable);
                return synthLocal;
        }
 
@@ -103,7 +103,7 @@ public class NestedTypeBinding extends SourceTypeBinding {
                if (synthLocal == null) return null;
        
                if (synthLocal.matchingField == null)
-                       synthLocal.matchingField = addSyntheticField(targetEnclosingType);
+                       synthLocal.matchingField = addSyntheticFieldForInnerclass(targetEnclosingType);
                return synthLocal;
        }
 
@@ -209,7 +209,7 @@ public class NestedTypeBinding extends SourceTypeBinding {
                if (!onlyExactMatch){
                        for (int i = enclosingInstances.length; --i >= 0;)
                                if (enclosingInstances[i].actualOuterLocalVariable == null)
-                                       if (targetEnclosingType.isSuperclassOf((ReferenceBinding) enclosingInstances[i].type))
+                                       if (((ReferenceBinding)enclosingInstances[i].type).findSuperTypeErasingTo(targetEnclosingType) != null)
                                                return enclosingInstances[i];
                }
                return null;