annotation removal program element support

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java
index 6a5884dbcc590817731899beee4a22296b48aabd..cc1c3e3e2a69341b580c3f7b59b1b69576e39261 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java
@@ -547,7 +547,8 @@ public class AsmHierarchyBuilder extends ASTVisitor {
                                peNode.setParentTypes(parents);
                        }
                        if (decl instanceof DeclareAnnotation) {
-                               ResolvedType annotationType = ((DeclareAnnotation) decl).getAnnotationType();
+                               DeclareAnnotation da = (DeclareAnnotation) decl;
+                               ResolvedType annotationType = da.getAnnotationType();
                                if (annotationType == null) {
                                        String s = ((DeclareAnnotation) decl).getAnnotationString();
                                        if (s != null && s.length() > 0) {
@@ -557,6 +558,9 @@ public class AsmHierarchyBuilder extends ASTVisitor {
                                } else {
                                        peNode.setAnnotationType(annotationType.getName());
                                }
+                               if (da.isRemover()) {
+                                       peNode.setAnnotationRemover(true);
+                               }
                        }
                }
                if (methodDeclaration.returnType != null) {