Browse Source

avoid harness ajcore files - ensure Dump message holder is not null for clients not using Main interface.

tags/PRE_ANDY
wisberg 19 years ago
parent
commit
8ba1011bac

+ 4
- 1
org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/AjdtCommand.java View File

@@ -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;

+ 0
- 2
org.aspectj.ajdt.core/src/org/aspectj/tools/ajc/Main.java View File

@@ -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()) {

Loading…
Cancel
Save