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

re PR libgcj/21736 (MessageFormat("{0,time,medium}") fails)

Browse source 
2005-05-24  Gary Benson  <gbenson@redhat.com>

	PR libgcj/21736:
	* java/text/MessageFormat.java (MessageFormatElement.setLocale):
	Handle DateFormat.DEFAULT case correctly.

From-SVN: r100154
This commit is contained in:
Gary Benson 2005-05-25 15:25:38 +00:00 • committed by Tom Tromey
parent 93f8e21b71
commit 81043a94e9
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libjava/ChangeLog
View file

@ -1,3 +1,9 @@
2005-05-24 Gary Benson <gbenson@redhat.com>
PR libgcj/21736:
* java/text/MessageFormat.java (MessageFormatElement.setLocale):
Handle DateFormat.DEFAULT case correctly.
2005-05-21 Tom Tromey <tromey@redhat.com> 2005-05-21 Tom Tromey <tromey@redhat.com>
PR libgcj/21703: PR libgcj/21703:

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

@ -113,6 +113,7 @@ public class MessageFormat extends Format
formatClass = java.util.Date.class; formatClass = java.util.Date.class;
int val = DateFormat.DEFAULT; int val = DateFormat.DEFAULT;
boolean styleIsPattern = false;
if (style == null) if (style == null)
; ;
else if (style.equals("short")) else if (style.equals("short"))
@ -123,13 +124,15 @@ public class MessageFormat extends Format
val = DateFormat.LONG; val = DateFormat.LONG;
else if (style.equals("full")) else if (style.equals("full"))
val = DateFormat.FULL; val = DateFormat.FULL;
else
styleIsPattern = true;
if (type.equals("time")) if (type.equals("time"))
format = DateFormat.getTimeInstance(val, loc); format = DateFormat.getTimeInstance(val, loc);
else else
format = DateFormat.getDateInstance(val, loc); format = DateFormat.getDateInstance(val, loc);
if (style != null && val == DateFormat.DEFAULT) if (styleIsPattern)
{ {
SimpleDateFormat sdf = (SimpleDateFormat) format; SimpleDateFormat sdf = (SimpleDateFormat) format;
sdf.applyPattern(style); sdf.applyPattern(style);