moved to 2.1.1 jdtcore. Updated our code to change one call to a

convenience method that was removed.  Updated tests to enable the
test for the horrible switch bug that this fixes.

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AdviceDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AdviceDeclaration.java
index 122760fc2fdd099c05d0b28b6da573a104eca57b..94a026aa0b0c3692f1257586dcabbe99693b95d1 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AdviceDeclaration.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AdviceDeclaration.java
@@ -33,6 +33,7 @@ import org.eclipse.jdt.internal.compiler.ast.MethodDeclaration;
 import org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;
 import org.eclipse.jdt.internal.compiler.ast.TypeReference;
 import org.eclipse.jdt.internal.compiler.codegen.CodeStream;
+import org.eclipse.jdt.internal.compiler.lookup.ArrayBinding;
 import org.eclipse.jdt.internal.compiler.lookup.ClassScope;
 import org.eclipse.jdt.internal.compiler.lookup.MethodBinding;
 import org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;
@@ -202,7 +203,7 @@ public class AdviceDeclaration extends MethodDeclaration {
                // build the Object[]
 
                codeStream.generateInlinedValue(nargs-1);
-               codeStream.anewarrayJavaLangObject();
+               codeStream.newArray(classScope, new ArrayBinding(classScope.getType(TypeBinding.JAVA_LANG_OBJECT), 1));
                
                int index = 0;
                for (int i=0; i < nargs-1; i++) {

diff --git a/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip b/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip
index 9586d6fbcd396424cd8c6e506380947e5f55d214..e5f5e3fcd4784a6074c99cf1d34def9ea6c4afa5 100644 (file)
Binary files a/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip and b/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip differ

diff --git a/org.eclipse.jdt.core/jdtcore-for-aspectj.jar b/org.eclipse.jdt.core/jdtcore-for-aspectj.jar
index 8405c3ee7fa658336d272f398dd270f6fb61d489..d297c555f65b419d3e8cc2e19b8929870af66081 100644 (file)
Binary files a/org.eclipse.jdt.core/jdtcore-for-aspectj.jar and b/org.eclipse.jdt.core/jdtcore-for-aspectj.jar differ

diff --git a/tests/ajcTests.xml b/tests/ajcTests.xml
index b88e97da101bd8af9b6d2d42a6d06b0b30b435ce..a7c73d20dc93c0369b3eb60106a9ede2e6bd7a6a 100644 (file)
--- a/tests/ajcTests.xml
+++ b/tests/ajcTests.xml
@@ -6383,7 +6383,7 @@
         <run class="p2.Derived"/>
     </ajc-test>
     
-    <ajc-test dir="bugs" pr="38345" keywords="purejava"
+    <ajc-test dir="bugs" pr="38345"
         title="try switch VerifyError, InconsistentStackHeight">
         <compile files="TrySwitch.java"/>
         <run class="TrySwitch"/>