From: aclement <aclement>
Date: Sat, 31 Oct 2009 16:59:25 +0000 (+0000)
Subject: pass concreteAspect when building advice object
X-Git-Tag: V1_6_7~196
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c3c673bbb4b3b59d922b2371e450575863861d77;p=aspectj.git

pass concreteAspect when building advice object
---

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/World.java b/org.aspectj.matcher/src/org/aspectj/weaver/World.java
index b033adec4..b2d88683b 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/World.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/World.java
@@ -37,7 +37,9 @@ import org.aspectj.bridge.context.PinpointingMessageHandler;
 import org.aspectj.util.IStructureModel;
 import org.aspectj.weaver.UnresolvedType.TypeKind;
 import org.aspectj.weaver.patterns.DeclareAnnotation;
+import org.aspectj.weaver.patterns.DeclareParents;
 import org.aspectj.weaver.patterns.DeclarePrecedence;
+import org.aspectj.weaver.patterns.DeclareSoft;
 import org.aspectj.weaver.patterns.Pointcut;
 import org.aspectj.weaver.patterns.TypePattern;
 import org.aspectj.weaver.tools.PointcutDesignatorHandler;
@@ -582,10 +584,10 @@ public abstract class World implements Dump.INode {
 	 * Create an advice shadow munger for the given advice kind
 	 */
 	public final Advice createAdviceMunger(AdviceKind kind, Pointcut p, Member signature, int extraParameterFlags,
-			IHasSourceLocation loc) {
+			IHasSourceLocation loc, ResolvedType declaringAspect) {
 		AjAttribute.AdviceAttribute attribute = new AjAttribute.AdviceAttribute(kind, p, extraParameterFlags, loc.getStart(), loc
 				.getEnd(), loc.getSourceContext());
-		return getWeavingSupport().createAdviceMunger(attribute, p, signature);
+		return getWeavingSupport().createAdviceMunger(attribute, p, signature, declaringAspect);
 	}
 
 	/**
@@ -658,15 +660,15 @@ public abstract class World implements Dump.INode {
 		return typeVariableLookupScope;
 	}
 
-	public List getDeclareParents() {
+	public List<DeclareParents> getDeclareParents() {
 		return crosscuttingMembersSet.getDeclareParents();
 	}
 
-	public List getDeclareAnnotationOnTypes() {
+	public List<DeclareAnnotation> getDeclareAnnotationOnTypes() {
 		return crosscuttingMembersSet.getDeclareAnnotationOnTypes();
 	}
 
-	public List getDeclareAnnotationOnFields() {
+	public List<DeclareAnnotation> getDeclareAnnotationOnFields() {
 		return crosscuttingMembersSet.getDeclareAnnotationOnFields();
 	}
 
@@ -674,7 +676,7 @@ public abstract class World implements Dump.INode {
 		return crosscuttingMembersSet.getDeclareAnnotationOnMethods();
 	}
 
-	public List getDeclareSoft() {
+	public List<DeclareSoft> getDeclareSoft() {
 		return crosscuttingMembersSet.getDeclareSofts();
 	}
 
@@ -1293,7 +1295,6 @@ public abstract class World implements Dump.INode {
 
 				s = p.getProperty(xsetOVERWEAVING, "false");
 				if (s.equalsIgnoreCase("true")) {
-					System.out.println("overWeaving switched ON");
 					overWeaving = true;
 				}