+2001-02-07 Tom Tromey <tromey@redhat.com>
+
+ Fix for PR libgcj/1906:
+ * java/text/MessageFormat.java (setLocale): Use named class
+ literals.
+ (forName): Removed.
+ (format(Object,StringBuffer,FieldPosition)): Special case if
+ argument is an Object[].
+
2001-02-07 Bryce McKinlay <bryce@albatross.co.nz>
* java/util/Arrays.java: Removed "cmp" methods.
// MessageFormat.java - Localized message formatting.
-/* Copyright (C) 1999 Free Software Foundation
+/* Copyright (C) 1999, 2001 Free Software Foundation
This file is part of libgcj.
// Text to follow this element.
String trailer;
- // FIXME: shouldn't need this.
- Class forName (String name)
- {
- try
- {
- return Class.forName (name);
- }
- catch (ClassNotFoundException x)
- {
- }
- return null;
- }
-
// Recompute the locale-based formatter.
void setLocale (Locale loc)
{
;
else if (type.equals("number"))
{
- // FIXME: named class literal.
- // formatClass = Number.class;
- formatClass = forName ("java.lang.Number");
+ formatClass = java.lang.Number.class;
if (style == null)
format = NumberFormat.getInstance(loc);
}
else if (type.equals("time") || type.equals("date"))
{
- // FIXME: named class literal.
- // formatClass = Date.class;
- formatClass = forName ("java.util.Date");
+ formatClass = java.util.Date.class;
int val = DateFormat.DEFAULT;
if (style == null)
}
else if (type.equals("choice"))
{
- // FIXME: named class literal.
- // formatClass = Number.class;
- formatClass = forName ("java.lang.Number");
+ formatClass = java.lang.Number.class;
if (style == null)
throw new
public final StringBuffer format (Object singleArg, StringBuffer appendBuf,
FieldPosition ignore)
{
- Object[] args = new Object[1];
- args[0] = singleArg;
+ Object[] args;
+
+ if (singleArg instanceof Object[])
+ {
+ // This isn't specified in any manual, but it follows the
+ // JDK implementation.
+ args = (Object[]) singleArg;
+ }
+ else
+ {
+ args = new Object[1];
+ args[0] = singleArg;
+ }
return format (args, appendBuf, ignore);
}