Calendar.java: Change ResourceBundle.getBundle() calls to pass ClassLoader argument.

	* 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.

From-SVN: r83109

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 8121d80..8798912 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,17 @@
+2004-06-14  Bryce McKinlay  <mckinlay@redhat.com>
+
+       * 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.
+
 2004-06-14  Andrew Haley  <aph@redhat.com>
 
        * java/lang/System.java: (getenv0): New method.

diff --git a/libjava/java/awt/Window.java b/libjava/java/awt/Window.java
index 51b00dc..2e19874 100644 (file)
--- a/libjava/java/awt/Window.java
+++ b/libjava/java/awt/Window.java
@@ -703,7 +703,8 @@ public class Window extends Container implements Accessible
    */
   public void applyResourceBundle(String rbName)
   {
-    ResourceBundle rb = ResourceBundle.getBundle(rbName);
+    ResourceBundle rb = ResourceBundle.getBundle(rbName, Locale.getDefault(),
+      Window.class.getClassLoader());
     if (rb != null)
       applyResourceBundle(rb);    
   }

diff --git a/libjava/java/text/BreakIterator.java b/libjava/java/text/BreakIterator.java
index 217d2a9..e97b658 100644 (file)
--- 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 7944d95..7797962 100644 (file)
--- 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 0947b80..3b489fa 100644 (file)
--- 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 33a541b..0d61951 100644 (file)
--- 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 843b602..39de36b 100644 (file)
--- 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 6520f75..47a4eaa 100644 (file)
--- 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)
       {

diff --git a/libjava/java/util/Calendar.java b/libjava/java/util/Calendar.java
index 11b0aac..0c671e1 100644 (file)
--- 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 fa98927..4723512 100644 (file)
--- 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 8f644cb..9de4333 100644 (file)
--- 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());
   }
 
   /**