--- /home/cpdev/src/classpath/java/awt/AWTEvent.java	2005-07-13 17:32:44.000000000 +0000
+++ java/awt/AWTEvent.java	2005-06-30 05:34:24.000000000 +0000
@@ -1,4 +1,3 @@
-
 /* AWTEvent.java -- the root event in AWT
    Copyright (C) 1999, 2000, 2002, 2005 Free Software Foundation
 
@@ -239,7 +238,16 @@
    */
   public String toString ()
   {
-    String string = getClass ().getName () + "[" + paramString () + "] on "
+    String string = null;
+
+    if (source instanceof Component)
+      string = getClass ().getName () + "[" + paramString () + "] on "
+        + ((Component) source).getName ();
+    else if (source instanceof MenuComponent)
+      string = getClass ().getName () + "[" + paramString () + "] on "
+        + ((MenuComponent) source).getName ();
+    else 
+      string = getClass ().getName () + "[" + paramString () + "] on "
     + source;
 
     return string;