diff options
| author | wisberg <wisberg> | 2005-05-12 10:59:00 +0000 |
|---|---|---|
| committer | wisberg <wisberg> | 2005-05-12 10:59:00 +0000 |
| commit | 8ba1011bac38511fe8546766951c08d812257de2 (patch) | |
| tree | 8d7d8779d85376c2da2460c89a32a9bad89ac6b4 /org.aspectj.ajdt.core | |
| parent | 9b730456c99c01c7381317e7c4511ae238cfd027 (diff) | |
| download | aspectj-8ba1011bac38511fe8546766951c08d812257de2.tar.gz aspectj-8ba1011bac38511fe8546766951c08d812257de2.zip | |
avoid harness ajcore files - ensure Dump message holder is not null for clients not using Main interface.
Diffstat (limited to 'org.aspectj.ajdt.core')
| -rw-r--r-- | org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/AjdtCommand.java | 5 | ||||
| -rw-r--r-- | org.aspectj.ajdt.core/src/org/aspectj/tools/ajc/Main.java | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/AjdtCommand.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/AjdtCommand.java index 7b1fa8c7e..949f97cbf 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/AjdtCommand.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/AjdtCommand.java @@ -87,7 +87,10 @@ public class AjdtCommand implements ICommand { */ protected boolean doCommand(IMessageHandler handler, boolean repeat) { try { - //buildManager.setMessageHandler(handler); + if (handler instanceof IMessageHolder) { + Dump.saveMessageHolder((IMessageHolder) handler); + } + // buildManager.setMessageHandler(handler); CountingMessageHandler counter = new CountingMessageHandler(handler); if (counter.hasErrors()) { return false; 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 365242c73..5b701334a 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/tools/ajc/Main.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/tools/ajc/Main.java @@ -32,7 +32,6 @@ import org.aspectj.bridge.ReflectionFactory; import org.aspectj.bridge.Version; import org.aspectj.util.FileUtil; import org.aspectj.util.LangUtil; -import org.aspectj.weaver.Dump; /** * Programmatic and command-line interface to AspectJ compiler. @@ -269,7 +268,6 @@ public class Main { * @param holder the MessageHandler sink for messages. */ public void run(String[] args, IMessageHolder holder) { - Dump.saveMessageHolder(holder); if (LangUtil.isEmpty(args)) { args = new String[] { "-?" }; } else if (controller.running()) { |