From f8647878b30aa303580326a67e98c75b0dc553b1 Mon Sep 17 00:00:00 2001
From: jhugunin <jhugunin>
Date: Mon, 19 May 2003 20:51:44 +0000
Subject: [PATCH] better error message for trying declare parents on Object

---
 .../src/org/aspectj/weaver/patterns/DeclareParents.java   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/weaver/src/org/aspectj/weaver/patterns/DeclareParents.java b/weaver/src/org/aspectj/weaver/patterns/DeclareParents.java
index efc8bf69b..7a66631b0 100644
--- a/weaver/src/org/aspectj/weaver/patterns/DeclareParents.java
+++ b/weaver/src/org/aspectj/weaver/patterns/DeclareParents.java
@@ -113,12 +113,18 @@ public class DeclareParents extends Declare {
 		if (typePattern == TypePattern.NO) return null;  // already had an error here
 		TypeX iType = typePattern.getExactType();
 		ResolvedTypeX parentType = iType.resolve(world);
+		
+		if (targetType.equals(world.resolve(TypeX.OBJECT))) {
+			world.showMessage(IMessage.ERROR, "can't change the parents of java.lang.Object",
+			                  this.getSourceLocation(), null);
+			return null;
+		}
 			
 		if (parentType.isAssignableFrom(targetType)) return null;  // already a parent
 					
 		if (targetType.isAssignableFrom(parentType)) {
 			world.showMessage(IMessage.ERROR,
-				"type can not extend itself", this.getSourceLocation(), null
+				"type \'" + targetType.getName() + "\'can not extend itself", this.getSourceLocation(), null
 			);
 			return null;
 		}
-- 
2.39.5