move to Eclipse 3.0 M6 JDT core (v_396). Also makes 1.4 the

default mode (inherited behaviour from JDT).

9 files changed, 23 insertions, 28 deletions

diff --git a/tests/errors/BadIntroduction.java b/tests/errors/BadIntroduction.java
index b4bdf5740..7939f702d 100644
--- a/tests/errors/BadIntroduction.java
+++ b/tests/errors/BadIntroduction.java
@@ -1,5 +1,7 @@
 import org.aspectj.testing.Tester;
 
+introduction (String) {}
+
 public class BadIntroduction {        
     public static void main(String[] args) {        
         String s;
@@ -7,5 +9,4 @@ public class BadIntroduction {
     }
 }
 
-introduction (String) {
-}
+
diff --git a/tests/errors/BadIntroductionDesignator.java b/tests/errors/BadIntroductionDesignator.java
index 9b97d4aae..ecd8fba57 100644
--- a/tests/errors/BadIntroductionDesignator.java
+++ b/tests/errors/BadIntroductionDesignator.java
@@ -2,10 +2,8 @@ package errors;
 
 // PR#129
 
-public class BadIntroductionDesignator {
-	introduction (M||) {
-		public boolean m_foo;
-	}
+public aspect BadIntroductionDesignator {
+	public boolean (M||).m_foo;
 }
 
 class M {}
diff --git a/tests/errors/ExtraClosingBrace.java b/tests/errors/ExtraClosingBrace.java
index 0a46739af..c0991be40 100644
--- a/tests/errors/ExtraClosingBrace.java
+++ b/tests/errors/ExtraClosingBrace.java
@@ -5,6 +5,4 @@ package errors;
 public aspect ExtraClosingBrace {
     public void doIt() {
         
-    }}
-}
-}
+    }}}}
diff --git a/tests/errors/NoAspect.java b/tests/errors/NoAspect.java
index c735fd27a..14099bd6a 100644
--- a/tests/errors/NoAspect.java
+++ b/tests/errors/NoAspect.java
@@ -7,8 +7,7 @@ public class NoAspect {
     }
 }
 
-class A {
-    static pointcut p(): target(*) && call(* go(..));
-    before(): p() {
-    }
+
+class A 
+{    before(): target(*) && call(* go(..)) {}
 }
diff --git a/tests/errors/NoSource.java b/tests/errors/NoSource.java
index 31549fd77..6a7c52281 100644
--- a/tests/errors/NoSource.java
+++ b/tests/errors/NoSource.java
@@ -1,7 +1,5 @@
 import org.aspectj.testing.Tester;
 
 class NoSource {
-    introduction String {
-        public void foo() {}
-    }
+        public void String.foo() {}
 }
diff --git a/tests/errors/TopLevelAfter.java b/tests/errors/TopLevelAfter.java
index 7db612660..b8186446a 100644
--- a/tests/errors/TopLevelAfter.java
+++ b/tests/errors/TopLevelAfter.java
@@ -1,9 +1,10 @@
 import org.aspectj.testing.Tester;
 
+after(): call(void main(..)) {} // CE 3
+
 public class TopLevelAfter {
     public static void main(String[] args) {
         Tester.check(false, "should not have compiled");
     }
 }
 
-after(): {}
diff --git a/tests/errors/TopLevelAround.java b/tests/errors/TopLevelAround.java
index 52beae80e..89e99cfd2 100644
--- a/tests/errors/TopLevelAround.java
+++ b/tests/errors/TopLevelAround.java
@@ -1,9 +1,10 @@
 import org.aspectj.testing.Tester;
 
-public class TopLevelAround {
+void around(): call(void main(..)) {} // CE 3
+
+public aspect TopLevelAround {
     public static void main(String[] args) {
         Tester.check(false, "should not have compiled");
     }
 }
 
-around(): {} // CE 9
diff --git a/tests/errors/TopLevelBefore.java b/tests/errors/TopLevelBefore.java
index 4341e6941..8fdca0a0c 100644
--- a/tests/errors/TopLevelBefore.java
+++ b/tests/errors/TopLevelBefore.java
@@ -1,9 +1,9 @@
 import org.aspectj.testing.Tester;
 
+before(): call(void main(..)) {} // CE 3
+
 public class TopLevelBefore {
     public static void main(String[] args) {
         Tester.check(false, "should not have compiled");
     }
 }
-
-before(): {}
diff --git a/tests/errors/WildcardForReturns.java b/tests/errors/WildcardForReturns.java
index e330b474f..2235c3cbc 100644
--- a/tests/errors/WildcardForReturns.java
+++ b/tests/errors/WildcardForReturns.java
@@ -11,11 +11,10 @@ public class WildcardForReturns {
         new WildcardForReturns().m(); 
     }
     
-    public void m() { } 
-
-    static aspect A {
-       * around (WildcardForReturns t): this(t) && call(* m()) {  // CE 17
-    	    // bad test - return null; //return proceed(t);
-	   }
-    }
+    public void m() { }
+}
+aspect A {
+   * around (WildcardForReturns t): this(t) && call(* m()) {  // CE 17
+    	// bad test - return null; //return proceed(t);
+   }
 }