From 210aeea950b7e53e40c6b3fed6c1f1df981b2a87 Mon Sep 17 00:00:00 2001 From: aclement Date: Fri, 30 May 2008 17:24:46 +0000 Subject: [PATCH] 231396: reworked wildcard handling --- weaver/src/org/aspectj/weaver/ResolvedMemberImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/weaver/src/org/aspectj/weaver/ResolvedMemberImpl.java b/weaver/src/org/aspectj/weaver/ResolvedMemberImpl.java index e8c9f35e1..7d3847d58 100644 --- a/weaver/src/org/aspectj/weaver/ResolvedMemberImpl.java +++ b/weaver/src/org/aspectj/weaver/ResolvedMemberImpl.java @@ -907,7 +907,8 @@ public class ResolvedMemberImpl extends MemberImpl implements IHasPosition, Anno for (int i = 0; i < myParameterTypes.length; i++) { UnresolvedType thisParameter = myParameterTypes[i]; if (thisParameter.isTypeVariableReference()) { - sig.append(thisParameter.getUpperBound().getSignature()); + TypeVariableReferenceType typeVariableRT = (TypeVariableReferenceType) thisParameter; + sig.append(typeVariableRT.getUpperBound().getSignature()); } else { sig.append(thisParameter.getSignature()); } @@ -920,12 +921,13 @@ public class ResolvedMemberImpl extends MemberImpl implements IHasPosition, Anno // comparison. public static void appendSigWithTypeVarBoundsRemoved(UnresolvedType aType, StringBuffer toBuffer, Set alreadyUsedTypeVars) { if (aType.isTypeVariableReference()) { + TypeVariableReferenceType typeVariableRT = (TypeVariableReferenceType) aType; // pr204505 if (alreadyUsedTypeVars.contains(aType)) { toBuffer.append("..."); } else { alreadyUsedTypeVars.add(aType); - appendSigWithTypeVarBoundsRemoved(aType.getUpperBound(), toBuffer, alreadyUsedTypeVars); + appendSigWithTypeVarBoundsRemoved(typeVariableRT.getUpperBound(), toBuffer, alreadyUsedTypeVars); } // toBuffer.append("T;"); } else if (aType.isParameterizedType()) { -- 2.39.5