From b0fa81eea9a270f23d6ad67ca7a6d25c18d20da1 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 16 Jul 2005 01:27:14 +0000 Subject: Major merge with Classpath. Removed many duplicate files. * HACKING: Updated.x * classpath: Imported new directory. * standard.omit: New file. * Makefile.in, aclocal.m4, configure: Rebuilt. * sources.am: New file. * configure.ac: Run Classpath configure script. Moved code around to support. Disable xlib AWT peers (temporarily). * Makefile.am (SUBDIRS): Added 'classpath' (JAVAC): Removed. (AM_CPPFLAGS): Added more -I options. (BOOTCLASSPATH): Simplified. Completely redid how sources are built. Include sources.am. * include/Makefile.am (tool_include__HEADERS): Removed jni.h. * include/jni.h: Removed (in Classpath). * scripts/classes.pl: Updated to look at built classes. * scripts/makemake.tcl: New file. * testsuite/libjava.jni/jni.exp (gcj_jni_compile_c_to_so): Added -I options. (gcj_jni_invocation_compile_c_to_binary): Likewise. From-SVN: r102082 --- .../java/rmi/activation/ActivationException.java | 122 --------------------- 1 file changed, 122 deletions(-) delete mode 100644 libjava/java/rmi/activation/ActivationException.java (limited to 'libjava/java/rmi/activation/ActivationException.java') diff --git a/libjava/java/rmi/activation/ActivationException.java b/libjava/java/rmi/activation/ActivationException.java deleted file mode 100644 index 418f438..0000000 --- a/libjava/java/rmi/activation/ActivationException.java +++ /dev/null @@ -1,122 +0,0 @@ -/* ActivationException.java -- general Activation exception - Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. - -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., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301 USA. - -Linking this library statically or dynamically with other modules is -making a combined work based on this library. Thus, the terms and -conditions of the GNU General Public License cover the whole -combination. - -As a special exception, the copyright holders of this library give you -permission to link this library with independent modules to produce an -executable, regardless of the license terms of these independent -modules, and to copy and distribute the resulting executable under -terms of your choice, provided that you also meet, for each linked -independent module, the terms and conditions of the license of that -module. An independent module is a module which is not derived from -or based on this library. If you modify this library, you may extend -this exception to your version of the library, but you are not -obligated to do so. If you do not wish to do so, delete this -exception statement from your version. */ - -package java.rmi.activation; - -/** - * General exception class for java.rmi.activation. - * - * @author unknown - * @since 1.2 - * @status updated to 1.4 - */ -public class ActivationException extends Exception -{ - /** - * Compatible with JDK 1.2+. - */ - private static final long serialVersionUID = -4320118837291406071L; - - /** - * The cause of this exception. This pre-dates the exception chaining - * of Throwable; and although you can change this field, you are wiser - * to leave it alone. - * - * @serial the exception cause - */ - public Throwable detail; - - /** - * Create an exception with no message, and cause initialized to null. - */ - public ActivationException() - { - this(null, null); - } - - /** - * Create an exception with the given message, and cause initialized to null. - * - * @param s the message - */ - public ActivationException(String s) - { - this(s, null); - } - - /** - * Create an exception with the given message and cause. - * - * @param s the message - * @param ex the cause - */ - public ActivationException(String s, Throwable ex) - { - super(s, ex); - detail = ex; - } - - /** - * This method returns a message indicating what went wrong, in this - * format: - * super.getMessage() + (detail == null ? "" - * : "; nested exception is:\n\t" + detail). - * - * @return the chained message - */ - public String getMessage() - { - if (detail == this || detail == null) - return super.getMessage(); - return super.getMessage() + "; nested exception is:\n\t" + detail; - } - - /** - * Returns the cause of this exception. Note that this may not be the - * original cause, thanks to the detail field being public - * and non-final (yuck). However, to avoid violating the contract of - * Throwable.getCause(), this returns null if detail == this, - * as no exception can be its own cause. - * - * @return the cause - * @since 1.4 - */ - public Throwable getCause() - { - return detail == this ? null : detail; - } -} -- cgit v1.1