summaryrefslogtreecommitdiffstats
path: root/tests/new
diff options
context:
space:
mode:
authorjhugunin <jhugunin>2002-12-30 19:18:26 +0000
committerjhugunin <jhugunin>2002-12-30 19:18:26 +0000
commit4b069263be1a381592bb521eb0211e84f37dbcfe (patch)
tree480e7b1feb551e14048bd5c2a996461846c2ec2f /tests/new
parent922a42c30dc7a8dcbf17bce1973c87fd0b46e3f3 (diff)
downloadaspectj-4b069263be1a381592bb521eb0211e84f37dbcfe.tar.gz
aspectj-4b069263be1a381592bb521eb0211e84f37dbcfe.zip
fixed to use declare dominates
Diffstat (limited to 'tests/new')
-rw-r--r--tests/new/DeclarationCollisionCE.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/new/DeclarationCollisionCE.java b/tests/new/DeclarationCollisionCE.java
index 3ad4f4f16..b9c8d7445 100644
--- a/tests/new/DeclarationCollisionCE.java
+++ b/tests/new/DeclarationCollisionCE.java
@@ -10,21 +10,21 @@ public class DeclarationCollisionCE {
class C {}
// bug: dominates clause prevents collision error
-abstract aspect AA dominates B {
+abstract aspect AA { declare dominates: AA, B;
// same result if this line is uncommented
//public String C.title() { return "[AA] C.title()"; }
}
aspect A extends AA { // implicitly dominates AA
// dominates AA's declaration, overriding Super.title
- public String C.title() { // CE 21 collision with B declaration
+ public String C.title() { // CE 20 collision with B declaration
return "[A] C.title()" ;
}
}
aspect B extends AA { // explicitly dominated by AA ?? --> and hence by A??
// B fails to dominate AA's declaration, overriding Super.title
- public String C.title() { // CE 28 collision with A declaration
+ public String C.title() { // CE 27 collision with A declaration
return "[B] C.title()" ;
}
}