From a5fb21459045ea1ed295c21836672eecf2ca0242 Mon Sep 17 00:00:00 2001
From: jhugunin <jhugunin>
Date: Tue, 14 Jan 2003 17:33:36 +0000
Subject: renamed "declare dominates" to "declare precedence"

---
 tests/new/AdviceOrdering.java         | 16 ++++++++--------
 tests/new/Counting1.java              |  2 +-
 tests/new/DeclarationCollisionCE.java |  2 +-
 tests/new/DominatesTypePattern.java   |  2 +-
 tests/new/DominatesTypePatternCE.java |  2 +-
 tests/new/MultiDispatchCp.java        |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'tests/new')

diff --git a/tests/new/AdviceOrdering.java b/tests/new/AdviceOrdering.java
index a67dc57c6..a5f4103c6 100644
--- a/tests/new/AdviceOrdering.java
+++ b/tests/new/AdviceOrdering.java
@@ -84,21 +84,21 @@ aspect FlowCheck {
 
 // This cluster of aspects checks that the partial order rules work
 //aspect A1 dominates A2, B1 {
-aspect A1 { declare dominates: A1, A2 || B1;
+aspect A1 { declare precedence: A1, A2 || B1;
     pointcut cut() : target(C) && call(void a());
 
     before(): A1.cut() { T.add("A1"); }
 }
 
-aspect A2 { declare dominates: A2, B1;
+aspect A2 { declare precedence: A2, B1;
     before(): A1.cut() { T.add("A2"); }
 }
 
-aspect A3 { declare dominates: A3,  A4, A1;
+aspect A3 { declare precedence: A3,  A4, A1;
     before(): A1.cut() { T.add("A3"); }
 }
 
-aspect A4 { declare dominates: A4, A1;
+aspect A4 { declare precedence: A4, A1;
     before(): A1.cut() { T.add("A4"); }
 }
 
@@ -109,17 +109,17 @@ aspect B1 {
 
 
 //aspect C1 dominates C2, C3 {
-aspect C1 { declare dominates: C1, C2 || C3;
+aspect C1 { declare precedence: C1, C2 || C3;
     before(): A1.cut() { T.add("C1"); }
 }
-aspect C2 { declare dominates: C2, C3;
+aspect C2 { declare precedence: C2, C3;
     before(): A1.cut() { T.add("C2"); }
 }
-aspect C3 { declare dominates: C3, C4;
+aspect C3 { declare precedence: C3, C4;
     before(): A1.cut() { T.add("C3"); }
 }
 //aspect C4 dominates A1, A2, A3, A4, B1 {
-aspect C4 { declare dominates: C4, (A1 || A2 || A3 || A4 || B1);
+aspect C4 { declare precedence: C4, (A1 || A2 || A3 || A4 || B1);
     before(): A1.cut() { T.add("C4"); }
 }
 
diff --git a/tests/new/Counting1.java b/tests/new/Counting1.java
index 6027409e2..62cb32528 100644
--- a/tests/new/Counting1.java
+++ b/tests/new/Counting1.java
@@ -142,7 +142,7 @@ aspect MoveTracking {
    }
  }
 
-aspect Mobility { declare dominates: Mobility, MoveTracking;
+aspect Mobility { declare precedence: Mobility, MoveTracking;
 	
     private static boolean enableMoves = true;
     
diff --git a/tests/new/DeclarationCollisionCE.java b/tests/new/DeclarationCollisionCE.java
index b9c8d7445..452eb377c 100644
--- a/tests/new/DeclarationCollisionCE.java
+++ b/tests/new/DeclarationCollisionCE.java
@@ -10,7 +10,7 @@ public class DeclarationCollisionCE {
 class C {}
 
 // bug: dominates clause prevents collision error
-abstract aspect AA { declare dominates: AA, B; 
+abstract aspect AA { declare precedence: AA, B; 
     // same result if this line is uncommented
     //public String C.title() { return "[AA] C.title()"; }
 }
diff --git a/tests/new/DominatesTypePattern.java b/tests/new/DominatesTypePattern.java
index 1409241fb..9edc5d5ea 100644
--- a/tests/new/DominatesTypePattern.java
+++ b/tests/new/DominatesTypePattern.java
@@ -12,7 +12,7 @@ public class DominatesTypePattern {
 class C {}
 
 // works if A is specified explicitly
-abstract aspect AA { declare dominates: AA, (AA+ && !AA); // error: should dominate A
+abstract aspect AA { declare precedence: AA, (AA+ && !AA); // error: should dominate A
     public String C.method() { return "pass"; }
 }
 
diff --git a/tests/new/DominatesTypePatternCE.java b/tests/new/DominatesTypePatternCE.java
index a9787394d..962a9ed04 100644
--- a/tests/new/DominatesTypePatternCE.java
+++ b/tests/new/DominatesTypePatternCE.java
@@ -12,7 +12,7 @@ public class DominatesTypePatternCE {
 class C {}
 
 // works if A is specified explicitly
-abstract aspect AA { declare dominates: AA, AA+; // CE, AA is matched by both pieces
+abstract aspect AA { declare precedence: AA, AA+; // CE, AA is matched by both pieces
     public String C.method() { return "pass"; }
 }
 
diff --git a/tests/new/MultiDispatchCp.java b/tests/new/MultiDispatchCp.java
index a373bab55..fa7330601 100644
--- a/tests/new/MultiDispatchCp.java
+++ b/tests/new/MultiDispatchCp.java
@@ -68,7 +68,7 @@ aspect MultiCall extends Multi {
 
 // dominates should have no effect as call join points
 // always come before executions
-aspect MultiExec extends Multi { declare dominates: MultiExec, MultiCall;
+aspect MultiExec extends Multi { declare precedence: MultiExec, MultiCall;
     public static boolean enabled = false;
 
     String getPrefix() { return "exec"; }
-- 
cgit v1.2.3