FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2002-07-02 Tom Tromey <tromey@redhat.com>

Browse source 
David Hovemeyer  <daveho@cs.umd.edu>

	* 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 <daveho@cs.umd.edu>

From-SVN: r55191
This commit is contained in:
Tom Tromey 2002-07-02 19:43:06 +00:00 • committed by Tom Tromey
parent 40165636b5
commit aa5661e6b4
3 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libjava/ChangeLog
View file

@ -1,3 +1,13 @@
2002-07-02 Tom Tromey <tromey@redhat.com>
David Hovemeyer <daveho@cs.umd.edu>
* 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.
2002-07-01 Tom Tromey <tromey@redhat.com> 2002-07-01 Tom Tromey <tromey@redhat.com>
* javax/naming/spi/NamingManager.java (getPlusPath): Don't create * javax/naming/spi/NamingManager.java (getPlusPath): Don't create

8
libjava/java/text/ChoiceFormat.java
View file

@ -1,5 +1,5 @@
/* ChoiceFormat.java -- Format over a range of numbers /* ChoiceFormat.java -- Format over a range of numbers
Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
This file is part of GNU Classpath. This file is part of GNU Classpath.
@ -259,14 +259,12 @@ public class ChoiceFormat extends NumberFormat
if (choiceLimits.length == 0) if (choiceLimits.length == 0)
return appendBuf; return appendBuf;
int index = 0; int index = 0;
if (! Double.isNaN(num) && num >= choiceLimits[0]) if (! Double.isNaN(num) && num >= choiceLimits[0])
{ {
for (; index < choiceLimits.length - 1; ++index) for (; index < choiceLimits.length - 1; ++index)
{ {
if (choiceLimits[index] <= num if (choiceLimits[index] <= num && num < choiceLimits[index + 1])
&& index != choiceLimits.length - 2
&& num < choiceLimits[index + 1])
break; break;
} }
} }

11
libjava/java/text/MessageFormat.java
View file

@ -1,5 +1,5 @@
/* MessageFormat.java - Localized message formatting. /* 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. This file is part of GNU Classpath.
@ -373,17 +373,14 @@ public class MessageFormat extends Format
if (formatter instanceof ChoiceFormat) if (formatter instanceof ChoiceFormat)
{ {
StringBuffer buf = new StringBuffer (); 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); formatter.format(thisArg, buf, ignore);
MessageFormat mf = new MessageFormat (); MessageFormat mf = new MessageFormat ();
mf.setLocale(locale); mf.setLocale(locale);
mf.applyPattern(buf.toString()); 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); appendBuf.append(elements[i].trailer);