From e7f0db54e6cd5f70135783ac6a8bbf5a39227f02 Mon Sep 17 00:00:00 2001 From: tromey Date: Wed, 25 May 2005 15:25:38 +0000 Subject: 2005-05-24 Gary Benson PR libgcj/21736: * java/text/MessageFormat.java (MessageFormatElement.setLocale): Handle DateFormat.DEFAULT case correctly. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@100154 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/text/MessageFormat.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libjava/java/text') 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); -- cgit v1.2.3