From 69c887f2cf5d0fa479b5edb3811f93e9361f9125 Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Fri, 25 Jan 2008 19:05:31 +0000
Subject: [PATCH] paramannos: aware of parameter annotation matching

---
 .../patterns/AndAnnotationTypePattern.java    | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/weaver/src/org/aspectj/weaver/patterns/AndAnnotationTypePattern.java b/weaver/src/org/aspectj/weaver/patterns/AndAnnotationTypePattern.java
index f55f36d71..c9525445f 100644
--- a/weaver/src/org/aspectj/weaver/patterns/AndAnnotationTypePattern.java
+++ b/weaver/src/org/aspectj/weaver/patterns/AndAnnotationTypePattern.java
@@ -18,7 +18,8 @@ import org.aspectj.weaver.AnnotatedElement;
 import org.aspectj.weaver.ISourceContext;
 import org.aspectj.weaver.VersionedDataInputStream;
 import org.aspectj.weaver.World;
-
+import org.aspectj.weaver.AjAttribute.WeaverVersionInfo;
+import org.aspectj.weaver.ResolvedType;
 /**
  * @author colyer
  *
@@ -39,6 +40,10 @@ public class AndAnnotationTypePattern extends AnnotationTypePattern {
 	public FuzzyBoolean matches(AnnotatedElement annotated) {
 		return left.matches(annotated).and(right.matches(annotated));
 	}
+	
+	public FuzzyBoolean matches(AnnotatedElement annotated, ResolvedType[] parameterAnnotations ) {
+		return left.matches(annotated,parameterAnnotations).and(right.matches(annotated,parameterAnnotations));
+	}
 
 	public void resolve(World world) {
 		left.resolve(world);
@@ -60,6 +65,7 @@ public class AndAnnotationTypePattern extends AnnotationTypePattern {
 		AnnotationTypePattern newRight = right.parameterizeWith(typeVariableMap,w);
 		AndAnnotationTypePattern ret = new AndAnnotationTypePattern(newLeft,newRight);
 		ret.copyLocationFrom(this);
+		if (this.isForParameterAnnotationMatch()) ret.setForParameterAnnotationMatch();
 		return ret;
 	}
 	
@@ -68,6 +74,9 @@ public class AndAnnotationTypePattern extends AnnotationTypePattern {
 				AnnotationTypePattern.read(s,context),
 				AnnotationTypePattern.read(s,context));
 		p.readLocation(context,s);
+		if (s.getMajorVersion()>=WeaverVersionInfo.WEAVER_VERSION_MINOR_AJ160) {
+			if (s.readBoolean()) p.setForParameterAnnotationMatch();			
+		}
 		return p;		
 	}
 	
@@ -76,18 +85,20 @@ public class AndAnnotationTypePattern extends AnnotationTypePattern {
 		left.write(s);
 		right.write(s);
 		writeLocation(s);
+		s.writeBoolean(isForParameterAnnotationMatch());
 	}
 	
 	public boolean equals(Object obj) {
 		if (!(obj instanceof AndAnnotationTypePattern)) return false;
 		AndAnnotationTypePattern other = (AndAnnotationTypePattern) obj;
-		return (left.equals(other.left) && right.equals(other.right));
+		return (left.equals(other.left) && right.equals(other.right) && left.isForParameterAnnotationMatch()==right.isForParameterAnnotationMatch());
 	}
 	
 	public int hashCode() {
 		int result = 17;
 		result = result*37 + left.hashCode();
 		result = result*37 + right.hashCode();
+		result = result*37 + (isForParameterAnnotationMatch()?0:1);
 		return result;		
 	}
 	
@@ -108,4 +119,9 @@ public class AndAnnotationTypePattern extends AnnotationTypePattern {
 		right.traverse(visitor,ret);
 		return ret;
 	}
+
+	public void setForParameterAnnotationMatch() {
+		left.setForParameterAnnotationMatch();
+		right.setForParameterAnnotationMatch();
+	}
 }
-- 
2.39.5