From 038008d277b0e193dcff8b10ab9f6497940cc3ae Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Thu, 29 Apr 2010 18:45:29 +0000
Subject: [PATCH] 298665: fix!

---
 .../src/org/aspectj/weaver/BoundedReferenceType.java     | 4 ++--
 .../src/org/aspectj/weaver/TypeFactory.java              | 9 +++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/BoundedReferenceType.java b/org.aspectj.matcher/src/org/aspectj/weaver/BoundedReferenceType.java
index a1f164e28..68c18c4a2 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/BoundedReferenceType.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/BoundedReferenceType.java
@@ -80,7 +80,7 @@ public class BoundedReferenceType extends ReferenceType {
 		super("*", "Ljava/lang/Object;", world);
 		this.kind = UNBOUND;
 		upperBound = world.resolve(UnresolvedType.OBJECT);
-		setDelegate(new BoundedReferenceTypeDelegate((ReferenceType)upperBound));
+		setDelegate(new BoundedReferenceTypeDelegate((ReferenceType) upperBound));
 	}
 
 	public UnresolvedType getUpperBound() {
@@ -120,7 +120,7 @@ public class BoundedReferenceType extends ReferenceType {
 	}
 
 	public boolean isExtends() {
-		return (this.kind == EXTENDS && !getUpperBound().getSignature().equals("Ljava/lang/Object;"));
+		return this.kind == EXTENDS;
 	}
 
 	public boolean isSuper() {
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/TypeFactory.java b/org.aspectj.matcher/src/org/aspectj/weaver/TypeFactory.java
index 0d2892f12..7cdbe230b 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/TypeFactory.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/TypeFactory.java
@@ -1,13 +1,10 @@
 /* *******************************************************************
- * Copyright (c) 2005 Contributors.
+ * Copyright (c) 2005-2010 Contributors.
  * All rights reserved. 
  * This program and the accompanying materials are made available 
  * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
  * http://eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *   Adrian Colyer			Initial implementation
  * ******************************************************************/
 package org.aspectj.weaver;
 
@@ -15,8 +12,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * @author colyer
- * 
+ * @author Adrian Colyer
+ * @author Andy Clement
  */
 public class TypeFactory {
 
-- 
2.39.5