aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraclement <aclement>2008-08-22 21:07:24 +0000
committeraclement <aclement>2008-08-22 21:07:24 +0000
commit36df743803c35f9715f4c0c5cffa79989a672992 (patch)
tree5697906ef21c5753dd3f9bce19a8c51c8b567229
parent2f2215479d40b6a4c82f06ea7e95e8460b0fd58a (diff)
downloadaspectj-36df743803c35f9715f4c0c5cffa79989a672992.tar.gz
aspectj-36df743803c35f9715f4c0c5cffa79989a672992.zip
198341: test and fix
-rw-r--r--weaver/src/org/aspectj/weaver/patterns/AndTypePattern.java4
-rw-r--r--weaver/src/org/aspectj/weaver/patterns/OrTypePattern.java4
2 files changed, 8 insertions, 0 deletions
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)