temporary fix to ensure we see relationships for dec @type when incrementally compiling

diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java b/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java
index 67cce4ce743553363c15ea647c2844b895699b4c..1caa54574ebc43cf4a327bd8a33b2e8cb0b099e7 100644 (file)
--- a/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java
@@ -55,6 +55,7 @@ import org.aspectj.util.FuzzyBoolean;
 import org.aspectj.weaver.Advice;
 import org.aspectj.weaver.AnnotationOnTypeMunger;
 import org.aspectj.weaver.AnnotationX;
+import org.aspectj.weaver.AsmRelationshipProvider;
 import org.aspectj.weaver.ConcreteTypeMunger;
 import org.aspectj.weaver.CrosscuttingMembersSet;
 import org.aspectj.weaver.IClassFileProvider;
@@ -1107,6 +1108,10 @@ public class BcelWeaver implements IWeaver {
        private boolean applyDeclareAtType(DeclareAnnotation decA, ResolvedTypeX onType,boolean reportProblems) {
                boolean didSomething = false;
                if (decA.matches(onType)) {
+                       
+                       //FIXME asc CRITICAL this should be guarded by the 'already has annotation' check below but isn't since the compiler is producing classfiles with deca affected things in...
+                       AsmRelationshipProvider.getDefault().addDeclareAnnotationRelationship(decA.getSourceLocation(),onType.getSourceLocation());
+                       
                    if (onType.hasAnnotation(decA.getAnnotationX().getSignature())) {
 // FIXME asc Could put out a lint here for an already annotated type - the problem is that it may have
 // picked up the annotation during 'source weaving' in which case the message is misleading.  Leaving it