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

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

diff --git a/libjava/javax/print/attribute/standard/PrinterMakeAndModel.java b/libjava/javax/print/attribute/standard/PrinterMakeAndModel.java
deleted file mode 100644
index c3f3a63..0000000
--- a/libjava/javax/print/attribute/standard/PrinterMakeAndModel.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/* PrinterMakeAndModel.java -- 
-   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 javax.print.attribute.standard;
-
-import java.util.Locale;
-
-import javax.print.attribute.PrintServiceAttribute;
-import javax.print.attribute.TextSyntax;
-
-/**
- * @author Michael Koch (konqueror@gmx.de)
- */
-public final class PrinterMakeAndModel extends TextSyntax
-  implements PrintServiceAttribute
-{
-  private static final long serialVersionUID = 4580461489499351411L;
-
-  /**
-   * Creates a <code>PrinterMakeAndModel</code> object.
-   *
-   * @param makeAndModel the make and model string
-   * @param locale the locale of the make and model, null means default locale
-   *
-   * @exception NullPointerException if makeAndModel is null
-   */
-  public PrinterMakeAndModel(String makeAndModel, Locale locale)
-  {
-    super(makeAndModel, locale);
-  }
-
-  /**
-   * Tests of obj is equal to this object.
-   *
-   * @param obj the object to test
-   *
-   * @return true if both objects are equal, false otherwise.
-   */
-  public boolean equals(Object obj)
-  {
-    if(! (obj instanceof PrinterMakeAndModel))
-      return false;
-
-    return super.equals(obj);
-  }
-
-  /**
-   * Returns category of this class.
-   *
-   * @return the class <code>PrinterMakeAndModel</code> itself
-   */
-  public Class getCategory()
-  {
-    return PrinterMakeAndModel.class;
-  }
-
-  /**
-   * Returns name of this class.
-   *
-   * @return the string "printer-make-and-model"
-   */
-  public String getName()
-  {
-    return "printer-make-and-model";
-  }
-}
-- 
cgit v1.1