dont turn off multithreaded context unless running command line build

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
index 5b39e217894d4627db6ef18ab2ff6e74724a4531..7de5dc891cc6dcb06022f68955f5a0843d960ce0 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
@@ -115,7 +115,7 @@ public class AjBuildManager implements IOutputClassFileNameProvider, IBinarySour
        public static AsmHierarchyBuilder asmHierarchyBuilder = new AsmHierarchyBuilder();
 
        static {
-               CompilationAndWeavingContext.setMultiThreaded(false);
+               // CompilationAndWeavingContext.setMultiThreaded(false);
                CompilationAndWeavingContext.registerFormatter(CompilationAndWeavingContext.BATCH_BUILD, new AjBuildContexFormatter());
                CompilationAndWeavingContext
                                .registerFormatter(CompilationAndWeavingContext.INCREMENTAL_BUILD, new AjBuildContexFormatter());

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/tools/ajc/Main.java b/org.aspectj.ajdt.core/src/org/aspectj/tools/ajc/Main.java
index effb8f8b8b5a0629bffe8ea467e73d0084887b2c..d5568dc13b73a1984ff0b93d859decb9db442292 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/tools/ajc/Main.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/tools/ajc/Main.java
@@ -185,6 +185,7 @@ public class Main {
        public Main() {
                controller = new CommandController();
                commandName = ReflectionFactory.ECLIPSE;
+               CompilationAndWeavingContext.setMultiThreaded(false);
                ourHandler = new MessageHandler(true);
        }
 
@@ -292,15 +293,17 @@ public class Main {
        /**
         * Run without using System.exit(..), putting all messages in holder:
         * <ul>
-        * <li>ERROR: compiler error</li> <li>WARNING: compiler warning</li> <li>FAIL: command error (bad arguments, exception thrown)
-        * </li>
+        * <li>ERROR: compiler error</li>
+        * <li>WARNING: compiler warning</li>
+        * <li>FAIL: command error (bad arguments, exception thrown)</li>
         * </ul>
         * This handles incremental behavior:
         * <ul>
-        * <li>If args include "-incremental", repeat for every input char until 'q' is entered.<li> <li>If args include
-        * "-incrementalTagFile {file}", repeat every time we detect that {file} modification time has changed. </li> <li>Either way,
-        * list files recompiled each time if args includes "-verbose".</li> <li>Exit when the commmand/compiler throws any Throwable.
-        * </li>
+        * <li>If args include "-incremental", repeat for every input char until 'q' is entered.
+        * <li>
+        * <li>If args include "-incrementalTagFile {file}", repeat every time we detect that {file} modification time has changed.</li>
+        * <li>Either way, list files recompiled each time if args includes "-verbose".</li>
+        * <li>Exit when the commmand/compiler throws any Throwable.</li>
         * </ul>
         * When complete, this contains all the messages of the final run of the command and/or any FAIL messages produced in running
         * the command, including any Throwable thrown by the command itself.