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/javax/print/attribute/EnumSyntax.java | 146 --------------------------
 1 file changed, 146 deletions(-)
 delete mode 100644 libjava/javax/print/attribute/EnumSyntax.java

(limited to 'libjava/javax/print/attribute/EnumSyntax.java')

diff --git a/libjava/javax/print/attribute/EnumSyntax.java b/libjava/javax/print/attribute/EnumSyntax.java
deleted file mode 100644
index 3ed79fc..0000000
--- a/libjava/javax/print/attribute/EnumSyntax.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/* EnumSyntax.java -- 
-   Copyright (C) 2003 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 javax.print.attribute;
-
-import java.io.Serializable;
-
-/**
- * @author Michael Koch
- */
-public abstract class EnumSyntax implements Cloneable, Serializable
-{
-  private static final long serialVersionUID = -2739521845085831642L;
-  
-  private int value;
-
-  /**
-   * Creates a <code>EnumSyntax</code> object.
-   *
-   * @param value the value to set
-   */
-  protected EnumSyntax(int value)
-  {
-    this.value = value;
-  }
-
-  /**
-   * Returns the value of this object.
-   *
-   * @return the value
-   */
-  public int getValue()
-  {
-    return value;
-  }
-
-  /**
-   * Clones this object.
-   *
-   * @return a clone of this object
-   */
-  public Object clone()
-  {
-    try
-      {
-        return super.clone();
-      }
-    catch (CloneNotSupportedException e)
-      {
-        // Cannot happen as we implement java.lang.Cloneable.
-        return null;
-      }
-  }
-
-  /**
-   * Returns the hashcode for this object.
-   *
-   * @return the hashcode
-   */
-  public int hashCode()
-  {
-    return value;
-  }
-
-  /**
-   * Returns the string representation for this object.
-   *
-   * @return the string representation
-   */
-  public String toString()
-  {
-    int index = value - getOffset();
-    String[] table = getStringTable();
-
-    if (table != null
-        && index >= 0
-        && index < table.length)
-      return table[index];
-    
-    return "" + value;
-  }
-
-  /**
-   * Returns a table with the enumeration values represented as strings
-   * for this object.
-   *
-   * The default implementation just returns null.
-   *
-   * @return the enumeration values as strings
-   */
-  protected String[] getStringTable()
-  {
-    return null;
-  }
-
-  /**
-   * Returns a table with the enumeration values for this object.
-   *
-   * The default implementation just returns null.
-   *
-   * @return the enumeration values
-   */
-  protected EnumSyntax[] getEnumValueTable()
-  {
-    return null;
-  }
-
-  protected int getOffset()
-  {
-    return 0;
-  }
-}
-- 
cgit v1.1