198341: test and fix

diff --git a/weaver/src/org/aspectj/weaver/patterns/AndTypePattern.java b/weaver/src/org/aspectj/weaver/patterns/AndTypePattern.java
index 8c45988e6819103e7b9bb8f5a47b909a021ffd08..ebf79de6d0eb3d4260f4357620de5db5cbad7088 100644 (file)
--- a/weaver/src/org/aspectj/weaver/patterns/AndTypePattern.java
+++ b/weaver/src/org/aspectj/weaver/patterns/AndTypePattern.java
@@ -147,6 +147,10 @@ public class AndTypePattern extends TypePattern {
                AndTypePattern atp = (AndTypePattern) obj;
                return left.equals(atp.left) && right.equals(atp.right);
        }
+
+       public boolean isStarAnnotation() {
+               return left.isStarAnnotation() && right.isStarAnnotation();
+       }
        
        /* (non-Javadoc)
         * @see java.lang.Object#hashCode()

diff --git a/weaver/src/org/aspectj/weaver/patterns/OrTypePattern.java b/weaver/src/org/aspectj/weaver/patterns/OrTypePattern.java
index b5011cc5e5011cca0b58f147d9c2a7b022be569f..52a18d50a43167ac24d8b9f1824f55f767876fce 100644 (file)
--- a/weaver/src/org/aspectj/weaver/patterns/OrTypePattern.java
+++ b/weaver/src/org/aspectj/weaver/patterns/OrTypePattern.java
@@ -146,6 +146,10 @@ public class OrTypePattern extends TypePattern {
                }
                return buff.toString();
        }
+
+       public boolean isStarAnnotation() {
+               return left.isStarAnnotation() || right.isStarAnnotation();
+       }
        
        /* (non-Javadoc)
         * @see java.lang.Object#equals(java.lang.Object)