LTW modules + AntSpec to test LTW in the sandbox + code cleanup in my FIXME + fix in error handling when no debug info can be read from @Aj aspect (many files modified since refactored IMessageHanlder for LTW dontIgnore method)

4 files changed, 39 insertions, 3 deletions

diff --git a/bridge/src/org/aspectj/bridge/CountingMessageHandler.java b/bridge/src/org/aspectj/bridge/CountingMessageHandler.java
index 3cdd7d482..5bfe0b971 100644
--- a/bridge/src/org/aspectj/bridge/CountingMessageHandler.java
+++ b/bridge/src/org/aspectj/bridge/CountingMessageHandler.java
@@ -65,7 +65,16 @@ public class CountingMessageHandler implements IMessageHandler {
     public boolean isIgnoring(IMessage.Kind kind) {
         return delegate.isIgnoring(kind);
     }
-    
+
+    /**
+     * Delegate
+     * @see org.aspectj.bridge.IMessageHandler#isIgnoring(org.aspectj.bridge.IMessage.Kind)
+     * @param kind
+     */
+    public void dontIgnore(IMessage.Kind kind) {
+        delegate.dontIgnore(kind);
+    }
+
     /** @return delegate.toString() */
     public String toString() {
         return delegate.toString();
diff --git a/bridge/src/org/aspectj/bridge/IMessageHandler.java b/bridge/src/org/aspectj/bridge/IMessageHandler.java
index 76b76ec0b..d3846db73 100644
--- a/bridge/src/org/aspectj/bridge/IMessageHandler.java
+++ b/bridge/src/org/aspectj/bridge/IMessageHandler.java
@@ -49,6 +49,9 @@ public interface IMessageHandler {
 			public boolean isIgnoring(IMessage.Kind kind) {
 				return false;
 			}
+            public void dontIgnore(IMessage.Kind kind) {
+                ;
+            }
 		};
 
 	/** 
@@ -66,4 +69,12 @@ public interface IMessageHandler {
 	 * @return true if this handler is ignoring all messages of this type
 	 */
 	boolean isIgnoring(IMessage.Kind kind);
+
+    /**
+     * Allow fine grained configuration after initialization. Minaly used in LTW. Most of the
+     * implementation can have this method be a no-op.
+     *  
+     * @param kind
+     */
+    void dontIgnore(IMessage.Kind kind);
 }
diff --git a/bridge/src/org/aspectj/bridge/MessageUtil.java b/bridge/src/org/aspectj/bridge/MessageUtil.java
index 79250943e..fd4a41efe 100644
--- a/bridge/src/org/aspectj/bridge/MessageUtil.java
+++ b/bridge/src/org/aspectj/bridge/MessageUtil.java
@@ -358,6 +358,9 @@ public class MessageUtil {
             public boolean isIgnoring(Kind kind) {
                 return false;
             }
+            public void dontIgnore(IMessage.Kind kind) {
+                ;
+            }
         };
         return visitMessages(holder, selector, true, false);
     }
@@ -576,7 +579,11 @@ public class MessageUtil {
                 return (0 < IMessage.Kind.COMPARATOR.compare(sought, kind));
             }
         }
-        
+
+        public void dontIgnore(IMessage.Kind kind) {
+            ;
+        }
+
         private boolean textIn(IMessage message) {
             if (null == infix) {
                 return true;
diff --git a/bridge/src/org/aspectj/bridge/MessageWriter.java b/bridge/src/org/aspectj/bridge/MessageWriter.java
index 467002c3b..bc9530314 100644
--- a/bridge/src/org/aspectj/bridge/MessageWriter.java
+++ b/bridge/src/org/aspectj/bridge/MessageWriter.java
@@ -52,13 +52,22 @@ public class MessageWriter implements IMessageHandler {
 	}
     
     /**
-	 * @see org.aspectj.bridge.IMessageHandler#isIgnoring(Kind)
+	 * @see org.aspectj.bridge.IMessageHandler#isIgnoring(org.aspectj.bridge.IMessage.Kind)
 	 */
 	public boolean isIgnoring(IMessage.Kind kind) { 
         // XXX share MessageHandler implementation in superclass
 		return false;
 	}
 
+    /**
+     * No-op
+     * @see org.aspectj.bridge.IMessageHandler#isIgnoring(org.aspectj.bridge.IMessage.Kind)
+     * @param kind
+     */
+    public void dontIgnore(IMessage.Kind kind) {
+        ;
+    }
+
     /** @return null to not print, or message rendering (including newlines) */
     protected String render(IMessage message) {
         return message.toString();