From: aclement <aclement>
Date: Thu, 18 Dec 2008 18:02:45 +0000 (+0000)
Subject: 259279: test and fix: bridge pipeline
X-Git-Tag: V1_6_3~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=68657d13092a10f7d65ad15568bc55087b7aa128;p=aspectj.git

259279: test and fix: bridge pipeline
---

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/TypeVariableReferenceType.java b/org.aspectj.matcher/src/org/aspectj/weaver/TypeVariableReferenceType.java
index 9a823e6d4..69ab2dae0 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/TypeVariableReferenceType.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/TypeVariableReferenceType.java
@@ -22,58 +22,61 @@ public class TypeVariableReferenceType extends BoundedReferenceType implements T
 
 	private TypeVariable typeVariable;
 	private boolean resolvedIfBounds = false;
-	
+
 	// If 'fixedUp' then the type variable in here is a reference to the real one that may
-	// exist either on a member or a type.  Not fixedUp means that we unpacked a generic
+	// exist either on a member or a type. Not fixedUp means that we unpacked a generic
 	// signature and weren't able to fix it up during resolution (didn't quite know enough
-	// at the right time).  Wonder if we can fix it up late?
+	// at the right time). Wonder if we can fix it up late?
 	boolean fixedUp = false;
-	
-	public TypeVariableReferenceType(
-			TypeVariable aTypeVariable,
-			World aWorld) {
-		super(
-				aTypeVariable.getGenericSignature(),
-				aTypeVariable.getErasureSignature(),
-			  aWorld);
+
+	public TypeVariableReferenceType(TypeVariable aTypeVariable, World aWorld) {
+		super(aTypeVariable.getGenericSignature(), aTypeVariable.getErasureSignature(), aWorld);
 		this.typeVariable = aTypeVariable;
-		this.isExtends    = false;
-		this.isSuper      = false;
+		this.isExtends = false;
+		this.isSuper = false;
 	}
-	
+
 	public ReferenceTypeDelegate getDelegate() {
-		if (delegate==null) 
-		  setDelegate(new ReferenceTypeReferenceTypeDelegate((ReferenceType)typeVariable.getFirstBound()));
+		if (delegate == null)
+			setDelegate(new ReferenceTypeReferenceTypeDelegate((ReferenceType) typeVariable.getFirstBound()));
 		return delegate;
 	}
 
 	public UnresolvedType getUpperBound() {
-		if (typeVariable==null) return super.getUpperBound();
+		if (typeVariable == null)
+			return super.getUpperBound();
 		return typeVariable.getUpperBound();
 	}
-	
+
+	public UnresolvedType getFirstBound() {
+		if (typeVariable == null)
+			return super.getUpperBound();
+		return typeVariable.getFirstBound();
+	}
+
 	public UnresolvedType getLowerBound() {
 		return typeVariable.getLowerBound();
 	}
-	
+
 	private void setAdditionalInterfaceBoundsFromTypeVar() {
 		if (typeVariable.getAdditionalInterfaceBounds() == null) {
 			return;
 		} else {
-			UnresolvedType [] ifBounds = typeVariable.getAdditionalInterfaceBounds();
+			UnresolvedType[] ifBounds = typeVariable.getAdditionalInterfaceBounds();
 			additionalInterfaceBounds = new ReferenceType[ifBounds.length];
 			for (int i = 0; i < ifBounds.length; i++) {
-				additionalInterfaceBounds[i] = (ReferenceType) ifBounds[i].resolve(getWorld()); 
+				additionalInterfaceBounds[i] = (ReferenceType) ifBounds[i].resolve(getWorld());
 			}
 		}
 	}
 
 	public UnresolvedType parameterize(Map typeBindings) {
 		UnresolvedType ut = (UnresolvedType) typeBindings.get(getName());
-		if (ut!=null) return world.resolve(ut);
+		if (ut != null)
+			return world.resolve(ut);
 		return this;
 	}
-	
+
 	public ReferenceType[] getAdditionalBounds() {
 		if (!resolvedIfBounds) {
 			setAdditionalInterfaceBoundsFromTypeVar();
@@ -81,66 +84,68 @@ public class TypeVariableReferenceType extends BoundedReferenceType implements T
 		}
 		return super.getAdditionalBounds();
 	}
-	
+
 	public TypeVariable getTypeVariable() {
 		// if (!fixedUp) throw new BCException("ARGH"); // fix it up now?
 		return typeVariable;
 	}
-	
+
 	public boolean isTypeVariableReference() {
 		return true;
 	}
-	
+
 	public String toString() {
 		return typeVariable.getName();
 	}
-	
+
 	public boolean isGenericWildcard() {
 		return false;
 	}
-	
-	//public ResolvedType resolve(World world) {
-	//	return super.resolve(world);
-	//}
-	
+
+	// public ResolvedType resolve(World world) {
+	// return super.resolve(world);
+	// }
+
 	public boolean isAnnotation() {
-		World world = ((ReferenceType)getUpperBound()).getWorld();
+		World world = ((ReferenceType) getUpperBound()).getWorld();
 		ResolvedType annotationType = ResolvedType.ANNOTATION.resolve(world);
-		if (getUpperBound() != null && ((ReferenceType)getUpperBound()).isAnnotation()) return true;
+		if (getUpperBound() != null && ((ReferenceType) getUpperBound()).isAnnotation())
+			return true;
 		ReferenceType[] ifBounds = getAdditionalBounds();
 		for (int i = 0; i < ifBounds.length; i++) {
-			if (ifBounds[i].isAnnotation()) return true;
-			if (ifBounds[i] == annotationType) return true; // annotation itself does not have the annotation flag set in Java!
+			if (ifBounds[i].isAnnotation())
+				return true;
+			if (ifBounds[i] == annotationType)
+				return true; // annotation itself does not have the annotation flag set in Java!
 		}
 		return false;
 	}
-	
+
 	/**
-     * return the signature for a *REFERENCE* to a type variable, which is simply:
-     *   Tname;
-     * there is no bounds info included, that is in the signature of the type variable itself
-     */
+	 * return the signature for a *REFERENCE* to a type variable, which is simply: Tname; there is no bounds info included, that is
+	 * in the signature of the type variable itself
+	 */
 	public String getSignature() {
-	  StringBuffer sb = new StringBuffer();
-	  sb.append("T");
-	  sb.append(typeVariable.getName());
-	  sb.append(";");
-	  return sb.toString();
+		StringBuffer sb = new StringBuffer();
+		sb.append("T");
+		sb.append(typeVariable.getName());
+		sb.append(";");
+		return sb.toString();
 	}
-	
+
 	public void write(DataOutputStream s) throws IOException {
 		super.write(s);
-//		TypeVariableDeclaringElement tvde = typeVariable.getDeclaringElement();
-//		if (tvde == null) {
-//			s.writeInt(TypeVariable.UNKNOWN);
-//		} else {			
-//			s.writeInt(typeVariable.getDeclaringElementKind());
-//			if (typeVariable.getDeclaringElementKind() == TypeVariable.TYPE) {
-//				((UnresolvedType)tvde).write(s);
-//			} else if (typeVariable.getDeclaringElementKind() == TypeVariable.METHOD){
-//				// it's a method
-//				((ResolvedMember)tvde).write(s);
-//			}
-//		}
+		// TypeVariableDeclaringElement tvde = typeVariable.getDeclaringElement();
+		// if (tvde == null) {
+		// s.writeInt(TypeVariable.UNKNOWN);
+		// } else {
+		// s.writeInt(typeVariable.getDeclaringElementKind());
+		// if (typeVariable.getDeclaringElementKind() == TypeVariable.TYPE) {
+		// ((UnresolvedType)tvde).write(s);
+		// } else if (typeVariable.getDeclaringElementKind() == TypeVariable.METHOD){
+		// // it's a method
+		// ((ResolvedMember)tvde).write(s);
+		// }
+		// }
 	}
 }