Sfoglia il codice sorgente

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

tags/V1_5_0M2
aclement 19 anni fa
parent
commit
79129daa01
1 ha cambiato i file con 5 aggiunte e 0 eliminazioni
  1. 5
    0
      weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java

+ 5
- 0
weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java Vedi File

@@ -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

Loading…
Annulla
Salva