aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorBryce McKinlay <bryce@gcc.gnu.org>2000-10-24 11:53:56 +0100
committerBryce McKinlay <bryce@gcc.gnu.org>2000-10-24 11:53:56 +0100
commit85d0c8b46e8f70ec127031f6bfb9dd1225283cee (patch)
treea2866081654012424126d88d0dabd6189339b45a /libjava
parent264836a1ffe4358264cc82e1e1e543b7da3fc72e (diff)
downloadgcc-85d0c8b46e8f70ec127031f6bfb9dd1225283cee.zip
gcc-85d0c8b46e8f70ec127031f6bfb9dd1225283cee.tar.gz
gcc-85d0c8b46e8f70ec127031f6bfb9dd1225283cee.tar.bz2
EventObject.java: Merged from classpath.
2000-10-24 Bryce McKinlay <bryce@albatross.co.nz> * java/util/EventObject.java: Merged from classpath. From-SVN: r37032
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/java/util/EventObject.java88
2 files changed, 61 insertions, 32 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 120cf11..159789a 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-24 Bryce McKinlay <bryce@albatross.co.nz>
+
+ * java/util/EventObject.java: Merged from classpath.
+
2000-10-23 Alexandre Petit-Bianco <apbianco@cygnus.com>
* java/util/AbstractSet.java (equals): Re-installed original code.
@@ -259,6 +263,7 @@
* gnu/gcj/convert/natIconv.cc (init): Terminate buffer.
+>>>>>>> 1.515
2000-10-02 Bryce McKinlay <bryce@albatross.co.nz>
* prims.cc (_Jv_argv, _Jv_argc): New fields.
diff --git a/libjava/java/util/EventObject.java b/libjava/java/util/EventObject.java
index ee6a7f6..dd7c0d9 100644
--- a/libjava/java/util/EventObject.java
+++ b/libjava/java/util/EventObject.java
@@ -1,42 +1,66 @@
-// EventObject.java - Represent events fired by objects.
+/* EventObject.java - Represent events fired by objects.
+ Copyright (C) 1999, 2000 Free Software Foundation, Inc.
-/* Copyright (C) 1998, 1999 Free Software Foundation
+ This file is part of GNU Classpath.
+
+ GNU Classpath is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ GNU Classpath is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNU Classpath; see the file COPYING. If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA.
+
+ As a special exception, if you link this library with other files to
+ produce an executable, this library does not by itself cause the
+ resulting executable to be covered by the GNU General Public License.
+ This exception does not however invalidate any other reasons why the
+ executable file might be covered by the GNU General Public License. */
- This file is part of libgcj.
-This software is copyrighted work licensed under the terms of the
-Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
-details. */
-
package java.util;
+import java.io.Serializable;
+
/**
- * @author Tom Tromey <tromey@cygnus.com>
- * @date December 12, 1998
+ * Represents Events fired by Objects.
+ *
+ * @see EventListener
*/
-/* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3
- * "The Java Language Specification", ISBN 0-201-63451-1
- * Status: Believed complete, but not fully correct.
- */
-
-public class EventObject implements java.io.Serializable
+public class EventObject implements Serializable
{
- public EventObject (Object source)
- {
- this.source = source;
- }
-
- public Object getSource ()
- {
- return source;
- }
-
- public String toString ()
- {
- // FIXME.
- return getSource().toString();
- }
-
- // Source of the event.
+ private static final long serialVersionUID = 5516075349620653480L;
protected transient Object source;
+
+ /**
+ * Constructs an EventObject with the specified source.
+ */
+ public EventObject(Object source)
+ {
+ this.source = source;
+ }
+
+ /**
+ * @return The source of the Event.
+ */
+ public Object getSource()
+ {
+ return source;
+ }
+
+ /**
+ * @return String representation of the Event.
+ * @override toString in class Object
+ */
+ public String toString()
+ {
+ return this.getClass() + "[source=" + source.toString() + "]";
+ }
}