This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: FYI: AWT exception "merge"
- From: Tom Tromey <tromey at redhat dot com>
- To: Java Patch List <java-patches at gcc dot gnu dot org>
- Date: 17 Jan 2002 10:39:29 -0700
- Subject: Patch: FYI: AWT exception "merge"
- Reply-to: tromey at redhat dot com
I'm checking this in.
I "merged" the AWT exceptions by just copying the Classpath versions.
The code was equivalent but the Classpath javadoc was better.
Note that in general when I merge I try to preserve the indentation of
whatever source I'm using as the base version. Later on I think we
can go through and systematically reindent. That's why the new code
has the "wrong" style.
Tom
Index: java/awt/AWTError.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/AWTError.java,v
retrieving revision 1.2
diff -u -r1.2 AWTError.java
--- java/awt/AWTError.java 2000/12/04 01:54:34 1.2
+++ java/awt/AWTError.java 2002/01/17 17:21:11
@@ -1,25 +1,51 @@
-/* Copyright (C) 2000 Free Software Foundation
+/* AWTError.java -- A serious AWT error occurred.
+ Copyright (C) 1999 Free Software Foundation, Inc.
- This file is part of libjava.
+This file is part of GNU Classpath.
-This software is copyrighted work licensed under the terms of the
-Libjava License. Please consult the file "LIBJAVA_LICENSE" for
-details. */
+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. */
+
+
package java.awt;
-/** An exception of this type is thrown by AWT in some situations,
- * usually when major problems are encountered.
- * @author Tom Tromey <tromey@cygnus.com>
- * @date April 8, 2000
- */
+/**
+ * This error is thrown when a critical AWT error occurs.
+ *
+ * @author Aaron M. Renn (arenn@urbanophile.com)
+ */
public class AWTError extends Error
{
- /** Make a new instance of AWTError
- * @param s Text associated with the exception
- */
- public AWTError (String s)
- {
- super (s);
- }
+
+/**
+ * Initializes a new instance of <code>AWTError</code> with the specified
+ * descriptive error message.
+ *
+ * @param message The descriptive error message.
+ */
+public
+AWTError(String message)
+{
+ super(message);
}
+
+} // class AWTError
+
Index: java/awt/AWTException.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/AWTException.java,v
retrieving revision 1.1
diff -u -r1.1 AWTException.java
--- java/awt/AWTException.java 2000/04/04 19:56:20 1.1
+++ java/awt/AWTException.java 2002/01/17 17:21:11
@@ -1,27 +1,52 @@
-/* Copyright (C) 2000 Free Software Foundation
+/* AWTException.java -- Generic AWT exception
+ Copyright (C) 1999 Free Software Foundation, Inc.
- This file is part of libgcj.
+This file is part of GNU Classpath.
-This software is copyrighted work licensed under the terms of the
-Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
-details. */
-
+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. */
+
+
package java.awt;
/**
- * @author Tom Tromey <tromey@cygnus.com>
- * @date Tue Apr 4 2000
- */
-/* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3
- * "The Java Language Specification", ISBN 0-201-63451-1
- * plus online API docs for JDK 1.2 beta from http://www.javasoft.com.
- * Status: Believed complete and correct.
- */
-
+ * This is a generic exception that indicates an error occurred in the
+ * AWT system.
+ *
+ * @author Aaron M. Renn (arenn@urbanophile.com)
+ */
public class AWTException extends Exception
{
- public AWTException (String message)
- {
- super (message);
- }
+
+/**
+ * Initializes a new instance of <code>AWTException</code> with the
+ * specified detailed error message.
+ *
+ * @param message The detailed error message.
+ */
+public
+AWTException(String message)
+{
+ super(message);
}
+
+} // class AWTException
+
Index: java/awt/IllegalComponentStateException.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/IllegalComponentStateException.java,v
retrieving revision 1.1
diff -u -r1.1 IllegalComponentStateException.java
--- java/awt/IllegalComponentStateException.java 2000/04/09 04:13:27 1.1
+++ java/awt/IllegalComponentStateException.java 2002/01/17 17:21:11
@@ -1,30 +1,64 @@
-/* Copyright (C) 2000 Free Software Foundation
+/* IllegalComponentStateException.java -- Bad component state
+ Copyright (C) 1999 Free Software Foundation, Inc.
- This file is part of libjava.
+This file is part of GNU Classpath.
-This software is copyrighted work licensed under the terms of the
-Libjava License. Please consult the file "LIBJAVA_LICENSE" for
-details. */
+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. */
+
package java.awt;
/**
- * @author Tom Tromey <tromey@cygnus.com>
- * @date April 8, 2000
- */
+ * This exception is thrown when the requested operation failed because
+ * a component was not in the proper state.
+ *
+ * @author Aaron M. Renn (arenn@urbanophile.com)
+ */
+public class IllegalComponentStateException extends IllegalStateException
+{
-/* Status: Believed complete and correct to JDK 1.2. */
+/**
+ * Initializes a new instance of <code>IllegalComponentStateException</code>
+ * with the specified detailed error message.
+ *
+ * @param message The detailed error message.
+ */
+public
+IllegalComponentStateException(String message)
+{
+ super(message);
+}
+/*************************************************************************/
-public class IllegalComponentStateException extends IllegalStateException
+/**
+ * Initializes a new instance of <code>IllegalComponentStateException</code>
+ * with no detailed error message.
+ */
+public
+IllegalComponentStateException()
{
- public IllegalComponentStateException ()
- {
- super ();
- }
-
- public IllegalComponentStateException (String s)
- {
- super (s);
- }
+ super();
}
+
+} // class IllegalComponentStateException
+