From 9da1832d911c85b32c67391871db3b4943b4e599 Mon Sep 17 00:00:00 2001
From: jhugunin <jhugunin>
Date: Wed, 18 Dec 2002 00:56:19 +0000
Subject: [PATCH] updated for correct privileged rules that import is not
 inside the scope of privileged aspect so it can't see package-visible types

---
 tests/new/privilegedAspects/fish/B.java            |  9 ++++-----
 tests/new/privilegedAspects/fish/PrivateClass.java |  9 ++++-----
 tests/new/privilegedAspects/fowl/C.java            | 13 ++++++-------
 tests/new/privilegedAspects/fowl/D.java            |  9 ++++-----
 4 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/tests/new/privilegedAspects/fish/B.java b/tests/new/privilegedAspects/fish/B.java
index d56aef758..78bbb57dd 100644
--- a/tests/new/privilegedAspects/fish/B.java
+++ b/tests/new/privilegedAspects/fish/B.java
@@ -1,5 +1,4 @@
 package fish;
-import main.Main;
 
 privileged aspect B {
     private static String privateStatic = "B's private";
@@ -7,8 +6,8 @@ privileged aspect B {
     //introduction PrivateClass {
     public void PrivateClass.fooB() {
         b--;
-        Main.doThang("B: " + b);
-        Main.doThang("B: " + b());
+        main.Main.doThang("B: " + b);
+        main.Main.doThang("B: " + b());
 
 	System.out.println(privateStatic + "::" + FooC.privateStatic);
     }
@@ -17,8 +16,8 @@ privileged aspect B {
     
     before(PrivateClass obj): call(void PrivateClass.goo()) && target(obj) {
 	obj.b--;
-	Main.doThang("B: " + obj.b);
-	Main.doThang("B: " + obj.b());
+	main.Main.doThang("B: " + obj.b);
+	main.Main.doThang("B: " + obj.b());
     }
 }
 
diff --git a/tests/new/privilegedAspects/fish/PrivateClass.java b/tests/new/privilegedAspects/fish/PrivateClass.java
index f02941036..a5b0593a6 100644
--- a/tests/new/privilegedAspects/fish/PrivateClass.java
+++ b/tests/new/privilegedAspects/fish/PrivateClass.java
@@ -1,5 +1,4 @@
 package fish;
-import main.Main;
 
 public class PrivateClass {
     private int a = 999;
@@ -18,14 +17,14 @@ privileged aspect A {
     
     public void PrivateClass.fooA() {
         a--;
-        Main.doThang("A: " + a);
-        Main.doThang("A: " + a());
+        main.Main.doThang("A: " + a);
+        main.Main.doThang("A: " + a());
     }
     
     before(PrivateClass obj): call(void PrivateClass.goo()) && target(obj) {
 	obj.a--;
-	Main.doThang("A: " + obj.a);
-	Main.doThang("A: " + obj.a());
+	main.Main.doThang("A: " + obj.a);
+	main.Main.doThang("A: " + obj.a());
     }
 }
 
diff --git a/tests/new/privilegedAspects/fowl/C.java b/tests/new/privilegedAspects/fowl/C.java
index bc227f85f..9b5ca99d2 100644
--- a/tests/new/privilegedAspects/fowl/C.java
+++ b/tests/new/privilegedAspects/fowl/C.java
@@ -1,18 +1,17 @@
 package fowl;
-import fish.PrivateClass;
-import main.Main;
+import fish.*;
 
 privileged aspect C {
     
-    public void PrivateClass.fooC() {
+    public void fish.PrivateClass.fooC() {
         c--;
-        Main.doThang("C: " + c);
-        Main.doThang("C: " + c());
+        main.Main.doThang("C: " + c);
+        main.Main.doThang("C: " + c());
     }
     
     before(PrivateClass obj): call(void PrivateClass.goo()) && target(obj) {
 	obj.c--;
-	Main.doThang("C: " + obj.c);
-	Main.doThang("C: " + obj.c());
+	main.Main.doThang("C: " + obj.c);
+	main.Main.doThang("C: " + obj.c());
     }
 }
diff --git a/tests/new/privilegedAspects/fowl/D.java b/tests/new/privilegedAspects/fowl/D.java
index 4b36d2fe8..b2bc9fd43 100644
--- a/tests/new/privilegedAspects/fowl/D.java
+++ b/tests/new/privilegedAspects/fowl/D.java
@@ -1,17 +1,16 @@
 package fowl;
-import main.Main;
 
 privileged aspect D {
 
     public void fish.PrivateClass.fooD() {
         d--;
-        Main.doThang("D: " + d);
-        Main.doThang("D: " + d());
+        main.Main.doThang("D: " + d);
+        main.Main.doThang("D: " + d());
     }
     
     before(fish.PrivateClass obj): call(void fish.PrivateClass.goo()) && target(obj) {
 	obj.d--;
-	Main.doThang("D: " + obj.d);
-	Main.doThang("D: " + obj.d());
+	main.Main.doThang("D: " + obj.d);
+	main.Main.doThang("D: " + obj.d());
     }
 }
-- 
2.39.5