mirror of
git://gcc.gnu.org/git/gcc.git
synced 2024-12-24 04:58:57 +08:00
a0e894a8cc
* java/lang/StringBuffer.java (ensureCapacity): Don't resize vector when shared. * java/util/Locale.java (Locale(String,String)): Implement in terms of 3-argument version; variant now defaults to empty string. (toString): Assume variant is not null. (equals): Assume all strings are not null. (Locale): Throw NullPointerException if any argument is null. * java/util/ResourceBundle.java (getBundle): Don't try the base name; now implicit in partialGetBundle call. (trySomeGetBundle): Search for parent bundles and call setParent as required. (partialGetBundle): Added `langStop' argument. Use `Locale.toString' to compute bundleName. (resource_cache): New static field. (partialGetBundle): Cache the returned resource bundle. Now synchronized. * gnu/gcj/text/LocaleData_en.java (contents): [collatorRule] Added missing `<'. * mauve-libgcj: Enable Collator and RuleBasedCollator. * java/text/natCollator.cc (decomposeCharacter): `base' now `const'. * Makefile.in: Rebuilt. * Makefile.am (ordinary_java_source_files): Added CollationElementIterator, CollationKey, Collator, RuleBasedCollator. (nat_source_files): Added natCollator.cc. * java/text/RuleBasedCollator.java (ceiNext): No longer static. (compare): Pass `this' to CollationElementIterator constructor. (getCollationElementIterator): Likewise. (ceiNext): Fix off-by-one error when finding initial substring. (next): Correctly mask off bits when computing return value. Fixed return values when one string is shorter than the other. * java/text/CollationElementIterator.java (collator): New field. (CollationElementIterator): Added collator argument. (next): Call ceiNext on collator object. From-SVN: r26707
82 lines
2.5 KiB
Java
82 lines
2.5 KiB
Java
// Generic English locale data for java.text.
|
|
|
|
/* Copyright (C) 1999 Cygnus Solutions
|
|
|
|
This file is part of libgcj.
|
|
|
|
This software is copyrighted work licensed under the terms of the
|
|
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
|
|
details. */
|
|
|
|
package gnu.gcj.text;
|
|
|
|
import java.util.ListResourceBundle;
|
|
|
|
/**
|
|
* @author Tom Tromey <tromey@cygnus.com>
|
|
* @date March 4, 1999
|
|
*/
|
|
|
|
public final class LocaleData_en extends ListResourceBundle
|
|
{
|
|
// These are for DateFormatSymbols.
|
|
static final String[] ampmsDefault = {"AM", "PM" };
|
|
static final String[] erasDefault = {"BC", "AD" };
|
|
static final String localPatternCharsDefault = "GyMdkHmsSEDFwWahKz";
|
|
static final String[] monthsDefault = {
|
|
"January", "February", "March", "April", "May", "June",
|
|
"July", "August", "September", "October", "November", "December", ""
|
|
};
|
|
static final String[] shortMonthsDefault = {
|
|
"Jan", "Feb", "Mar", "Apr", "May", "Jun",
|
|
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec", ""
|
|
};
|
|
static final String[] shortWeekdaysDefault = {
|
|
"", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
|
|
};
|
|
static final String[] weekdaysDefault = {
|
|
"", "Sunday", "Monday", "Tuesday",
|
|
"Wednesday", "Thursday", "Friday", "Saturday"
|
|
};
|
|
|
|
private static final Object[][] contents =
|
|
{
|
|
// These are for DecimalFormatSymbols.
|
|
{ "decimalSeparator", "." },
|
|
{ "digit", "#" },
|
|
{ "exponential", "E" },
|
|
{ "groupingSeparator", "," },
|
|
{ "infinity", "\u221e" },
|
|
{ "minusSign", "-" },
|
|
{ "NaN", "\ufffd" },
|
|
{ "patternSeparator", ";" },
|
|
{ "percent", "%" },
|
|
{ "perMill", "\u2030" },
|
|
{ "zeroDigit", "0" },
|
|
|
|
// These are for NumberFormat.
|
|
{ "numberFormat", "#,##0.###" },
|
|
{ "percentFormat", "#,##0%" },
|
|
|
|
// These are for DateFormatSymbols.
|
|
{ "ampm", ampmsDefault },
|
|
{ "eras", erasDefault },
|
|
{ "datePatternChars", localPatternCharsDefault },
|
|
{ "months", monthsDefault },
|
|
{ "shortMonths", shortMonthsDefault },
|
|
{ "shortWeekdays", shortWeekdaysDefault },
|
|
{ "weekdays", weekdaysDefault },
|
|
|
|
// For RuleBasedCollator.
|
|
// FIXME: this is nowhere near complete.
|
|
// In particular we must mark accents as ignorable,
|
|
// and probably other things as well.
|
|
{ "collatorRule", "< 0 < 1 < 2 < 3 < 4 < 5 < 6 < 7 < 8 < 9 < a,A < b,B < c,C < d,D < e,E < f,F < g,G < h,H < i,I < j,J < k,K < l,L < m,M < n,N < o,O < p,P < q,Q < r,R < s,S < t,T < u,U < v,V < w,W < x,X < y,Y < z,Z" }
|
|
};
|
|
|
|
protected Object[][] getContents ()
|
|
{
|
|
return contents;
|
|
}
|
|
}
|