Fixes bug #13534.

2005-07-13  Robert Schuster  <robertschuster@fsfe.org>

    * java/awt/AWTEvent.java:
    (toString): Generalized string generation.

2 files changed, 7 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 5520543a6..aca656a7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-13  Robert Schuster  <robertschuster@fsfe.org>
+
+	* java/awt/AWTEvent.java:
+	(toString): Generalized string generation.
+
 2005-07-13  David Gilbert  <david.gilbert@object-refinery.com>
 
 	* javax/swing/LookAndFeel.java: added API docs all over,
diff --git a/java/awt/AWTEvent.java b/java/awt/AWTEvent.java
index b90a90909..ad9533f9c 100644
--- a/java/awt/AWTEvent.java
+++ b/java/awt/AWTEvent.java
@@ -1,3 +1,4 @@
+
 /* AWTEvent.java -- the root event in AWT
    Copyright (C) 1999, 2000, 2002, 2005 Free Software Foundation
 
@@ -238,16 +239,7 @@ public abstract class AWTEvent extends EventObject
    */
   public String toString ()
   {
-    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 "
+    String string = getClass ().getName () + "[" + paramString () + "] on "
     + source;
 
     return string;