231187: test and fix. Do the parameterization check after ITDs have applied

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
index 20839689344bc54cdb577f194507631fbd82d611..744a39090d77b20fad78e659c2e8e9194a7e5ea3 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
@@ -142,7 +142,7 @@ public class AjLookupEnvironment extends LookupEnvironment implements AnonymousC
        
                for (int i = lastCompletedUnitIndex + 1; i <= lastUnitIndex; i++) {
                        ContextToken tok = CompilationAndWeavingContext.enteringPhase(CompilationAndWeavingContext.BUILDING_FIELDS_AND_METHODS, units[i].compilationResult.fileName);
-                       units[i].scope.checkParameterizedTypes();
+//                     units[i].scope.checkParameterizedTypes(); do this check a little later, after ITDs applied to stbs
                        units[i].scope.buildFieldsAndMethods();
                        CompilationAndWeavingContext.leavingPhase(tok);
                }
@@ -224,7 +224,11 @@ public class AjLookupEnvironment extends LookupEnvironment implements AnonymousC
                                weaveInterTypeDeclarations(units[i].scope, typeMungers, declareParents,declareAnnotationOnTypes);
                        }
                }
-               
+
+        for (int i = lastCompletedUnitIndex + 1; i <= lastUnitIndex; i++) {
+            units[i].scope.checkParameterizedTypes();
+        }
+        
                for (int i = lastCompletedUnitIndex +1; i<=lastUnitIndex; i++) {
                        SourceTypeBinding[] b = units[i].scope.topLevelTypes;
             for (int j = 0; j < b.length; j++) {