Major changes in order to move to Eclipse-JDT 2.1 as a base.

In the process of this many changes were made to try to make
keeping up with the Eclipse-JDT code base as easy as possible in
the future.

4 files changed, 13 insertions, 10 deletions

diff --git a/tests/ajcTests.xml b/tests/ajcTests.xml
index 2f591fff5..28550b0cf 100644
--- a/tests/ajcTests.xml
+++ b/tests/ajcTests.xml
@@ -1632,7 +1632,7 @@
     <ajc-test dir="errors" pr="280" title="no return statement in around advice"
       keywords="from-errors,new-messages-vary">
         <compile files="NoReturnStatement.java">
-            <message kind="error" line="15"/>
+            <message kind="error" line="14"/>
         </compile>
     </ajc-test>
 
@@ -2188,7 +2188,7 @@
       title="javac correct compiler error if there is no return in around returning result"
       keywords="from-errors">
         <compile files="NoReturnInProceed.java">
-            <message kind="error" line="17"/>
+            <message kind="error" line="16"/>
         </compile>
     </ajc-test>
 
diff --git a/tests/bugs/ConvertToUnchecked.java b/tests/bugs/ConvertToUnchecked.java
index 2c7eb6c42..eb71e9f7b 100644
--- a/tests/bugs/ConvertToUnchecked.java
+++ b/tests/bugs/ConvertToUnchecked.java
@@ -27,8 +27,9 @@ public aspect ConvertToUnchecked {
 
 class PersistenceException extends RuntimeException 
 {
+	Throwable cause;
   public PersistenceException(Throwable cause) {
-    super(cause);
+    this.cause = cause;
   }
 }
 
diff --git a/tests/jimTests.xml b/tests/jimTests.xml
index a0ad71ec7..ea5a82516 100644
--- a/tests/jimTests.xml
+++ b/tests/jimTests.xml
@@ -1,8 +1,10 @@
 <!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd">
-<suite>
-
-
-
+<suite>    
+    <ajc-test dir="new" title="new around construct"
+      keywords="from-resolved_10x">
+        <compile files="AroundAdvice.java"/>
+        <run class="AroundAdvice"/>
+    </ajc-test>
     <!--
     
     <ajc-test dir="new" pr="885"
diff --git a/tests/new/SourceLocationWithinExpr.java b/tests/new/SourceLocationWithinExpr.java
index 3567fc57e..797fc430e 100644
--- a/tests/new/SourceLocationWithinExpr.java
+++ b/tests/new/SourceLocationWithinExpr.java
@@ -6,8 +6,8 @@ import org.aspectj.lang.reflect.*;
 /** @testcase PR#885 call source locations within expression */
 public class SourceLocationWithinExpr {
     public static void main (String[] args) {
-        new                  // 9
-            C()              // 10*
+        new                  // 9*
+            C()              // 10
             .                // 11
             getD()           // 12*
             .                // 13
@@ -28,7 +28,7 @@ aspect A {
     private static final String SEP = " - ";
     static {
         // using qualifying expr?
-        Tester.expectEvent("C()" + SEP + "10");
+        Tester.expectEvent("C()" + SEP + "9");
         Tester.expectEvent("getD()" + SEP + "12");
         Tester.expectEvent("getE()" + SEP + "14");
         Tester.expectEvent("getF()" + SEP + "16");