From 36df743803c35f9715f4c0c5cffa79989a672992 Mon Sep 17 00:00:00 2001 From: aclement Date: Fri, 22 Aug 2008 21:07:24 +0000 Subject: [PATCH] 198341: test and fix --- weaver/src/org/aspectj/weaver/patterns/AndTypePattern.java | 4 ++++ weaver/src/org/aspectj/weaver/patterns/OrTypePattern.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/weaver/src/org/aspectj/weaver/patterns/AndTypePattern.java b/weaver/src/org/aspectj/weaver/patterns/AndTypePattern.java index 8c45988e6..ebf79de6d 100644 --- 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 b5011cc5e..52a18d50a 100644 --- 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) -- 2.39.5