Fix for AJDT bug 40380.

1 files changed, 15 insertions, 11 deletions

diff --git a/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java b/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
index 0722b425a..cbd31eb93 100644
--- a/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
+++ b/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
@@ -16,12 +16,22 @@
 
 package org.aspectj.ajde.internal;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+
 import org.aspectj.ajde.Ajde;
 import org.aspectj.ajde.BuildOptionsAdapter;
 import org.aspectj.ajde.BuildProgressMonitor;
 import org.aspectj.ajde.ProjectPropertiesAdapter;
 import org.aspectj.ajde.TaskListManager;
 import org.aspectj.ajdt.ajc.AjdtCommand;
+import org.aspectj.ajdt.ajc.BuildArgParser;
 import org.aspectj.ajdt.internal.core.builder.AjBuildConfig;
 import org.aspectj.ajdt.internal.core.builder.AjBuildManager;
 import org.aspectj.bridge.AbortException;
@@ -34,15 +44,6 @@ import org.aspectj.util.LangUtil;
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-
 public class CompilerAdapter {
 
 	private Map optionsMap;
@@ -158,10 +159,13 @@ public class CompilerAdapter {
         String[] args = new String[] { "@" + config.getAbsolutePath() };
         CountingMessageHandler counter 
             = CountingMessageHandler.makeCountingMessageHandler(messageHandler);
-        AjBuildConfig local = AjdtCommand.genBuildConfig(args, counter);
+		BuildArgParser parser = new BuildArgParser();
+        AjBuildConfig local = parser.genBuildConfig(args, counter, false);  
+             
         if (counter.hasErrors()) {
             return null; 
-        }
+        } 
+        
         local.setConfigFile(config);
 
         // -- get globals, treat as defaults used if no local values