### Eclipse Workspace Patch 1.0
#P org.eclipse.jdt.core
Index: compiler/org/eclipse/jdt/internal/compiler/lookup/CompilationUnitScope.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/CompilationUnitScope.java,v
retrieving revision 1.116
diff -u -r1.116 CompilationUnitScope.java
--- compiler/org/eclipse/jdt/internal/compiler/lookup/CompilationUnitScope.java	20 Mar 2008 20:11:22 -0000	1.116
+++ compiler/org/eclipse/jdt/internal/compiler/lookup/CompilationUnitScope.java	6 May 2008 15:51:11 -0000
@@ -561,7 +561,7 @@
 			}
 		}
 		if (currentType.superInterfaces() == null) // needed for statically imported types which don't know their hierarchy yet
-			((SourceTypeBinding) currentType).scope.connectTypeHierarchy();
+			((SourceTypeBinding) currentType.erasure()).scope.connectTypeHierarchy();
 	} while ((currentType = currentType.superclass()) != null);
 	return null;
 }
Index: compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java,v
retrieving revision 1.328
diff -u -r1.328 Scope.java
--- compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java	23 Apr 2008 18:13:49 -0000	1.328
+++ compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java	6 May 2008 15:51:18 -0000
@@ -860,7 +860,7 @@
 		while (keepLooking) {
 			ReferenceBinding[] itsInterfaces = currentType.superInterfaces();
 			if (itsInterfaces == null) { // needed for statically imported types which don't know their hierarchy yet
-				((SourceTypeBinding) currentType).scope.connectTypeHierarchy();
+				((SourceTypeBinding) currentType.erasure()).scope.connectTypeHierarchy();
 				itsInterfaces = currentType.superInterfaces();
 			}
 			if (itsInterfaces != null && itsInterfaces != Binding.NO_SUPERINTERFACES) {