X-Git-Url: http://git.megacz.com/?p=org.ibex.tool.git;a=blobdiff_plain;f=src%2Forg%2Feclipse%2Fjdt%2Finternal%2Fcompiler%2Flookup%2FNestedTypeBinding.java;fp=src%2Forg%2Feclipse%2Fjdt%2Finternal%2Fcompiler%2Flookup%2FNestedTypeBinding.java;h=2b78a5d32f78b368265e6b5f26f4d757b8695ee4;hp=8143f9bb79f6a75eba35a470c733708403b49ac5;hb=c17753cd9e62cd1a71df3d88af908de0425ac33d;hpb=040fa5af2cd00017cf3575950cdaade34a6d7f6c

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
--- 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;