From: acolyer <acolyer>
Date: Wed, 13 Jul 2005 13:01:37 +0000 (+0000)
Subject: test for parameterized type usage
X-Git-Tag: PRE_ANDY~7
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=67292e752a8cdf373e9de8ec3a24177d643705d2;p=aspectj.git

test for parameterized type usage
---

diff --git a/weaver/src/org/aspectj/weaver/patterns/HandlerPointcut.java b/weaver/src/org/aspectj/weaver/patterns/HandlerPointcut.java
index 9f8752ad1..b7f752d2a 100644
--- a/weaver/src/org/aspectj/weaver/patterns/HandlerPointcut.java
+++ b/weaver/src/org/aspectj/weaver/patterns/HandlerPointcut.java
@@ -19,13 +19,16 @@ import java.lang.reflect.Member;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.aspectj.bridge.MessageUtil;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.util.FuzzyBoolean;
 import org.aspectj.weaver.ISourceContext;
 import org.aspectj.weaver.IntMap;
 import org.aspectj.weaver.ResolvedTypeX;
 import org.aspectj.weaver.Shadow;
+import org.aspectj.weaver.TypeX;
 import org.aspectj.weaver.VersionedDataInputStream;
+import org.aspectj.weaver.WeaverMessages;
 import org.aspectj.weaver.ast.Literal;
 import org.aspectj.weaver.ast.Test;
 import org.aspectj.weaver.internal.tools.PointcutExpressionImpl;
@@ -144,6 +147,16 @@ public class HandlerPointcut extends Pointcut {
 	// list in capturing type identifiers.
 	public void resolveBindings(IScope scope, Bindings bindings) {
 		exceptionType = exceptionType.resolveBindings(scope, bindings, false, false);
+		boolean invalidParameterization = false;
+		if (exceptionType.getTypeParameters().size() > 0) invalidParameterization = true ;
+		TypeX exactType = exceptionType.getExactType();
+		if (exactType != null && exactType.isParameterized()) invalidParameterization = true;
+		if (invalidParameterization) {
+			// no parameterized or generic types for handler
+			scope.message(
+					MessageUtil.error(WeaverMessages.format(WeaverMessages.HANDLER_PCD_DOESNT_SUPPORT_PARAMETERS),
+									getSourceLocation()));
+		}
 		//XXX add error if exact binding and not an exception
 	}