298665: fix!

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/BoundedReferenceType.java b/org.aspectj.matcher/src/org/aspectj/weaver/BoundedReferenceType.java
index a1f164e283f8bf5421c3c0f81aa2673145fc9848..68c18c4a221b9b5d55ceb832289ce643293a16b5 100644 (file)
--- 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 0d2892f1215b04fa35e52e16503445037a5fe89b..7cdbe230b67c66f4a513c5ddad8a56907b4f99ca 100644 (file)
--- 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 {