]> source.dussan.org Git - aspectj.git/commitdiff
433351: second part of the fix: cope with PTBs for parent weaving
authorAndy Clement <aclement@gopivotal.com>
Thu, 19 Jun 2014 23:55:49 +0000 (16:55 -0700)
committerAndy Clement <aclement@gopivotal.com>
Thu, 19 Jun 2014 23:55:49 +0000 (16:55 -0700)
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java

index 22e8fdf0d04e4192201614243eea25f76c736e30..e296c74385eb6be8c4acf972aa0b9439faef9d81 100644 (file)
@@ -420,6 +420,9 @@ public class AjLookupEnvironment extends LookupEnvironment implements AnonymousC
                                weaveIntertypes(typesToProcess, (SourceTypeBinding) binding, typeMungers, declareParents, declareAnnotationOnTypes,
                                                mode);
                        }
+                       else if (binding instanceof ParameterizedTypeBinding && (((ParameterizedTypeBinding)binding).type instanceof SourceTypeBinding) && typesToProcess.contains(((ParameterizedTypeBinding)binding).type)) {
+                               weaveIntertypes(typesToProcess, (SourceTypeBinding) ((ParameterizedTypeBinding)binding).type, typeMungers, declareParents, declareAnnotationOnTypes, mode);
+                       }
                }
                weaveInterTypeDeclarations(typeToWeave, typeMungers, declareParents, declareAnnotationOnTypes, false, mode);
                typesToProcess.remove(typeToWeave);