[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Bug: java/text/MessageFormat.java
From: |
Ito Kazumitsu |
Subject: |
Re: Bug: java/text/MessageFormat.java |
Date: |
Wed, 23 Jun 2004 06:53:44 +0900 |
User-agent: |
EMH/1.10.0 SEMI/1.13.7 (Awazu) FLIM/1.13.2 (Kasanui) Emacs/21.2 (i386-unknown-freebsd4.7) MULE/5.0 (SAKAKI) |
>>>>> ":" == Ito Kazumitsu <address@hidden> writes:
:> Hi,
:> As reported to the Kaffe mailing list:
:> http://www.kaffe.org/pipermail/kaffe/2004-June/046657.html
:> java/text/MessageFormat.java has a bug.
:>
:> This is my suggested patch.
In addition to that, I found another difference between the API
document and Classpath's implementation.
I made some test cases for checking these bugs and updated the
mauve test: gnu/testlet/java/text/MessageFormat/format.java.
My patch follows.
Changelog entry:
2004-06-22 Ito Kazumitsu <address@hidden>
* java/text/MessageFormat.java
(formatInternal): Append "{n}" if argument n is unavailable.
(format(Object, StringBuffer, FieldPosition)): This should be
equivalent to format(Object[], StringBuffer, FieldPosition).
--- java/text/MessageFormat.java.orig Mon May 10 00:17:30 2004
+++ java/text/MessageFormat.java Wed Jun 23 06:35:11 2004
@@ -157,7 +157,7 @@
* This is the attribute set for all characters produced
* by MessageFormat during a formatting.
*/
- public static final MessageFormat.Field ARGUMENT = new Field("argument");
+ public static final MessageFormat.Field ARGUMENT = new
MessageFormat.Field("argument");
// For deserialization
private Field()
@@ -414,10 +414,13 @@
for (int i = 0; i < elements.length; ++i)
{
- if (elements[i].argNumber >= arguments.length)
- throw new IllegalArgumentException("Not enough arguments given");
+ Object thisArg = null;
+ boolean unavailable = false;
+ if (arguments == null || elements[i].argNumber >= arguments.length)
+ unavailable = true;
+ else
+ thisArg = arguments[elements[i].argNumber];
- Object thisArg = arguments[elements[i].argNumber];
AttributedCharacterIterator iterator = null;
Format formatter = null;
@@ -425,22 +428,27 @@
if (fp != null && i == fp.getField() && fp.getFieldAttribute() ==
Field.ARGUMENT)
fp.setBeginIndex(appendBuf.length());
- if (elements[i].setFormat != null)
- formatter = elements[i].setFormat;
- else if (elements[i].format != null)
+ if (unavailable)
+ appendBuf.append("{" + elements[i].argNumber + "}");
+ else
{
- if (elements[i].formatClass != null
- && ! elements[i].formatClass.isInstance(thisArg))
- throw new IllegalArgumentException("Wrong format class");
+ if (elements[i].setFormat != null)
+ formatter = elements[i].setFormat;
+ else if (elements[i].format != null)
+ {
+ if (elements[i].formatClass != null
+ && ! elements[i].formatClass.isInstance(thisArg))
+ throw new IllegalArgumentException("Wrong format class");
- formatter = elements[i].format;
+ formatter = elements[i].format;
+ }
+ else if (thisArg instanceof Number)
+ formatter = NumberFormat.getInstance(locale);
+ else if (thisArg instanceof Date)
+ formatter = DateFormat.getTimeInstance(DateFormat.DEFAULT,
locale);
+ else
+ appendBuf.append(thisArg);
}
- else if (thisArg instanceof Number)
- formatter = NumberFormat.getInstance(locale);
- else if (thisArg instanceof Date)
- formatter = DateFormat.getTimeInstance(DateFormat.DEFAULT, locale);
- else
- appendBuf.append(thisArg);
if (fp != null && fp.getField() == i && fp.getFieldAttribute() ==
Field.ARGUMENT)
fp.setEndIndex(appendBuf.length());
@@ -497,28 +505,16 @@
/**
* Returns the pattern with the formatted objects.
+ * This is equivalent to format((Object[]) singleArg, appendBuf, fpos)
*
- * @param source The object to be formatted.
- * @param result The StringBuffer where the text is appened.
+ * @param singleArg The object to be formatted.
+ * @param appendBuf The StringBuffer where the text is appened.
* @param fpos A FieldPosition object (it is ignored).
*/
public final StringBuffer format (Object singleArg, StringBuffer appendBuf,
FieldPosition fpos)
{
- 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, fpos);
+ return format ((Object[])singleArg, appendBuf, fpos);
}
/**