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, 241 deletions

diff --git a/libjava/java/awt/image/DataBufferInt.java b/libjava/java/awt/image/DataBufferInt.java
deleted file mode 100644
index d4636ca..0000000
--- a/libjava/java/awt/image/DataBufferInt.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/* Copyright (C) 2000, 2002  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., 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.awt.image;
-
-/* This is one of several classes that are nearly identical. Maybe we
-   should have a central template and generate all these files. This
-   is one of the cases where templates or macros would have been
-   useful to have in Java.
-
-   This file has been created using search-replace. My only fear is
-   that these classes will grow out-of-sync as of a result of changes
-   that are not propagated to the other files. As always, mirroring
-   code is a maintenance nightmare.  */
-
-/**
- * @author Rolf W. Rasmussen (rolfwr@ii.uib.no)
- */
-public final class DataBufferInt extends DataBuffer
-{
-  private int[] data;
-  private int[][] bankData;
-  
-  /**
-   * Creates a new data buffer with a single data bank containing the 
-   * specified number of <code>int</code> elements.
-   * 
-   * @param size the number of elements in the data bank.
-   */
-  public DataBufferInt(int size)
-  {
-    super(TYPE_INT, size, 1, 0);
-    bankData = new int[1][];
-    data = new int[size];
-    bankData[0] = data;
-  }
-
-  /**
-   * Creates a new data buffer with the specified number of data banks, 
-   * each containing the specified number of <code>int</code> elements.
-   * 
-   * @param size the number of elements in the data bank.
-   * @param numBanks the number of data banks.
-   */
-  public DataBufferInt(int size, int numBanks)
-  {
-    super(TYPE_INT, size, numBanks);
-    bankData = new int[numBanks][size];
-    data = bankData[0];
-  }
-  
-  /**
-   * Creates a new data buffer backed by the specified data bank.
-   * <p>
-   * Note: there is no exception when <code>dataArray</code> is 
-   * <code>null</code>, but in that case an exception will be thrown
-   * later if you attempt to access the data buffer.
-   * 
-   * @param dataArray the data bank.
-   * @param size the number of elements in the data bank.
-   */
-  public DataBufferInt(int[] dataArray, int size)
-  {
-    super(TYPE_INT, size, 1, 0);
-    bankData = new int[1][];
-    data = dataArray;
-    bankData[0] = data;
-  }
-    
-  /**
-   * Creates a new data buffer backed by the specified data bank, with
-   * the specified offset to the first element.
-   * <p>
-   * Note: there is no exception when <code>dataArray</code> is 
-   * <code>null</code>, but in that case an exception will be thrown
-   * later if you attempt to access the data buffer.
-   * 
-   * @param dataArray the data bank.
-   * @param size the number of elements in the data bank.
-   * @param offset the offset to the first element in the array.
-   */
-  public DataBufferInt(int[] dataArray, int size, int offset)
-  {
-    super(TYPE_INT, size, 1, offset);
-    bankData = new int[1][];
-    data = dataArray;
-    bankData[0] = data;
-  }
-  
-  /**
-   * Creates a new data buffer backed by the specified data banks.
-   * 
-   * @param dataArray the data banks.
-   * @param size the number of elements in the data bank.
-   * 
-   * @throws NullPointerException if <code>dataArray</code> is 
-   *         <code>null</code>.
-   */
-  public DataBufferInt(int[][] dataArray, int size)
-  {
-    super(TYPE_INT, size, dataArray.length);
-    bankData = dataArray;
-    data = bankData[0];
-  }
-  
-  /**
-   * Creates a new data buffer backed by the specified data banks, with
-   * the specified offsets to the first element in each bank.
-   * 
-   * @param dataArray the data banks.
-   * @param size the number of elements in the data bank.
-   * @param offsets the offsets to the first element in each data bank.
-   * 
-   * @throws NullPointerException if <code>dataArray</code> is 
-   *         <code>null</code>.
-   */
-  public DataBufferInt(int[][] dataArray, int size, int[] offsets)
-  {
-    super(TYPE_INT, size, dataArray.length, offsets);
-    bankData = dataArray;
-    data = bankData[0];
-  }
-
-  /**
-   * Returns the first data bank.
-   * 
-   * @return The first data bank.
-   */
-  public int[] getData()
-  {
-    return data;
-  }
-    
-  /**
-   * Returns a data bank.
-   * 
-   * @param bank the bank index.
-   * @return A data bank.
-   */
-  public int[] getData(int bank)
-  {
-    return bankData[bank];
-  }
-  
-  /**
-   * Returns the array underlying this <code>DataBuffer</code>.
-   * 
-   * @return The data banks.
-   */
-  public int[][] getBankData()
-  {
-    return bankData;
-  }
-  
-  /**
-   * Returns an element from the first data bank.  The <code>offset</code> is
-   * added to the specified index before accessing the underlying data array.
-   * 
-   * @param i the element index.
-   * @return The element.
-   */
-  public int getElem(int i)
-  {
-    return data[i+offset];
-  }
-
-  /**
-   * Returns an element from a particular data bank.  The <code>offset</code> 
-   * is added to the specified index before accessing the underlying data 
-   * array.
-   * 
-   * @param bank the bank index.
-   * @param i the element index.
-   * @return The element.
-   */
-  public int getElem(int bank, int i)
-  {
-    // get unsigned int as int
-    return bankData[bank][i+offsets[bank]];
-  }
-
-  /**
-   * Sets an element in the first data bank.  The offset (specified in the
-   * constructor) is added to <code>i</code> before updating the underlying
-   * data array.
-   * 
-   * @param i the element index.
-   * @param val the new element value.
-   */
-  public void setElem(int i, int val)
-  {
-    data[i+offset] = val;
-  }
-  
-  /**
-   * Sets an element in a particular data bank.  The offset (specified in the
-   * constructor) is added to <code>i</code> before updating the underlying
-   * data array.
-   * 
-   * @param bank the data bank index.
-   * @param i the element index.
-   * @param val the new element value.
-   */
-  public void setElem(int bank, int i, int val)
-  {
-    bankData[bank][i+offsets[bank]] = val;
-  }
-}