From b0fa81eea9a270f23d6ad67ca7a6d25c18d20da1 Mon Sep 17 00:00:00 2001 From: Tom Tromey 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/java/text/Format.java | 181 ------------------------------------------ 1 file changed, 181 deletions(-) delete mode 100644 libjava/java/text/Format.java (limited to 'libjava/java/text/Format.java') diff --git a/libjava/java/text/Format.java b/libjava/java/text/Format.java deleted file mode 100644 index 38fda34ff64..00000000000 --- a/libjava/java/text/Format.java +++ /dev/null @@ -1,181 +0,0 @@ -/* Format.java -- Abstract superclass for formatting/parsing strings. - Copyright (C) 1998, 1999, 2000, 2001, 2003, 2005 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.text; - -import gnu.java.text.FormatCharacterIterator; - -import java.io.Serializable; - -/** - * This class is the abstract superclass of classes that format and parse - * data to/from Strings. It is guaranteed that any - * String produced by a concrete subclass of Format - * will be parseable by that same subclass. - *

- * In addition to implementing the abstract methods in this class, subclasses - * should provide static factory methods of the form - * getInstance() and getInstance(Locale) if the - * subclass loads different formatting/parsing schemes based on locale. - * These subclasses should also implement a static method called - * getAvailableLocales() which returns an array of - * available locales in the current runtime environment. - * - * @author Aaron M. Renn (arenn@urbanophile.com) - * @author Per Bothner (bothner@cygnus.com) - */ -public abstract class Format implements Serializable, Cloneable -{ - /** - * For compatability with Sun's JDK 1.4.2 rev. 5 - */ - static final long serialVersionUID = -299282585814624189L; - - public static class Field extends AttributedCharacterIterator.Attribute - { - static final long serialVersionUID = 276966692217360283L; - - protected Field(String name) - { - super(name); - } - } - - /** - * This method initializes a new instance of Format. - * It performs no actions, but acts as a default constructor for - * subclasses. - */ - public Format () - { - } - - /** - * This method formats an Object into a String. - * - * @param obj The Object to format. - * - * @return The formatted String. - * - * @exception IllegalArgumentException If the Object - * cannot be formatted. - */ - public final String format(Object obj) throws IllegalArgumentException - { - StringBuffer sb = new StringBuffer (); - format (obj, sb, new FieldPosition (0)); - return sb.toString (); - } - - /** - * This method formats an Object into a String and - * appends the String to a StringBuffer. - * - * @param obj The Object to format. - * @param sb The StringBuffer to append to. - * @param pos The desired FieldPosition, which is also - * updated by this call. - * - * @return The updated StringBuffer. - * - * @exception IllegalArgumentException If the Object - * cannot be formatted. - */ - public abstract StringBuffer format (Object obj, StringBuffer sb, - FieldPosition pos) - throws IllegalArgumentException; - - /** - * This method parses a String and converts the parsed - * contents into an Object. - * - * @param str The String to parse. - * - * @return The resulting Object. - * - * @exception ParseException If the String cannot be parsed. - */ - public Object parseObject (String str) throws ParseException - { - ParsePosition pos = new ParsePosition(0); - Object result = parseObject (str, pos); - if (result == null) - { - int index = pos.getErrorIndex(); - if (index < 0) - index = pos.getIndex(); - throw new ParseException("parseObject failed", index); - } - return result; - } - - /** - * This method parses a String and converts the parsed - * contents into an Object. - * - * @param str The String to parse. - * @param pos The starting parse index on input, the ending parse - * index on output. - * - * @return The parsed Object, or null in - * case of error. - */ - public abstract Object parseObject (String str, ParsePosition pos); - - public AttributedCharacterIterator formatToCharacterIterator(Object obj) - { - return new FormatCharacterIterator(format(obj), null, null); - } - - /** - * Creates a copy of this object. - * - * @return The copied Object. - */ - public Object clone () - { - try - { - return super.clone (); - } - catch (CloneNotSupportedException e) - { - return null; - } - } -} -- cgit v1.2.3