From b0fa81eea9a270f23d6ad67ca7a6d25c18d20da1 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
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
---
 libjava/gnu/java/beans/decoder/ArrayContext.java | 122 -----------------------
 1 file changed, 122 deletions(-)
 delete mode 100644 libjava/gnu/java/beans/decoder/ArrayContext.java

(limited to 'libjava/gnu/java/beans/decoder/ArrayContext.java')

diff --git a/libjava/gnu/java/beans/decoder/ArrayContext.java b/libjava/gnu/java/beans/decoder/ArrayContext.java
deleted file mode 100644
index cf4267f2779..00000000000
--- a/libjava/gnu/java/beans/decoder/ArrayContext.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/* gnu.java.beans.decoder.ArrayContext
-   Copyright (C) 2004 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 gnu.java.beans.decoder;
-
-import java.lang.reflect.Array;
-
-/** A Context implementation for a fixed size array. The array
- * elements have to be set using IndexContext instances.
- *
- * @author Robert Schuster
- */
-class ArrayContext extends AbstractContext
-{
-  private Object array;
-
-  ArrayContext(String id, Class klass, int length)
-  {
-    setId(id);
-    array = Array.newInstance(klass, length);
-  }
-
-  /* (non-Javadoc)
-   * @see gnu.java.beans.decoder.Context#addObject(java.lang.Object)
-   */
-  public void addParameterObject(Object o) throws AssemblyException
-  {
-    throw new AssemblyException(new IllegalStateException("Adding objects without an index to a fixed array is not possible."));
-  }
-
-  /* (non-Javadoc)
-   * @see gnu.java.beans.decoder.Context#reportStatement()
-   */
-  public void notifyStatement(Context outerContext)
-  {
-    // method call intentionally ignored because there is not any useful effect 
-  }
-
-  /* (non-Javadoc)
-   * @see gnu.java.beans.decoder.Context#endContext(gnu.java.beans.decoder.Context)
-   */
-  public Object endContext(Context outerContext) throws AssemblyException
-  {
-    return array;
-  }
-
-  /* (non-Javadoc)
-   * @see gnu.java.beans.decoder.Context#subContextFailed()
-   */
-  public boolean subContextFailed()
-  {
-    // returns false to indicate that assembling the array does not fail only because
-    // a subelement failed.
-    return false;
-  }
-
-  public void set(int index, Object o) throws AssemblyException
-  {
-    try
-      {
-	Array.set(array, index, o);
-      }
-    catch (ArrayIndexOutOfBoundsException aioobe)
-      {
-	throw new AssemblyException(aioobe);
-      }
-  }
-
-  public Object get(int index) throws AssemblyException
-  {
-    try
-      {
-	return Array.get(array, index);
-      }
-    catch (ArrayIndexOutOfBoundsException aioobe)
-      {
-	throw new AssemblyException(aioobe);
-      }
-  }
-
-  /* (non-Javadoc)
-   * @see gnu.java.beans.decoder.Context#getResult()
-   */
-  public Object getResult()
-  {
-    return array;
-  }
-}
-- 
cgit v1.2.3