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

default mode (inherited behaviour from JDT).

4 files changed, 14 insertions, 12 deletions

diff --git a/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java b/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
index d7db8e849..1b09aee8e 100644
--- a/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
+++ b/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
@@ -149,9 +149,9 @@ public class CompilerAdapter {
         String[] args = new String[] { "@" + configFile.getAbsolutePath() };
         CountingMessageHandler handler 
             = CountingMessageHandler.makeCountingMessageHandler(messageHandler);
-		BuildArgParser parser = new BuildArgParser();
+		BuildArgParser parser = new BuildArgParser(handler);
 		
-        AjBuildConfig config = parser.genBuildConfig(args, handler, false, configFile);  
+        AjBuildConfig config = parser.genBuildConfig(args, false, configFile);  
 		configureProjectOptions(config, Ajde.getDefault().getProjectProperties());  // !!! not what the API intended
 
 		// -- get globals, treat as defaults used if no local values
@@ -312,10 +312,11 @@ public class CompilerAdapter {
 			if (lineNo)  javaOptions.put(CompilerOptions.OPTION_LineNumberAttribute,
 											CompilerOptions.GENERATE);
 		}
-		if ( options.getNoImportError() ) {
-			javaOptions.put( CompilerOptions.OPTION_ReportInvalidImport,
-				CompilerOptions.WARNING);	
-		}
+		//XXX we can't turn off import errors in 3.0 stream
+//		if ( options.getNoImportError() ) {
+//			javaOptions.put( CompilerOptions.OPTION_ReportInvalidImport,
+//				CompilerOptions.WARNING);	
+//		}
 				
 		if ( options.getPreserveAllLocals() ) {
 			javaOptions.put( CompilerOptions.OPTION_PreserveUnusedLocal,
diff --git a/ajde/testdata/LstBuildConfigManagerTest/bad-injar.lst b/ajde/testdata/LstBuildConfigManagerTest/bad-injar.lst
index 36a40acb5..8b43dde50 100644
--- a/ajde/testdata/LstBuildConfigManagerTest/bad-injar.lst
+++ b/ajde/testdata/LstBuildConfigManagerTest/bad-injar.lst
@@ -1 +1,2 @@
--injars foo.jar

+-inpath

+foo.jar

diff --git a/ajde/testsrc/org/aspectj/ajde/BuildConfigurationTests.java b/ajde/testsrc/org/aspectj/ajde/BuildConfigurationTests.java
index 9fa4659d6..f08fe199b 100644
--- a/ajde/testsrc/org/aspectj/ajde/BuildConfigurationTests.java
+++ b/ajde/testsrc/org/aspectj/ajde/BuildConfigurationTests.java
@@ -350,9 +350,9 @@ public class BuildConfigurationTests extends AjdeTestCase {
 		buildConfig = compilerAdapter.genBuildConfig( configFile );			
         assertTrue(configFile + " failed", null != buildConfig);            
 		Map options = buildConfig.getJavaOptions();
-		String noImport = (String) options.get( CompilerOptions.OPTION_ReportInvalidImport );
-		assertEquals( "no import", CompilerOptions.WARNING, noImport );
-		buildOptions.setNoImportError( false );
+//		String noImport = (String) options.get( CompilerOptions.OPTION_ReportInvalidImport );
+//		assertEquals( "no import", CompilerOptions.WARNING, noImport );
+//		buildOptions.setNoImportError( false );
 	}
 	
 	public void testPreserveAllLocals() {
diff --git a/ajde/testsrc/org/aspectj/ajde/internal/LstBuildConfigManagerTest.java b/ajde/testsrc/org/aspectj/ajde/internal/LstBuildConfigManagerTest.java
index c68cb9d15..3d1a04cf3 100644
--- a/ajde/testsrc/org/aspectj/ajde/internal/LstBuildConfigManagerTest.java
+++ b/ajde/testsrc/org/aspectj/ajde/internal/LstBuildConfigManagerTest.java
@@ -54,7 +54,7 @@ public class LstBuildConfigManagerTest extends AjdeTestCase {
 		doSynchronousBuild("bad-injar.lst");
 		messages = NullIdeManager.getIdeManager().getCompilationSourceLineTasks();
 		message = (NullIdeTaskListManager.SourceLineTask)messages.get(0);
-		assertTrue(message.getContainedMessage().getMessage().indexOf("invalid") != -1);
+		assertTrue(message.getContainedMessage().getMessage().indexOf("bad inpath") != -1);
 	}
 
 	public void testErrorMessages() throws IOException {
@@ -63,7 +63,7 @@ public class LstBuildConfigManagerTest extends AjdeTestCase {
 		  
 		List messages = NullIdeManager.getIdeManager().getCompilationSourceLineTasks();
 		SourceLineTask message = (SourceLineTask)messages.get(0);	
-		assertEquals("invalid option: aaa.bbb", message.getContainedMessage().getMessage());		
+		assertTrue(message.getContainedMessage().getMessage(), message.getContainedMessage().getMessage().indexOf("aaa.bbb") != -1);		
 	
 	}