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 14a6bc4d481896ea7a1a6568d7b96eeb68dac16e..38098eb80460da08b5441671b49a0e0abb47eed8 100644 (file)
--- 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 a0cfd0c2bca90a83a17f2a0f30766030ad258e14..85678a906206e7308ccf41a27d14b89e5949c10b 100644 (file)
--- 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++) {