refactoring AbortException to make it clearer when we

want to abort w/o message, and to always stuff in a stack trace

2 files changed, 3 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 1cecb4a76..a6c8368fc 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
@@ -55,7 +55,7 @@ public class AjdtCommand implements ICommand {
                 && buildManager.batchBuild(config, counter)
                 && !counter.hasErrors());
 		} catch (AbortException ae) {
-        	if (AbortException.ABORT.equals(ae)) { 
+        	if (ae.isSilent()) {
         		throw ae;
         	} else {
         		MessageUtil.abort(handler, ABORT_MESSAGE, ae);
@@ -107,7 +107,7 @@ public class AjdtCommand implements ICommand {
         if (null != message) {
             IMessage.Kind kind = inferKind(message);
             handler.handleMessage(new Message(message, kind, null, null));
-            throw AbortException.ABORT; // XXX tangled - assumes handler prints?
+            throw new AbortException(); // XXX tangled - assumes handler prints?
         }
         return config;
     }
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 e698d2b40..4c8e684e8 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
@@ -183,7 +183,7 @@ public class Main {
                 }
             }
         } catch (AbortException ae) {
-        	if (AbortException.ABORT.equals(ae)) { 
+        	if (ae.isSilent()) { 
         		quit();
         	} else {
                 IMessage message = ae.getIMessage();