From 035db16b87e0687bd77dc6a3d696bfd9be3080d1 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Thu, 17 Nov 2005 14:03:22 +0000 Subject: [multiple changes] 2005-11-17 Mark Wielaard * java/text/SimpleDateFormat.java: Removed, fully merged now. * sources.am: Regenerated. * Makefile.in: Regenerated. 2005-11-17 Sven de Marothy * java/text/SimpleDateFormat.java (computeOffset): Allow timezone to be first in the parsed String. 2005-11-17 Mark Wielaard * java/text/SimpleDateFormat.java (field, size): Make package private. 2005-11-17 Tom Tromey * java/text/SimpleDateFormat.java (compileFormat): Correctly handle quoted single quotes. PR classspath/23183. 2005-11-17 Tom Tromey * java/text/SimpleDateFormat.java (compileFormat): Reformatted. 2005-11-17 Tom Tromey * java/text/DateFormat.java (serialVersionUID): New field. 2005-11-17 Mark Wielaard * java/text/DateFormat.java (equals): Reimplement. 2005-11-17 David Gilbert * java/text/Collator.java: API doc fixes, * java/text/DateFormat.java: likewise, * java/text/DecimalFormatSymbols.java: likewise, * java/text/DateFormatSymbols.java: likewise, * java/text/SimpleDateFormat.java: likewise. 2005-11-17 Jeroen Frijters * java/text/Collator.java (getInstance(Locale)): Added default collation pattern to handle case when resource is missing and throw InternalError instead of returning null should parsing fail. From-SVN: r107121 --- libjava/java/text/Collator.java | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'libjava/java/text/Collator.java') diff --git a/libjava/java/text/Collator.java b/libjava/java/text/Collator.java index 830fd6f32f5..c1ba87e93b9 100644 --- a/libjava/java/text/Collator.java +++ b/libjava/java/text/Collator.java @@ -150,8 +150,8 @@ public abstract class Collator implements Comparator, Cloneable * Collator and the strength and decomposition rules in * effect. * - * @param str1 The first object to compare - * @param str2 The second object to compare + * @param source The first object to compare + * @param target The second object to compare * * @return A negative integer if str1 < str2, 0 if str1 == str2, or * a positive integer if str1 > str2. @@ -164,8 +164,8 @@ public abstract class Collator implements Comparator, Cloneable * equal to, or greater than the second argument. These two objects * must be String's or an exception will be thrown. * - * @param obj1 The first object to compare - * @param obj2 The second object to compare + * @param o1 The first object to compare + * @param o2 The second object to compare * * @return A negative integer if obj1 < obj2, 0 if obj1 == obj2, or * a positive integer if obj1 > obj2. @@ -208,8 +208,8 @@ public abstract class Collator implements Comparator, Cloneable * according to the collation rules for the locale of this object and * the current strength and decomposition settings. * - * @param str1 The first String to compare - * @param str2 The second String to compare + * @param source The first String to compare + * @param target The second String to compare * * @return true if the two strings are equal, * false otherwise. @@ -256,7 +256,7 @@ public abstract class Collator implements Comparator, Cloneable * comparisons against a string might be performed multiple times, such * as during a sort operation. * - * @param str The String to convert. + * @param source The String to convert. * * @return A CollationKey for the specified String. */ @@ -292,7 +292,7 @@ public abstract class Collator implements Comparator, Cloneable * specified locale. If no Collator exists for the desired * locale, a Collator for the default locale will be returned. * - * @param locale The desired localed to load a Collator for. + * @param loc The desired localed to load a Collator for. * * @return A Collator for the requested locale */ @@ -308,7 +308,8 @@ public abstract class Collator implements Comparator, Cloneable } catch (MissingResourceException x) { - return null; + pattern = "<0<1<2<3<4<5<6<7<8<9