diff options
| author | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-06-14 15:51:37 +0000 |
|---|---|---|
| committer | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-06-14 15:51:37 +0000 |
| commit | c4e6606c9390b841851048078abd2fbd8b70f745 (patch) | |
| tree | 0d5ac1145875ce1e119acfdcb3dbb91bf7d8f7d5 /libjava/java/util | |
| parent | ab569c0c49ed17ecbc4ade50649863175f95dd02 (diff) | |
| download | ppe42-gcc-c4e6606c9390b841851048078abd2fbd8b70f745.tar.gz ppe42-gcc-c4e6606c9390b841851048078abd2fbd8b70f745.zip | |
* java/util/Calendar.java: Change ResourceBundle.getBundle() calls
to pass ClassLoader argument.
* java/util/GregorianCalendar.java: Likewise.
* java/util/Currency.java: Likewise.
* java/text/BreakIterator.java: Likewise.
* java/text/Collator.java: Likewise.
* java/text/DateFormat.java: Likewise.
* java/text/DateFormatSymbols.java: Likewise.
* java/text/DecimalFormatSymbols.java: Likewise.
* java/text/NumberFormat.java: Likewise.
* java/awt/Window.java: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@83109 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/util')
| -rw-r--r-- | libjava/java/util/Calendar.java | 3 | ||||
| -rw-r--r-- | libjava/java/util/Currency.java | 7 | ||||
| -rw-r--r-- | libjava/java/util/GregorianCalendar.java | 3 |
3 files changed, 9 insertions, 4 deletions
diff --git a/libjava/java/util/Calendar.java b/libjava/java/util/Calendar.java index 11b0aacf940..0c671e1c040 100644 --- a/libjava/java/util/Calendar.java +++ b/libjava/java/util/Calendar.java @@ -376,7 +376,8 @@ public abstract class Calendar implements Serializable, Cloneable */ private static ResourceBundle getBundle(Locale locale) { - return ResourceBundle.getBundle(bundleName, locale); + return ResourceBundle.getBundle(bundleName, locale, + Calendar.class.getClassLoader()); } /** diff --git a/libjava/java/util/Currency.java b/libjava/java/util/Currency.java index fa98927377b..472351281fc 100644 --- a/libjava/java/util/Currency.java +++ b/libjava/java/util/Currency.java @@ -54,7 +54,8 @@ public final class Currency implements Serializable private Currency (Locale loc) { this.locale = loc; - this.res = ResourceBundle.getBundle ("gnu.java.locale.LocaleInformation", locale); + this.res = ResourceBundle.getBundle ("gnu.java.locale.LocaleInformation", + locale, Currency.class.getClassLoader()); } /** @@ -148,7 +149,9 @@ public final class Currency implements Serializable // First we need to implement fully LocaleInformation*.java try { - ResourceBundle res = ResourceBundle.getBundle ("gnu.java.locale.LocaleInformation", locale); + ResourceBundle res = + ResourceBundle.getBundle ("gnu.java.locale.LocaleInformation", + locale, Currency.class.getClassLoader()); if (res.equals(this.res)) return res.getString ("currencySymbol"); diff --git a/libjava/java/util/GregorianCalendar.java b/libjava/java/util/GregorianCalendar.java index 8f644cba041..9de433389bd 100644 --- a/libjava/java/util/GregorianCalendar.java +++ b/libjava/java/util/GregorianCalendar.java @@ -90,7 +90,8 @@ public class GregorianCalendar extends Calendar */ private static ResourceBundle getBundle(Locale locale) { - return ResourceBundle.getBundle(bundleName, locale); + return ResourceBundle.getBundle(bundleName, locale, + GregorianCalendar.class.getClassLoader()); } /** |
