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/text | |
| 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/text')
| -rw-r--r-- | libjava/java/text/BreakIterator.java | 2 | ||||
| -rw-r--r-- | libjava/java/text/Collator.java | 2 | ||||
| -rw-r--r-- | libjava/java/text/DateFormat.java | 2 | ||||
| -rw-r--r-- | libjava/java/text/DateFormatSymbols.java | 3 | ||||
| -rw-r--r-- | libjava/java/text/DecimalFormatSymbols.java | 2 | ||||
| -rw-r--r-- | libjava/java/text/NumberFormat.java | 2 |
6 files changed, 7 insertions, 6 deletions
diff --git a/libjava/java/text/BreakIterator.java b/libjava/java/text/BreakIterator.java index 217d2a925dd..e97b6587707 100644 --- a/libjava/java/text/BreakIterator.java +++ b/libjava/java/text/BreakIterator.java @@ -136,7 +136,7 @@ public abstract class BreakIterator implements Cloneable { ResourceBundle res = ResourceBundle.getBundle("gnu.java.locale.LocaleInformation", - loc); + loc, BreakIterator.class.getClassLoader()); className = res.getString(type); } catch (MissingResourceException x) diff --git a/libjava/java/text/Collator.java b/libjava/java/text/Collator.java index 7944d9501e5..7797962d4f9 100644 --- a/libjava/java/text/Collator.java +++ b/libjava/java/text/Collator.java @@ -303,7 +303,7 @@ public abstract class Collator implements Comparator, Cloneable try { res = ResourceBundle.getBundle("gnu.java.locale.LocaleInformation", - loc); + loc, Collator.class.getClassLoader()); pattern = res.getString("collation_rules"); } catch (MissingResourceException x) diff --git a/libjava/java/text/DateFormat.java b/libjava/java/text/DateFormat.java index 0947b8058ad..3b489fae7eb 100644 --- a/libjava/java/text/DateFormat.java +++ b/libjava/java/text/DateFormat.java @@ -325,7 +325,7 @@ public abstract class DateFormat extends Format implements Cloneable try { res = ResourceBundle.getBundle("gnu.java.locale.LocaleInformation", - loc); + loc, DateFormat.class.getClassLoader()); } catch (MissingResourceException x) { diff --git a/libjava/java/text/DateFormatSymbols.java b/libjava/java/text/DateFormatSymbols.java index 33a541bd1b7..0d619516d36 100644 --- a/libjava/java/text/DateFormatSymbols.java +++ b/libjava/java/text/DateFormatSymbols.java @@ -98,7 +98,8 @@ public class DateFormatSymbols implements java.io.Serializable, Cloneable public DateFormatSymbols (Locale locale) throws MissingResourceException { ResourceBundle res - = ResourceBundle.getBundle("gnu.java.locale.LocaleInformation", locale); + = ResourceBundle.getBundle("gnu.java.locale.LocaleInformation", locale, + getClass().getClassLoader()); ampms = res.getStringArray ("ampms"); eras = res.getStringArray ("eras"); diff --git a/libjava/java/text/DecimalFormatSymbols.java b/libjava/java/text/DecimalFormatSymbols.java index 843b6020b3a..39de36b7ae0 100644 --- a/libjava/java/text/DecimalFormatSymbols.java +++ b/libjava/java/text/DecimalFormatSymbols.java @@ -130,7 +130,7 @@ public final class DecimalFormatSymbols implements Cloneable, Serializable try { res = ResourceBundle.getBundle("gnu.java.locale.LocaleInformation", - loc); + loc, DecimalFormatSymbols.class.getClassLoader()); } catch (MissingResourceException x) { diff --git a/libjava/java/text/NumberFormat.java b/libjava/java/text/NumberFormat.java index 6520f7524e0..47a4eaae575 100644 --- a/libjava/java/text/NumberFormat.java +++ b/libjava/java/text/NumberFormat.java @@ -310,7 +310,7 @@ public abstract class NumberFormat extends Format implements Cloneable try { res = ResourceBundle.getBundle("gnu.java.locale.LocaleInformation", - loc); + loc, NumberFormat.class.getClassLoader()); } catch (MissingResourceException x) { |
