Component.java (toString): Implemented.

	* java/awt/Component.java (toString): Implemented.
	* java/awt/Container.java (addImpl): Remove FIXME. Only call
	dispatchEvent() to dispatch the event.
	(removeImpl): Ditto.

From-SVN: r35363

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index dd1c6485934f701e48c1f84d54dab4e75c8cee14..f20f8dfca1fa2589a533d5120736fc0535bedd46 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2000-07-31  Bryce McKinlay  <bryce@albatross.co.nz>
+
+       * java/awt/Component.java (toString): Implemented.
+       * java/awt/Container.java (addImpl): Remove FIXME. Only call 
+       dispatchEvent() to dispatch the event.
+       (removeImpl): Ditto.
+
 2000-07-30  Anthony Green  <green@redhat.com>
 
        * java/awt/Component.java: Add treeLock object.

diff --git a/libjava/java/awt/Component.java b/libjava/java/awt/Component.java
index 3462e2aee41858d4685c177be855ea219302fe64..f1e24a4c63ad7390514f3dd57b890dda338fc444 100644 (file)
--- a/libjava/java/awt/Component.java
+++ b/libjava/java/awt/Component.java
@@ -1283,7 +1283,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
   
   public String toString()
   {
-    return paramString();
+    return this.getClass().getName() + "[" + paramString() + "]";
   }
   
   public void list()

diff --git a/libjava/java/awt/Container.java b/libjava/java/awt/Container.java
index 7ebdc9cf4a436eac14a76945ea5a7c07366fef55..e1a70bf87dd98a25072732d78020bae3d7b25ea2 100644 (file)
--- a/libjava/java/awt/Container.java
+++ b/libjava/java/awt/Container.java
@@ -154,11 +154,7 @@ public abstract class Container extends Component
     ContainerEvent ce = new ContainerEvent (this,
                                            ContainerEvent.COMPONENT_ADDED,
                                            comp);
-
-    // FIXME: is this right?
     dispatchEvent (ce);
-    if (containerListener != null)
-      containerListener.componentAdded (ce);
   }
 
   public void remove (int index)
@@ -179,11 +175,7 @@ public abstract class Container extends Component
     ContainerEvent ce = new ContainerEvent (this,
                                            ContainerEvent.COMPONENT_REMOVED,
                                            r);
-
-    // FIXME: is this right?
     dispatchEvent (ce);
-    if (containerListener != null)
-      containerListener.componentAdded (ce);
   }
 
   public void remove (Component comp)