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

1 files changed, 0 insertions, 139 deletions

diff --git a/libjava/java/beans/SimpleBeanInfo.java b/libjava/java/beans/SimpleBeanInfo.java
deleted file mode 100644
index cfb9604..0000000
--- a/libjava/java/beans/SimpleBeanInfo.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/* java.beans.SimpleBeanInfo
-   Copyright (C) 1998 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.beans;
-
-import java.awt.Image;
-import java.awt.Toolkit;
-
-/**
- ** SimpleBeanInfo is a class you may extend to more easily
- ** provide select information to the Introspector.  It
- ** implements all of the methods in BeanInfo by returning
- ** null and forces the Introspector to behave exactly as
- ** if there were no BeanInfo class at all (Introspecting
- ** everything).<P>
- **
- ** Overriding one or two of these functions
- ** to give explicit information on only those things you
- ** wish to give explicit information is perfectly safe,
- ** and even desirable.<P>
- **
- ** See the BeanInfo class for information on what the
- ** various methods actually do.
- **
- ** @author John Keiser
- ** @since JDK1.1
- ** @version 1.1.0, 29 Jul 1998
- ** @see java.beans.BeanInfo
- **/
-
-public class SimpleBeanInfo implements BeanInfo {
-	/** Force Introspection of the general bean info.
-	 ** @return <CODE>null</CODE>.
-	 **/
-	public BeanDescriptor getBeanDescriptor() {
-		return null;
-	}
-
-	/** Force Introspection of the events this Bean type
-	 ** fires.
-	 ** @return <CODE>null</CODE>
-	 **/
-	public EventSetDescriptor[] getEventSetDescriptors() {
-		return null;
-	}
-
-	/** Say that there is no "default" event set.
-	 ** @return <CODE>-1</CODE>.
-	 **/
-	public int getDefaultEventIndex() {
-		return -1;
-	}
-
-	/** Force Introspection of the Bean properties.
-	 ** @return <CODE>null</CODE>.
-	 **/
-	public PropertyDescriptor[] getPropertyDescriptors() {
-		return null;
-	}
-
-	/** Say that there is no "default" property.
-	 ** @return <CODE>-1</CODE>.
-	 **/
-	public int getDefaultPropertyIndex() {
-		return -1;
-	}
-
-	/** Force Introspection of the Bean's methods.
-	 ** @return <CODE>null</CODE>.
-	 **/
-	public MethodDescriptor[] getMethodDescriptors() {
-		return null;
-	}
-
-	/** Tell the Introspector to go look for other BeanInfo
-	 ** itself.
-	 ** @return <CODE>null</CODE>.
-	 **/
-	public BeanInfo[] getAdditionalBeanInfo() {
-		return null;
-	}
-
-	/** Say that this Bean has no icons.
-	 ** @param iconType the type of icon
-	 ** @return <CODE>null</CODE>.
-	 **/
-	public Image getIcon(int iconType) {
-		return null;
-	}
-
-	/** Helper method to load an image using the Bean class
-	 ** getResource() method on the BeanInfo class (using
-	 ** getClass(), since you'll extend this class to get
-	 ** the BeanInfo).  Basically it's assumed that the Bean
-	 ** and its BeanInfo are both loaded by the same
-	 ** ClassLoader, generally a reasonable assumption.
-	 ** @param location the URL relative
-	 ** @return the Image in question.
-	 **/
-	public Image loadImage(String location) {
-		return Toolkit.getDefaultToolkit().getImage(getClass().getResource(location));
-	}
-}
-