summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Clement <aclement@gopivotal.com>2014-06-19 16:55:49 -0700
committerAndy Clement <aclement@gopivotal.com>2014-06-19 16:55:49 -0700
commitf19d0c99af300388a4d01437f53dc168bb9307eb (patch)
treead6bbcd9569f1c1ab602a055c914cc5178d421c2
parentf0d71519f53ee5bde96393c7cb61bd26fedf1855 (diff)
downloadaspectj-f19d0c99af300388a4d01437f53dc168bb9307eb.tar.gz
aspectj-f19d0c99af300388a4d01437f53dc168bb9307eb.zip
433351: second part of the fix: cope with PTBs for parent weaving
-rw-r--r--org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java3
1 files changed, 3 insertions, 0 deletions
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 22e8fdf0d..e296c7438 100644
--- 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
@@ -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);