From: aclement <aclement>
Date: Fri, 30 May 2008 17:18:18 +0000 (+0000)
Subject: 231396: Switch to new UnresolvedType for wildcards
X-Git-Tag: V1_6_1rc1~207
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=155bb27738a310c0b8100c746e88915e697066b0;p=aspectj.git

231396: Switch to new UnresolvedType for wildcards
---

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java
index f00b0b277..5bb89b478 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java
@@ -71,6 +71,7 @@ import org.aspectj.weaver.TypeVariableDeclaringElement;
 import org.aspectj.weaver.TypeVariableReference;
 import org.aspectj.weaver.UnresolvedType;
 import org.aspectj.weaver.UnresolvedTypeVariableReferenceType;
+import org.aspectj.weaver.WildcardedUnresolvedType;
 import org.aspectj.weaver.World;
 import org.aspectj.weaver.UnresolvedType.TypeKind;
 
@@ -223,9 +224,6 @@ public class EclipseFactory {
 		
 		if (binding instanceof WildcardBinding) {
 			WildcardBinding eWB = (WildcardBinding) binding;
-			UnresolvedType theType = TypeFactory.createTypeFromSignature(CharOperation.charToString(eWB.genericTypeSignature()));
-		    
-			
 			// Repair the bound
 			// e.g. If the bound for the wildcard is a typevariable, e.g. '? extends E' then
 			// the type variable in the unresolvedtype will be correct only in name.  In that
@@ -236,8 +234,12 @@ public class EclipseFactory {
 			} else {
 				theBound = fromBinding(eWB.bound);
 			}
-			if (theType.isGenericWildcard() && theType.isSuper()) theType.setLowerBound(theBound);
-			if (theType.isGenericWildcard() && theType.isExtends()) theType.setUpperBound(theBound);
+            // if (eWB.boundKind == WildCard.SUPER) {
+            //
+            // }
+            WildcardedUnresolvedType theType = (WildcardedUnresolvedType) TypeFactory.createTypeFromSignature(CharOperation.charToString(eWB.genericTypeSignature()));
+            // if (theType.isGenericWildcard() && theType.isSuper()) theType.setLowerBound(theBound);
+            // if (theType.isGenericWildcard() && theType.isExtends()) theType.setUpperBound(theBound);
 			return theType;
 		}