From: aclement <aclement>
Date: Thu, 10 Feb 2011 22:53:00 +0000 (+0000)
Subject: PR336880 PR336774 PR336745
X-Git-Tag: V1_6_11RC1~7
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=294a06e02714412faf8f9a4dc2c5944050dd83a9;p=aspectj.git

PR336880 PR336774 PR336745
---

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedMemberImpl.java b/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedMemberImpl.java
index 14a6bc4d4..38098eb80 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedMemberImpl.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedMemberImpl.java
@@ -523,6 +523,7 @@ public class ResolvedMemberImpl extends MemberImpl implements IHasPosition, Reso
 				for (int i = 0; i < tvcount; i++) {
 					m.typeVariables[i] = TypeVariable.read(s);
 					m.typeVariables[i].setDeclaringElement(m);
+					m.typeVariables[i].setRank(i);
 				}
 			}
 			if (s.getMajorVersion() >= AjAttribute.WeaverVersionInfo.WEAVER_VERSION_MAJOR_AJ150M4) {
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/TypeVariable.java b/org.aspectj.matcher/src/org/aspectj/weaver/TypeVariable.java
index a0cfd0c2b..85678a906 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/TypeVariable.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/TypeVariable.java
@@ -272,7 +272,9 @@ public class TypeVariable {
 		StringBuffer sb = new StringBuffer();
 		sb.append(name);
 		sb.append(":");
-		sb.append(((ResolvedType) superclass).getSignatureForAttribute());
+		if (superInterfaces.length == 0) {
+			sb.append(((ResolvedType) superclass).getSignatureForAttribute());
+		}
 		if (superInterfaces.length != 0) {
 			sb.append(":");
 			for (int i = 0; i < superInterfaces.length; i++) {