Update to matches to test on Kind

diff --git a/weaver/src/org/aspectj/weaver/patterns/SignaturePattern.java b/weaver/src/org/aspectj/weaver/patterns/SignaturePattern.java
index 58ada73f76c4ccb8fc40a2e0105b06778841b340..d07a2bb12675e0c278a8990ca0023046efc78f44 100644 (file)
--- a/weaver/src/org/aspectj/weaver/patterns/SignaturePattern.java
+++ b/weaver/src/org/aspectj/weaver/patterns/SignaturePattern.java
@@ -93,9 +93,16 @@ public class SignaturePattern extends PatternNode {
                        world.getLint().unresolvableMember.signal(member.toString(), getSourceLocation());
                        return false;
                }
+
+               // AMC test for Kind match surely???
+               if (!(sig.getKind() == kind)) return false;
+
+
                if (kind == Member.ADVICE) return true;
                
                if (!modifiers.matches(sig.getModifiers())) return false;
+
+
                
                if (kind == Member.STATIC_INITIALIZATION) {
                        //System.err.println("match static init: " + sig.getDeclaringType() + " with " + this);