signature of static method for if pcd shouldn't include extra parameters

for advice

1 files changed, 5 insertions, 3 deletions

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IfPseudoToken.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IfPseudoToken.java
index 653039b96..86c0c0468 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IfPseudoToken.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IfPseudoToken.java
@@ -95,15 +95,17 @@ public class IfPseudoToken extends PseudoToken {
 	private Argument[] makeArguments(MethodDeclaration enclosingDec) {
 		Argument[] baseArguments = enclosingDec.arguments;
 		int len = baseArguments.length;
+		if (enclosingDec instanceof AdviceDeclaration) {
+			len = ((AdviceDeclaration)enclosingDec).baseArgumentCount;
+		}
+		
 		Argument[] ret = new Argument[len];
 		for (int i=0; i < len; i ++) {
 			Argument a = baseArguments[i];
 			ret[i] = new Argument(a.name, AstUtil.makeLongPos(a.sourceStart, a.sourceEnd),
 								a.type, Modifier.FINAL);
 		}
-		if (!(enclosingDec instanceof AdviceDeclaration)) {
-			ret = AdviceDeclaration.addTjpArguments(ret);
-		}
+		ret = AdviceDeclaration.addTjpArguments(ret);
 		
 		return ret;
 	}