268710: test and fix: marker interface within generic aspect

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PointcutDesignator.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PointcutDesignator.java
index 4feafc640fb81edb23915e313f54fb853a5a14f9..d9e6094fa69832bc90816e557fab8b4a33e2ec1d 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PointcutDesignator.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PointcutDesignator.java
@@ -22,6 +22,7 @@ import org.aspectj.org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;
 import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.MethodBinding;
 import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding;
 import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.TypeBinding;
+import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.TypeVariableBinding;
 import org.aspectj.org.eclipse.jdt.internal.compiler.parser.Parser;
 import org.aspectj.weaver.UnresolvedType;
 import org.aspectj.weaver.patterns.FormalBinding;
@@ -75,6 +76,13 @@ public class PointcutDesignator extends ASTNode {
                        Argument arg = arguments[i];
                        String name = new String(arg.name);
                        UnresolvedType type = world.fromBinding(parameters[i]);
+                       // pr268710: allow for inner interfaces in a generic aspect
+                       if (parameters[i].isInterface() && parameters[i].isParameterizedType() && parameters[i].isMemberType()) {
+                               TypeVariableBinding[] tvs = parameters[i].typeVariables();
+                               if (tvs == null || tvs.length == 0) {
+                                       type = type.getRawType();
+                               }
+                       }
                        bindings[i] = new FormalBinding(type, name, i, arg.sourceStart, arg.sourceEnd);
                }