reflects the 1.1 change that field-set join points have a void return type

diff --git a/tests/new/NullPointerOnGets.java b/tests/new/NullPointerOnGets.java
index e4856db731e5b8ec0162447b994c9099130cb6e2..961c2457748b3dce21f84ddd95723559a5ee1d07 100644 (file)
--- a/tests/new/NullPointerOnGets.java
+++ b/tests/new/NullPointerOnGets.java
@@ -153,46 +153,46 @@ aspect StringAspect {
     //end-befores
     
     //arounds
-    String around(): gets_String_str0() { a("a gets_String_str0"); return proceed(); }
-    String around(): gets_String_str1() { a("a gets_String_str1"); return proceed(); }
-    String around(): gets_String_str2() { a("a gets_String_str2"); return proceed(); }
-    String around(): gets_String_str3() { a("a gets_String_str3"); return proceed(); }
-    String around(): gets_String_str0b() { a("a gets_String_str0b"); return proceed(); }
-    String around(): gets_String_str1b() { a("a gets_String_str1b"); return proceed(); }
-    String around(): gets_String_str2b() { a("a gets_String_str2b"); return proceed(); }
-    String around(): gets_String_str3b() { a("a gets_String_str3b"); return proceed(); }
-    String around(): sets_String_str0() { a("a sets_String_str0"); return proceed(); }
-    String around(): sets_String_str1() { a("a sets_String_str1"); return proceed(); }
-    String around(): sets_String_str2() { a("a sets_String_str2"); return proceed(); }
-    String around(): sets_String_str3() { a("a sets_String_str3"); return proceed(); }
-    String around(): sets_String_str0b() { a("a sets_String_str0b"); return proceed(); }
-    String around(): sets_String_str1b() { a("a sets_String_str1b"); return proceed(); }
-    String around(): sets_String_str2b() { a("a sets_String_str2b"); return proceed(); }
-    String around(): sets_String_str3b() { a("a sets_String_str3b"); return proceed(); }
-    String around(): sets_String_str0c() { a("a sets_String_str0c"); return proceed(); }
-    String around(): sets_String_str1c() { a("a sets_String_str1c"); return proceed(); }
-    String around(): sets_String_str2c() { a("a sets_String_str2c"); return proceed(); }
-    String around(): sets_String_str3c() { a("a sets_String_str3c"); return proceed(); }
-    String around(): gets_String_sstr0() { a("a gets_String_sstr0"); return proceed(); }
-    String around(): gets_String_sstr1() { a("a gets_String_sstr1"); return proceed(); }
-    String around(): gets_String_sstr2() { a("a gets_String_sstr2"); return proceed(); }
-    String around(): gets_String_sstr3() { a("a gets_String_sstr3"); return proceed(); }
-    String around(): gets_String_sstr0b() { a("a gets_String_sstr0b"); return proceed(); }
-    String around(): gets_String_sstr1b() { a("a gets_String_sstr1b"); return proceed(); }
-    String around(): gets_String_sstr2b() { a("a gets_String_sstr2b"); return proceed(); }
-    String around(): gets_String_sstr3b() { a("a gets_String_sstr3b"); return proceed(); }
-    String around(): sets_String_sstr0() { a("a sets_String_sstr0"); return proceed(); }
-    String around(): sets_String_sstr1() { a("a sets_String_sstr1"); return proceed(); }
-    String around(): sets_String_sstr2() { a("a sets_String_sstr2"); return proceed(); }
-    String around(): sets_String_sstr3() { a("a sets_String_sstr3"); return proceed(); }
-    String around(): sets_String_sstr0b() { a("a sets_String_sstr0b"); return proceed(); }
-    String around(): sets_String_sstr1b() { a("a sets_String_sstr1b"); return proceed(); }
-    String around(): sets_String_sstr2b() { a("a sets_String_sstr2b"); return proceed(); }
-    String around(): sets_String_sstr3b() { a("a sets_String_sstr3b"); return proceed(); }
-    String around(): sets_String_sstr0c() { a("a sets_String_sstr0c"); return proceed(); }
-    String around(): sets_String_sstr1c() { a("a sets_String_sstr1c"); return proceed(); }
-    String around(): sets_String_sstr2c() { a("a sets_String_sstr2c"); return proceed(); }
-    String around(): sets_String_sstr3c() { a("a sets_String_sstr3c"); return proceed(); }
+    Object around(): gets_String_str0() { a("a gets_String_str0"); return proceed(); }
+    Object around(): gets_String_str1() { a("a gets_String_str1"); return proceed(); }
+    Object around(): gets_String_str2() { a("a gets_String_str2"); return proceed(); }
+    Object around(): gets_String_str3() { a("a gets_String_str3"); return proceed(); }
+    Object around(): gets_String_str0b() { a("a gets_String_str0b"); return proceed(); }
+    Object around(): gets_String_str1b() { a("a gets_String_str1b"); return proceed(); }
+    Object around(): gets_String_str2b() { a("a gets_String_str2b"); return proceed(); }
+    Object around(): gets_String_str3b() { a("a gets_String_str3b"); return proceed(); }
+    Object around(): sets_String_str0() { a("a sets_String_str0"); return proceed(); }
+    Object around(): sets_String_str1() { a("a sets_String_str1"); return proceed(); }
+    Object around(): sets_String_str2() { a("a sets_String_str2"); return proceed(); }
+    Object around(): sets_String_str3() { a("a sets_String_str3"); return proceed(); }
+    Object around(): sets_String_str0b() { a("a sets_String_str0b"); return proceed(); }
+    Object around(): sets_String_str1b() { a("a sets_String_str1b"); return proceed(); }
+    Object around(): sets_String_str2b() { a("a sets_String_str2b"); return proceed(); }
+    Object around(): sets_String_str3b() { a("a sets_String_str3b"); return proceed(); }
+    Object around(): sets_String_str0c() { a("a sets_String_str0c"); return proceed(); }
+    Object around(): sets_String_str1c() { a("a sets_String_str1c"); return proceed(); }
+    Object around(): sets_String_str2c() { a("a sets_String_str2c"); return proceed(); }
+    Object around(): sets_String_str3c() { a("a sets_String_str3c"); return proceed(); }
+    Object around(): gets_String_sstr0() { a("a gets_String_sstr0"); return proceed(); }
+    Object around(): gets_String_sstr1() { a("a gets_String_sstr1"); return proceed(); }
+    Object around(): gets_String_sstr2() { a("a gets_String_sstr2"); return proceed(); }
+    Object around(): gets_String_sstr3() { a("a gets_String_sstr3"); return proceed(); }
+    Object around(): gets_String_sstr0b() { a("a gets_String_sstr0b"); return proceed(); }
+    Object around(): gets_String_sstr1b() { a("a gets_String_sstr1b"); return proceed(); }
+    Object around(): gets_String_sstr2b() { a("a gets_String_sstr2b"); return proceed(); }
+    Object around(): gets_String_sstr3b() { a("a gets_String_sstr3b"); return proceed(); }
+    Object around(): sets_String_sstr0() { a("a sets_String_sstr0"); return proceed(); }
+    Object around(): sets_String_sstr1() { a("a sets_String_sstr1"); return proceed(); }
+    Object around(): sets_String_sstr2() { a("a sets_String_sstr2"); return proceed(); }
+    Object around(): sets_String_sstr3() { a("a sets_String_sstr3"); return proceed(); }
+    Object around(): sets_String_sstr0b() { a("a sets_String_sstr0b"); return proceed(); }
+    Object around(): sets_String_sstr1b() { a("a sets_String_sstr1b"); return proceed(); }
+    Object around(): sets_String_sstr2b() { a("a sets_String_sstr2b"); return proceed(); }
+    Object around(): sets_String_sstr3b() { a("a sets_String_sstr3b"); return proceed(); }
+    Object around(): sets_String_sstr0c() { a("a sets_String_sstr0c"); return proceed(); }
+    Object around(): sets_String_sstr1c() { a("a sets_String_sstr1c"); return proceed(); }
+    Object around(): sets_String_sstr2c() { a("a sets_String_sstr2c"); return proceed(); }
+    Object around(): sets_String_sstr3c() { a("a sets_String_sstr3c"); return proceed(); }
     //end-arounds
     
     //afters
@@ -376,46 +376,46 @@ aspect IntAspect {
     before(): sets_int_sint3c() { a("b sets_int_sint3c"); }
     //end-befores
 
-    int around(): gets_int_int0()   { a("a gets_int_int0");   return proceed(); }
-    int around(): gets_int_int1()   { a("a gets_int_int1");   return proceed(); }
-    int around(): gets_int_int2()   { a("a gets_int_int2");   return proceed(); }
-    int around(): gets_int_int3()   { a("a gets_int_int3");   return proceed(); }
-    int around(): gets_int_int0b()  { a("a gets_int_int0b");  return proceed(); }
-    int around(): gets_int_int1b()  { a("a gets_int_int1b");  return proceed(); }
-    int around(): gets_int_int2b()  { a("a gets_int_int2b");  return proceed(); }
-    int around(): gets_int_int3b()  { a("a gets_int_int3b");  return proceed(); }
-    int around(): sets_int_int0()   { a("a sets_int_int0");   return proceed(); }
-    int around(): sets_int_int1()   { a("a sets_int_int1");   return proceed(); }
-    int around(): sets_int_int2()   { a("a sets_int_int2");   return proceed(); }
-    int around(): sets_int_int3()   { a("a sets_int_int3");   return proceed(); }
-    int around(): sets_int_int0b()  { a("a sets_int_int0b");  return proceed(); }
-    int around(): sets_int_int1b()  { a("a sets_int_int1b");  return proceed(); }
-    int around(): sets_int_int2b()  { a("a sets_int_int2b");  return proceed(); }
-    int around(): sets_int_int3b()  { a("a sets_int_int3b");  return proceed(); }
-    int around(): sets_int_int0c()  { a("a sets_int_int0c");  return proceed(); }
-    int around(): sets_int_int1c()  { a("a sets_int_int1c");  return proceed(); }
-    int around(): sets_int_int2c()  { a("a sets_int_int2c");  return proceed(); }
-    int around(): sets_int_int3c()  { a("a sets_int_int3c");  return proceed(); }
-    int around(): gets_int_sint0()  { a("a gets_int_sint0");  return proceed(); }
-    int around(): gets_int_sint1()  { a("a gets_int_sint1");  return proceed(); }
-    int around(): gets_int_sint2()  { a("a gets_int_sint2");  return proceed(); }
-    int around(): gets_int_sint3()  { a("a gets_int_sint3");  return proceed(); }
-    int around(): gets_int_sint0b() { a("a gets_int_sint0b"); return proceed(); }
-    int around(): gets_int_sint1b() { a("a gets_int_sint1b"); return proceed(); }
-    int around(): gets_int_sint2b() { a("a gets_int_sint2b"); return proceed(); }
-    int around(): gets_int_sint3b() { a("a gets_int_sint3b"); return proceed(); }
-    int around(): sets_int_sint0()  { a("a sets_int_sint0");  return proceed(); }
-    int around(): sets_int_sint1()  { a("a sets_int_sint1");  return proceed(); }
-    int around(): sets_int_sint2()  { a("a sets_int_sint2");  return proceed(); }
-    int around(): sets_int_sint3()  { a("a sets_int_sint3");  return proceed(); }
-    int around(): sets_int_sint0b() { a("a sets_int_sint0b"); return proceed(); }
-    int around(): sets_int_sint1b() { a("a sets_int_sint1b"); return proceed(); }
-    int around(): sets_int_sint2b() { a("a sets_int_sint2b"); return proceed(); }
-    int around(): sets_int_sint3b() { a("a sets_int_sint3b"); return proceed(); }
-    int around(): sets_int_sint0c() { a("a sets_int_sint0c"); return proceed(); }
-    int around(): sets_int_sint1c() { a("a sets_int_sint1c"); return proceed(); }
-    int around(): sets_int_sint2c() { a("a sets_int_sint2c"); return proceed(); }
-    int around(): sets_int_sint3c() { a("a sets_int_sint3c"); return proceed(); }
+    Object around(): gets_int_int0()   { a("a gets_int_int0");   return proceed(); }
+    Object around(): gets_int_int1()   { a("a gets_int_int1");   return proceed(); }
+    Object around(): gets_int_int2()   { a("a gets_int_int2");   return proceed(); }
+    Object around(): gets_int_int3()   { a("a gets_int_int3");   return proceed(); }
+    Object around(): gets_int_int0b()  { a("a gets_int_int0b");  return proceed(); }
+    Object around(): gets_int_int1b()  { a("a gets_int_int1b");  return proceed(); }
+    Object around(): gets_int_int2b()  { a("a gets_int_int2b");  return proceed(); }
+    Object around(): gets_int_int3b()  { a("a gets_int_int3b");  return proceed(); }
+    Object around(): sets_int_int0()   { a("a sets_int_int0");   return proceed(); }
+    Object around(): sets_int_int1()   { a("a sets_int_int1");   return proceed(); }
+    Object around(): sets_int_int2()   { a("a sets_int_int2");   return proceed(); }
+    Object around(): sets_int_int3()   { a("a sets_int_int3");   return proceed(); }
+    Object around(): sets_int_int0b()  { a("a sets_int_int0b");  return proceed(); }
+    Object around(): sets_int_int1b()  { a("a sets_int_int1b");  return proceed(); }
+    Object around(): sets_int_int2b()  { a("a sets_int_int2b");  return proceed(); }
+    Object around(): sets_int_int3b()  { a("a sets_int_int3b");  return proceed(); }
+    Object around(): sets_int_int0c()  { a("a sets_int_int0c");  return proceed(); }
+    Object around(): sets_int_int1c()  { a("a sets_int_int1c");  return proceed(); }
+    Object around(): sets_int_int2c()  { a("a sets_int_int2c");  return proceed(); }
+    Object around(): sets_int_int3c()  { a("a sets_int_int3c");  return proceed(); }
+    Object around(): gets_int_sint0()  { a("a gets_int_sint0");  return proceed(); }
+    Object around(): gets_int_sint1()  { a("a gets_int_sint1");  return proceed(); }
+    Object around(): gets_int_sint2()  { a("a gets_int_sint2");  return proceed(); }
+    Object around(): gets_int_sint3()  { a("a gets_int_sint3");  return proceed(); }
+    Object around(): gets_int_sint0b() { a("a gets_int_sint0b"); return proceed(); }
+    Object around(): gets_int_sint1b() { a("a gets_int_sint1b"); return proceed(); }
+    Object around(): gets_int_sint2b() { a("a gets_int_sint2b"); return proceed(); }
+    Object around(): gets_int_sint3b() { a("a gets_int_sint3b"); return proceed(); }
+    Object around(): sets_int_sint0()  { a("a sets_int_sint0");  return proceed(); }
+    Object around(): sets_int_sint1()  { a("a sets_int_sint1");  return proceed(); }
+    Object around(): sets_int_sint2()  { a("a sets_int_sint2");  return proceed(); }
+    Object around(): sets_int_sint3()  { a("a sets_int_sint3");  return proceed(); }
+    Object around(): sets_int_sint0b() { a("a sets_int_sint0b"); return proceed(); }
+    Object around(): sets_int_sint1b() { a("a sets_int_sint1b"); return proceed(); }
+    Object around(): sets_int_sint2b() { a("a sets_int_sint2b"); return proceed(); }
+    Object around(): sets_int_sint3b() { a("a sets_int_sint3b"); return proceed(); }
+    Object around(): sets_int_sint0c() { a("a sets_int_sint0c"); return proceed(); }
+    Object around(): sets_int_sint1c() { a("a sets_int_sint1c"); return proceed(); }
+    Object around(): sets_int_sint2c() { a("a sets_int_sint2c"); return proceed(); }
+    Object around(): sets_int_sint3c() { a("a sets_int_sint3c"); return proceed(); }
     //end-arounds
 
     after(): gets_int_int0()   { a("f gets_int_int0");   }