From: jhugunin <jhugunin>
Date: Thu, 24 Jul 2003 19:53:50 +0000 (+0000)
Subject: moved to 2.1.1 jdtcore.  Updated our code to change one call to a
X-Git-Tag: V1_1_1~206
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=01b77ac07d292a8bdafc9c10112f4f89bae204ec;p=aspectj.git

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 122760fc2..94a026aa0 100644
--- 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 9586d6fbc..e5f5e3fcd 100644
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 8405c3ee7..d297c555f 100644
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 b88e97da1..a7c73d20d 100644
--- 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"/>