280676: problem 2: allow for target not being generic

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 ac479d6ff22c6cf265a4671dc27267201124e9ea..ff74a0926d90e7eb63eec8dec6b7e1d22cd77a01 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
@@ -775,7 +775,8 @@ public class EclipseFactory {
                ReferenceBinding declaringType = (ReferenceBinding) makeTypeBinding(member.getDeclaringType());
 
                // If there are aliases, place them in the map
-               if (aliases != null && aliases.size() > 0) {
+               if (aliases != null && aliases.size() > 0 && declaringType.typeVariables() != null
+                               && declaringType.typeVariables().length != 0) {
                        int i = 0;
                        for (Iterator iter = aliases.iterator(); iter.hasNext();) {
                                String element = (String) iter.next();
@@ -858,7 +859,8 @@ public class EclipseFactory {
                ReferenceBinding declaringType = (ReferenceBinding) makeTypeBinding(member.getDeclaringType());
 
                // If there are aliases, place them in the map
-               if (aliases != null && aliases.size() != 0) {
+               if (aliases != null && aliases.size() != 0 && declaringType.typeVariables() != null
+                               && declaringType.typeVariables().length != 0) {
                        int i = 0;
                        ReferenceBinding aliasTarget = (ReferenceBinding) makeTypeBinding(aliasTargetType);
                        if (aliasTarget.isRawType()) {