also support superinterfaces when converting an Eclipse TypeParameter into a TypeVariable

1 files changed, 10 insertions, 2 deletions

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java
index 240d2c478..586e06236 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java
@@ -474,7 +474,15 @@ public class EclipseSourceType extends AbstractReferenceTypeDelegate {
 		String name = new String(aTypeParameter.name);
 		ReferenceBinding superclassBinding = aTypeParameter.binding.superclass;
 		UnresolvedType superclass = UnresolvedType.forSignature(new String(superclassBinding.signature()));
-		// TODO AMC - superinterfaces
-		return new TypeVariable(name,superclass);
+		UnresolvedType[] superinterfaces = null;
+		ReferenceBinding[] superInterfaceBindings = aTypeParameter.binding.superInterfaces;
+		if (superInterfaceBindings != null) {
+			superinterfaces = new UnresolvedType[superInterfaceBindings.length];
+			for (int i = 0; i < superInterfaceBindings.length; i++) {
+				superinterfaces[i] = UnresolvedType.forSignature(new String(superInterfaceBindings[i].signature()));
+			}
+		}
+		// XXX what about lower binding?
+		return new TypeVariable(name,superclass,superinterfaces);
 	}
 }