diff options
Diffstat (limited to 'org.aspectj.matcher')
| -rw-r--r-- | org.aspectj.matcher/src/org/aspectj/weaver/ResolvedMemberImpl.java | 1 | ||||
| -rw-r--r-- | org.aspectj.matcher/src/org/aspectj/weaver/TypeVariable.java | 4 |
2 files changed, 4 insertions, 1 deletions
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++) { |