Hopefully fixes disappearance of decsofts in AJDT. The addition of the offset to...

diff --git a/weaver/src/org/aspectj/weaver/Advice.java b/weaver/src/org/aspectj/weaver/Advice.java
index bafbb3ef587b974a6418bf9cfc3169486b782605..1c8c92b98be946a9efebf03b58a9d7bf570caf9a 100644 (file)
--- a/weaver/src/org/aspectj/weaver/Advice.java
+++ b/weaver/src/org/aspectj/weaver/Advice.java
@@ -17,6 +17,7 @@ import java.util.Collections;
 import java.util.List;
 
 import org.aspectj.bridge.IMessage;
+import org.aspectj.bridge.ISourceLocation;
 import org.aspectj.weaver.patterns.AndPointcut;
 import org.aspectj.weaver.patterns.PerClause;
 import org.aspectj.weaver.patterns.Pointcut;
@@ -67,9 +68,8 @@ public abstract class Advice extends ShadowMunger {
        return ret;
     }
     
-    public static Advice makeSoftener(World world, Pointcut entry, TypePattern exceptionType,ResolvedTypeX inAspect) {
-       Advice ret = world.concreteAdvice(AdviceKind.Softener,
-             entry, null, 0, entry);  
+    public static Advice makeSoftener(World world, Pointcut entry, TypePattern exceptionType,ResolvedTypeX inAspect,IHasSourceLocation loc) {
+       Advice ret = world.concreteAdvice(AdviceKind.Softener, entry, null, 0, loc);  
   
        ret.exceptionType = exceptionType;
        ret.concreteAspect = inAspect;

diff --git a/weaver/src/org/aspectj/weaver/CrosscuttingMembers.java b/weaver/src/org/aspectj/weaver/CrosscuttingMembers.java
index 62ba6041250ca8985faf568cd31b6d21a4ff073e..0685ef0bea070cda8bafe8322339b0d66aedfab0 100644 (file)
--- a/weaver/src/org/aspectj/weaver/CrosscuttingMembers.java
+++ b/weaver/src/org/aspectj/weaver/CrosscuttingMembers.java
@@ -109,7 +109,7 @@ public class CrosscuttingMembers {
                } else if (declare instanceof DeclareSoft) {
                        DeclareSoft d = (DeclareSoft)declare;
                        // Ordered so that during concretization we can check the related munger
-                       ShadowMunger m = Advice.makeSoftener(world, d.getPointcut(), d.getException(),inAspect);
+                       ShadowMunger m = Advice.makeSoftener(world, d.getPointcut(), d.getException(),inAspect,d);
                        Pointcut concretePointcut = d.getPointcut().concretize(inAspect, 0,m);
                        m.pointcut = concretePointcut;
                        declareSofts.add(new DeclareSoft(d.getException(), concretePointcut));