From 81043a94e942985760486076a4c880a57d71ae8f Mon Sep 17 00:00:00 2001 From: Gary Benson Date: Wed, 25 May 2005 15:25:38 +0000 Subject: [PATCH] re PR libgcj/21736 (MessageFormat("{0,time,medium}") fails) 2005-05-24 Gary Benson PR libgcj/21736: * java/text/MessageFormat.java (MessageFormatElement.setLocale): Handle DateFormat.DEFAULT case correctly. From-SVN: r100154 --- libjava/ChangeLog | 6 ++++++ libjava/java/text/MessageFormat.java | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 4d1cfb95b9a..be3a5351fd5 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2005-05-24 Gary Benson + + PR libgcj/21736: + * java/text/MessageFormat.java (MessageFormatElement.setLocale): + Handle DateFormat.DEFAULT case correctly. + 2005-05-21 Tom Tromey PR libgcj/21703: diff --git a/libjava/java/text/MessageFormat.java b/libjava/java/text/MessageFormat.java index 6c1b0508bda..4a24afd1f44 100644 --- a/libjava/java/text/MessageFormat.java +++ b/libjava/java/text/MessageFormat.java @@ -113,6 +113,7 @@ public class MessageFormat extends Format formatClass = java.util.Date.class; int val = DateFormat.DEFAULT; + boolean styleIsPattern = false; if (style == null) ; else if (style.equals("short")) @@ -123,13 +124,15 @@ public class MessageFormat extends Format val = DateFormat.LONG; else if (style.equals("full")) val = DateFormat.FULL; + else + styleIsPattern = true; if (type.equals("time")) format = DateFormat.getTimeInstance(val, loc); else format = DateFormat.getDateInstance(val, loc); - if (style != null && val == DateFormat.DEFAULT) + if (styleIsPattern) { SimpleDateFormat sdf = (SimpleDateFormat) format; sdf.applyPattern(style); -- 2.30.2