141556#11 - reworked messagehandler with 'ignore' function! (wooo) - hope Matthew doesnt complain.

4 files changed, 26 insertions, 9 deletions

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java
index 4b2c82c13..9db0feb3d 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java
@@ -122,15 +122,11 @@ public class BuildArgParser extends Main {
 			// Now jump through firey hoops to turn them on/off
 			if (handler instanceof CountingMessageHandler) {
 				IMessageHandler delegate = ((CountingMessageHandler)handler).delegate;
-				// Without dontIgnore() on the IMessageHandler interface, we have to do this *blurgh*
-				if (delegate instanceof MessageHandler) {
-					if (swi) 
-					  ((MessageHandler)delegate).dontIgnore(IMessage.WEAVEINFO);
-					else 
-					  ((MessageHandler)delegate).ignore(IMessage.WEAVEINFO);
-				}
+				if (swi) 
+				  delegate.dontIgnore(IMessage.WEAVEINFO);
+				else 
+				  delegate.ignore(IMessage.WEAVEINFO);
 			}
-			
             
             boolean incrementalMode = buildConfig.isIncrementalMode()
             	|| buildConfig.isIncrementalFileMode();
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/WeaverMessageHandler.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/WeaverMessageHandler.java
index a57c61f1a..b4feb146a 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/WeaverMessageHandler.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/WeaverMessageHandler.java
@@ -152,6 +152,14 @@ public class WeaverMessageHandler implements IMessageHandler {
         ;
     }
 
+    /**
+     * No-op
+     * @see org.aspectj.bridge.IMessageHandler#ignore(org.aspectj.bridge.IMessage.Kind)
+     * @param kind
+     */
+	public void ignore(Kind kind) {
+	}
+    
 	private int getStartPos(ISourceLocation sLoc,CompilationResult result) {
 		int pos = 0;
 		if (sLoc == null) return 0;
@@ -234,5 +242,6 @@ public class WeaverMessageHandler implements IMessageHandler {
 		IProblem[] retValue = (IProblem[])ret.toArray(new IProblem[]{});
 		return retValue;
 	}
+
 }
 
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AspectJBuilder.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AspectJBuilder.java
index 953085151..737d696cf 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AspectJBuilder.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AspectJBuilder.java
@@ -240,7 +240,10 @@ public class AspectJBuilder extends JavaBuilder implements ICompilerAdapterFacto
          */
         public void dontIgnore(IMessage.Kind kind) {
             ;
-	}
+        }
+
+		public void ignore(Kind kind) {
+		}
 	
 	}
 	
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 5c5d4dd9e..a4eba9dcf 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
@@ -33,6 +33,7 @@ import org.aspectj.bridge.MessageHandler;
 import org.aspectj.bridge.MessageUtil;
 import org.aspectj.bridge.ReflectionFactory;
 import org.aspectj.bridge.Version;
+import org.aspectj.bridge.IMessage.Kind;
 import org.aspectj.bridge.context.CompilationAndWeavingContext;
 import org.aspectj.util.FileUtil;
 import org.aspectj.util.LangUtil;
@@ -657,6 +658,14 @@ public class Main {
                 return null;
             }
         }
+
+        /**
+         * No-op
+         * @see org.aspectj.bridge.IMessageHandler#ignore(org.aspectj.bridge.IMessage.Kind)
+         * @param kind
+         */
+		public void ignore(Kind kind) {
+		}
     }
     
 	public static class LogModeMessagePrinter extends MessagePrinter {