diff options
| author | Bernd Schmidt <bernd.schmidt@analog.com> | 2006-02-06 16:36:35 +0000 |
|---|---|---|
| committer | Bernd Schmidt <bernd.schmidt@analog.com> | 2006-02-06 16:36:35 +0000 |
| commit | b3d13cd7ae392041004db6b9bf5098372048c00e (patch) | |
| tree | 2adf45987dc9f88c26eeb95b0071647ebb5c87ec /libjava/java/text/MessageFormat.java | |
| parent | 337db89251de80f8ff7a00b2d71bc333c630b6e4 (diff) | |
Merge reload-branch up to revision 101000reload-branch
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/reload-branch@110651 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/text/MessageFormat.java')
| -rw-r--r-- | libjava/java/text/MessageFormat.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libjava/java/text/MessageFormat.java b/libjava/java/text/MessageFormat.java index 6c1b0508bda..8d53ec21ec1 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); @@ -655,7 +658,11 @@ public class MessageFormat extends Format { // We have a String format. This can lose in a number // of ways, but we give it a shot. - int next_index = sourceStr.indexOf(elements[i].trailer, index); + int next_index; + if (elements[i].trailer.length() > 0) + next_index = sourceStr.indexOf(elements[i].trailer, index); + else + next_index = sourceStr.length(); if (next_index == -1) { pos.setErrorIndex(index); |