generics: temporarily use the raw type when matching until the type pattern logic...

diff --git a/weaver/src/org/aspectj/weaver/patterns/TypePattern.java b/weaver/src/org/aspectj/weaver/patterns/TypePattern.java
index a99f05ed89811cb51dda883f192100d2bf2f1184..7b3e20f7dceee4382e3a357c9b7cdf621621ff88 100644 (file)
--- a/weaver/src/org/aspectj/weaver/patterns/TypePattern.java
+++ b/weaver/src/org/aspectj/weaver/patterns/TypePattern.java
@@ -212,6 +212,8 @@ public abstract class TypePattern extends PatternNode {
                // FuzzyBoolean ret = FuzzyBoolean.NO; // ??? -eh
                for (Iterator i = type.getDirectSupertypes(); i.hasNext(); ) {
                        ResolvedTypeX superType = (ResolvedTypeX)i.next();
+                       // TODO asc generics, temporary whilst matching isnt aware..
+                       if (superType.isParameterized()) superType = superType.getRawType().resolve(superType.getWorld());
                        if (matchesSubtypes(superType,type)) return true;
                }
                return false;