From aa5661e6b41e781f2e7b6b3e3fc163174f0687a8 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 2 Jul 2002 19:43:06 +0000 Subject: 2002-07-02 Tom Tromey David Hovemeyer * java/text/ChoiceFormat.java (format(double,StringBuffer,FieldPosition)): Fix fencepost error in check loop. * java/text/MessageFormat.java (format(Object[],StringBuffer,FieldPosition): Pass all arguments to MessageFormat. Co-Authored-By: David Hovemeyer From-SVN: r55191 --- libjava/java/text/MessageFormat.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'libjava/java/text/MessageFormat.java') diff --git a/libjava/java/text/MessageFormat.java b/libjava/java/text/MessageFormat.java index d31d95b6bea..f5ee3492974 100644 --- a/libjava/java/text/MessageFormat.java +++ b/libjava/java/text/MessageFormat.java @@ -1,5 +1,5 @@ /* MessageFormat.java - Localized message formatting. - Copyright (C) 1999, 2001 Free Software Foundation, Inc. + Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -373,17 +373,14 @@ public class MessageFormat extends Format if (formatter instanceof ChoiceFormat) { StringBuffer buf = new StringBuffer (); - // FIXME: don't actually know what is correct here. - // Can a sub-format refer to any argument, or just - // the single argument passed to it? Must test - // against JDK. formatter.format(thisArg, buf, ignore); MessageFormat mf = new MessageFormat (); mf.setLocale(locale); mf.applyPattern(buf.toString()); - formatter = mf; + mf.format(arguments, appendBuf, ignore); } - formatter.format(thisArg, appendBuf, ignore); + else + formatter.format(thisArg, appendBuf, ignore); } appendBuf.append(elements[i].trailer); -- cgit v1.2.3