214994: generic itds alias NPE: tests and fix

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java
index a87a10f16c41b4bc66d4ebe046f94191b3e1c7b9..fd54e98508f42d8455f2b4579de81bdb2a9044f2 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java
@@ -845,6 +845,9 @@ public class EclipseFactory {
                if (aliases!=null && aliases.size()!=0) {
                        int i=0;
                        ReferenceBinding aliasTarget = (ReferenceBinding)makeTypeBinding(aliasTargetType);
+                       if (aliasTarget.isRawType()) {
+                           aliasTarget = ((RawTypeBinding) aliasTarget).genericType();
+            }
                        for (Iterator iter = aliases.iterator(); iter.hasNext();) {
                                String element = (String) iter.next();
                                typeVariableToTypeBinding.put(element,aliasTarget.typeVariables()[i++]);