diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-07-07 03:01:09 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-07-07 03:01:09 +0000 |
| commit | 784d9f65c1eef6836887ed03817f4d64e029785f (patch) | |
| tree | 31a185855d498906930478997ca28f9f7dfbffd1 | |
| parent | cb4ec06cf0cccfa5b6ff8a5a9bf8a5560baa17b3 (diff) | |
| download | classpath-784d9f65c1eef6836887ed03817f4d64e029785f.tar.gz | |
2008-07-07 Andrew John Hughes <gnu_andrew@member.fsf.org>
* java/text/DateFormatSymbols.java:
(getZoneStrings(ResourceBundle,Locale)):
Pad arrays smaller than 5 with empty strings.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | java/text/DateFormatSymbols.java | 13 |
2 files changed, 18 insertions, 1 deletions
@@ -1,5 +1,11 @@ 2008-07-07 Andrew John Hughes <gnu_andrew@member.fsf.org> + * java/text/DateFormatSymbols.java: + (getZoneStrings(ResourceBundle,Locale)): + Pad arrays smaller than 5 with empty strings. + +2008-07-07 Andrew John Hughes <gnu_andrew@member.fsf.org> + * java/util/Calendar.java: (Calendar(TimeZone,Locale)): Use weeks.properties instead of LocaleInformation bundles. diff --git a/java/text/DateFormatSymbols.java b/java/text/DateFormatSymbols.java index 406376a0f..d5812140c 100644 --- a/java/text/DateFormatSymbols.java +++ b/java/text/DateFormatSymbols.java @@ -113,7 +113,18 @@ public class DateFormatSymbols implements java.io.Serializable, Cloneable String data = res.getString("zoneStrings"); String[] zones = data.split("\u00a9"); for (int a = 0; a < zones.length; ++a) - allZones.add(zones[a].split("\u00ae")); + { + String[] strings = zones[a].split("\u00ae"); + if (strings.length < 5) + { + String[] newStrings = new String[5]; + System.arraycopy(strings, 0, newStrings, 0, strings.length); + for (int b = strings.length; a < newStrings.length; ++a) + newStrings[b] = ""; + strings = newStrings; + } + allZones.add(strings); + } } catch (MissingResourceException e) { |