summaryrefslogtreecommitdiffstats
path: root/weaver
diff options
context:
space:
mode:
authoraclement <aclement>2005-04-19 12:22:36 +0000
committeraclement <aclement>2005-04-19 12:22:36 +0000
commit32a4dbb9b3d436da05dc1d06aaf203a32208c83e (patch)
tree762d2ae4a77604862fc97cb438e8eea7b542e58c /weaver
parent609431e58dcf9200c50d3565cfc40cfde25d70eb (diff)
downloadaspectj-32a4dbb9b3d436da05dc1d06aaf203a32208c83e.tar.gz
aspectj-32a4dbb9b3d436da05dc1d06aaf203a32208c83e.zip
from branch: processes @AJ stuff on a method
Diffstat (limited to 'weaver')
-rw-r--r--weaver/src/org/aspectj/weaver/bcel/BcelMethod.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelMethod.java b/weaver/src/org/aspectj/weaver/bcel/BcelMethod.java
index 6f8c782c9..7de8b3735 100644
--- a/weaver/src/org/aspectj/weaver/bcel/BcelMethod.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelMethod.java
@@ -33,6 +33,7 @@ import org.aspectj.weaver.ResolvedTypeX;
import org.aspectj.weaver.ShadowMunger;
import org.aspectj.weaver.TypeX;
import org.aspectj.weaver.World;
+import org.aspectj.weaver.ataspectj.Aj5Attributes;
final class BcelMethod extends ResolvedMember {
@@ -95,7 +96,9 @@ final class BcelMethod extends ResolvedMember {
}
private void unpackAjAttributes(World world) {
- List as = BcelAttributes.readAjAttributes(getDeclaringType().getClassName(),method.getAttributes(), getSourceContext(world),world.getMessageHandler());
+ List as = BcelAttributes.readAjAttributes(getDeclaringType().getClassName(),method.getAttributes(), getSourceContext(world),world.getMessageHandler());
+ as.addAll(Aj5Attributes.readAj5MethodAttributes(method, world.resolve(getDeclaringType()), getSourceContext(world), world.getMessageHandler()));
+
//System.out.println("unpack: " + this + ", " + as);
for (Iterator iter = as.iterator(); iter.hasNext();) {
AjAttribute a = (AjAttribute) iter.next();