SimpleDateFormat.java: Re-merged with Classpath.
* java/text/SimpleDateFormat.java: Re-merged with Classpath. * gnu/gcj/text/LocaleData.java, gnu/gcj/text/LocaleData_en.java, gnu/gcj/text/LocaleData_en_US.java: Removed. * java/text/DateFormatSymbols.java (clone): Use Classpath implementation. (equals): Simplified. (DateFormatSymbols): Look in gnu.java.locale for information. (DateFormatSymbols(DateFormatSymbols)): Removed. (safeGetResource): Removed. (DateFormatSymbols): Throws MissingResourceException. (ampmsDefault, erasDefault, localPatternCharsDefault, monthsDefault, shortMonthsDefault, shortWeekdaysDefault, weekdaysDefault, zoneStringsDefault): Removed. * java/text/Collator.java (getAvailableLocales): Use modified Classpath implementation. (getInstance): Look in gnu.java.locale for information. (clone): Rewrote. * java/text/MessageFormat.java: Reindented. (clone): Rewrote. * java/text/FieldPosition.java: Merged with Classpath. * java/text/ParsePosition.java: Merged with Classpath. * java/text/Format.java: Merged with Classpath. * java/text/StringCharacterIterator.java (StringCharacterIterator(StringCharacterIterator,int,int)): New constructor from Classpath. * java/text/Annotation.java, java/text/AttributedCharacterIterator.java, java/text/AttributedString.java, java/text/AttributedStringIterator.java: New from Classpath. * java/text/CharacterIterator.java: Copied from Classpath. * java/text/ChoiceFormat.java: Reindented. (clone): Removed. * gnu/java/text/BaseBreakIterator.java, gnu/java/text/CharacterBreakIterator.java, gnu/java/text/LineBreakIterator.java, gnu/java/text/LocaleData_en.java, gnu/java/text/LocaleData_en_US.java, gnu/java/text/SentenceBreakIterator.java, gnu/java/text/WordBreakIterator.java: Renamed from gnu/gcj/text/*. * gnu/gcj/text/BaseBreakIterator.java (last): Advance past final character. * java/text/BreakIterator.java (getAvailableLocales): Use Classpath implementation. (getInstance): Look in gnu.java.locale for information. (getCharacterInstance, getLineInstance, getSentenceInstance, getWordInstance): Look in gnu.java.text for implementations. * java/text/DecimalFormatSymbols.java: Reindented (clone): Use Classpath implementation. (DecimalFormatSymbols(DecimalFormatSymbols)): Removed. (DecimalFormatSymbols(Locale)): Look in gnu.java.locale for information. * java/text/DateFormat.java: Merged with Classpath. (getAvailableLocales): Use Classpath implementation. (format(Object,StringBuffer,FieldPosition)): Minor cleanup. (computeInstance): Look in gnu.java.locale for information. * java/text/NumberFormat.java: Reindented. (computeInstance): Look in gnu.java.locale for information. (getAvailableLocales): Use implementation from Classpath. (setMaximumIntegerDigits): Likewise. (setMinimumIntegerDigits): Likewise. (setMaximumFractionDigits): Likewise. (clone): Removed. * java/text/DecimalFormat.java: Reindented. * gnu/java/locale/LocaleInformation_en.java: Copied from Classpath. * gnu/java/locale/LocaleInformation_en_US.java: Copied from Classpath. * Makefile.in: Rebuilt. * Makefile.am (ordinary_java_source_files): Added all new files. (ordinary_java_source_files): Renamed or removed gnu/gcj/text/*. * java/security/spec/AlgorithmParameterSpec.java, java/security/spec/KeySpec.java: Re-merged with Classpath. From-SVN: r45390
This commit is contained in:
parent
45932d27fb
commit
a1f4e5ed0a
35 changed files with 5666 additions and 2403 deletions
|
@ -1,65 +1,155 @@
|
|||
/* Copyright (C) 1998, 1999 Free Software Foundation
|
||||
/* FieldPosition.java -- Keeps track of field positions while formatting
|
||||
Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of libgcj.
|
||||
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., 59 Temple Place, Suite 330, Boston, MA
|
||||
02111-1307 USA.
|
||||
|
||||
As a special exception, if you link this library with other files to
|
||||
produce an executable, this library does not by itself cause the
|
||||
resulting executable to be covered by the GNU General Public License.
|
||||
This exception does not however invalidate any other reasons why the
|
||||
executable file might be covered by the GNU General Public License. */
|
||||
|
||||
This software is copyrighted work licensed under the terms of the
|
||||
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
|
||||
details. */
|
||||
|
||||
package java.text;
|
||||
|
||||
/**
|
||||
* This class is used by the java.text formatting classes to track
|
||||
* field positions. A field position is defined by an identifier value
|
||||
* and begin and end index positions. The formatting classes in java.text
|
||||
* typically define constant values for the field identifiers.
|
||||
*
|
||||
* @author Aaron M. Renn (arenn@urbanophile.com)
|
||||
* @author Per Bothner <bothner@cygnus.com>
|
||||
* @date October 25, 1998.
|
||||
*/
|
||||
/* Written using "Java Class Libraries", 2nd edition, plus online
|
||||
* API docs for JDK 1.2 beta from http://www.javasoft.com.
|
||||
* Status: Believed complete and correct.
|
||||
* Includes JDK 1.2 methods.
|
||||
*/
|
||||
|
||||
public class FieldPosition
|
||||
{
|
||||
int field;
|
||||
int beginIndex;
|
||||
int endIndex;
|
||||
/**
|
||||
* This is the field identifier value.
|
||||
*/
|
||||
private int field_id;
|
||||
|
||||
public FieldPosition (int field)
|
||||
/**
|
||||
* This is the beginning index of the field.
|
||||
*/
|
||||
private int begin;
|
||||
|
||||
/**
|
||||
* This is the ending index of the field.
|
||||
*/
|
||||
private int end;
|
||||
|
||||
/**
|
||||
* This method initializes a new instance of <code>FieldPosition</code> to
|
||||
* have the specified field id.
|
||||
*
|
||||
* @param field_id The field identifier value.
|
||||
*/
|
||||
public FieldPosition (int field_id)
|
||||
{
|
||||
this.field = field;
|
||||
this.field_id = field_id;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method returns the field identifier value for this object.
|
||||
*
|
||||
* @return The field identifier.
|
||||
*/
|
||||
public int getField ()
|
||||
{
|
||||
return field;
|
||||
return field_id;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method returns the beginning index for this field.
|
||||
*
|
||||
* @return The beginning index.
|
||||
*/
|
||||
public int getBeginIndex ()
|
||||
{
|
||||
return beginIndex;
|
||||
return begin;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method sets the beginning index of this field to the specified value.
|
||||
*
|
||||
* @param begin The new beginning index.
|
||||
*/
|
||||
public void setBeginIndex (int begin)
|
||||
{
|
||||
this.begin = begin;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method returns the ending index for the field.
|
||||
*
|
||||
* @return The ending index.
|
||||
*/
|
||||
public int getEndIndex ()
|
||||
{
|
||||
return endIndex;
|
||||
return end;
|
||||
}
|
||||
|
||||
public void setBeginIndex (int index)
|
||||
/**
|
||||
* This method sets the ending index of this field to the specified value.
|
||||
*
|
||||
* @param end The new ending index.
|
||||
*/
|
||||
public void setEndIndex (int end)
|
||||
{
|
||||
beginIndex = index;
|
||||
}
|
||||
|
||||
public void setEndIndex (int index)
|
||||
{
|
||||
endIndex = index;
|
||||
this.end = end;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method tests this object for equality against the specified object.
|
||||
* The objects will be considered equal if and only if:
|
||||
* <p>
|
||||
* <ul>
|
||||
* <li>The specified object is not <code>null</code>.
|
||||
* <li>The specified object is an instance of <code>FieldPosition</code>.
|
||||
* <li>The specified object has the same field identifier and beginning
|
||||
* and ending index as this object.
|
||||
* </ul>
|
||||
*
|
||||
* @param obj The object to test for equality to this object.
|
||||
*
|
||||
* @return <code>true</code> if the specified object is equal to
|
||||
* this object, <code>false</code> otherwise.
|
||||
*/
|
||||
public boolean equals (Object obj)
|
||||
{
|
||||
if (! (obj instanceof FieldPosition))
|
||||
return false;
|
||||
FieldPosition other = (FieldPosition) obj;
|
||||
return (field == other.field
|
||||
&& beginIndex == other.beginIndex && endIndex == other.endIndex);
|
||||
|
||||
FieldPosition fp = (FieldPosition) obj;
|
||||
return (field_id == fp.field_id
|
||||
&& begin == fp.begin
|
||||
&& end == fp.end);
|
||||
}
|
||||
|
||||
/**
|
||||
* This method returns a <code>String</code> representation of this
|
||||
* object.
|
||||
*
|
||||
* @return A <code>String</code> representation of this object.
|
||||
*/
|
||||
public String toString ()
|
||||
{
|
||||
return (getClass ().getName () + "[field=" + getField () + ",beginIndex="
|
||||
+ getBeginIndex () + ",endIndex=" + getEndIndex () + "]");
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue