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

default mode (inherited behaviour from JDT).

1 files changed, 7 insertions, 6 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,