diff options
Diffstat (limited to 'tests/java5/generics/genericaspects/GenericAspectY.aj')
| -rw-r--r-- | tests/java5/generics/genericaspects/GenericAspectY.aj | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/tests/java5/generics/genericaspects/GenericAspectY.aj b/tests/java5/generics/genericaspects/GenericAspectY.aj index 327d434eb..b677c3f10 100644 --- a/tests/java5/generics/genericaspects/GenericAspectY.aj +++ b/tests/java5/generics/genericaspects/GenericAspectY.aj @@ -76,27 +76,29 @@ import org.aspectj.lang.annotation.*; parent.addChild(this); } - /** - * Matches at an addChild join point for the parent type P and child type C - */ - public pointcut addingChild(Parent p, Child c) : - execution(* Parent.addChild(Child)) && this(p) && args(c); - - // Something a little more simple... - public pointcut addingChild2(Parent p): execution(* Parent.addChild(Child)) && this(p); + // Try something simple ... when this works then look at uncommenting the two below and the two related advice + // in the sub aspect + public pointcut addingChildSimple(Parent p): execution(* Parent.addChild(Child)) && this(p); + + /** + * Matches at an addChild join point for the parent type P and child type C + */ +// public pointcut addingChild(Parent p, Child c) : +// execution(* Parent.addChild(Child)) && this(p) && args(c); + /** * Matches at a removeChild join point for the parent type P and child type C */ - public pointcut removingChild(Parent p, Child c) : - execution(* Parent.removeChild(Child)) && this(p) && args(c); +// public pointcut removingChild(Parent p, Child c) : +// execution(* Parent.removeChild(Child)) && this(p) && args(c); } aspect GenericAspectX extends ParentChildRelationship<Top,Bottom> { // Advice to trigger weave infos - before(Top p): ParentChildRelationship.addingChild2(p) {} + before(Top p): ParentChildRelationship.addingChildSimple(p) {} // before(Top p,Bottom c): ParentChildRelationship.addingChild(p,c) {} // before(Top p,Bottom c): ParentChildRelationship.removingChild(p,c) {} |