PatchSet 4849
Date: 2004/06/16 20:28:30
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: resource bundle loading
2003-06-16 Dalibor Topic <[EMAIL PROTECTED]>
* libraries/javalib/java/text/BreakIterator.java,
libraries/javalib/java/text/Collator.java,
libraries/javalib/java/text/DateFormat.java,
libraries/javalib/java/text/DateFormatSymbols.java,
libraries/javalib/java/text/NumberFormat.java,
libraries/javalib/java/util/Calendar.java,
libraries/javalib/java/util/Currency.java,
libraries/javalib/java/util/GregorianCalendar.java:
Resynced with GNU Classpath.
2004-06-15 Bryce McKinlay <[EMAIL PROTECTED]>
* java/util/Calendar.java: Use getSystemClassLoader as argument for
ResourceBundle.getBundle() calls.
* 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.
Members:
ChangeLog:1.2416->1.2417
libraries/javalib/java/text/BreakIterator.java:1.10->1.11
libraries/javalib/java/text/Collator.java:1.15->1.16
libraries/javalib/java/text/DateFormat.java:1.21->1.22
libraries/javalib/java/text/DateFormatSymbols.java:1.13->1.14
libraries/javalib/java/text/DecimalFormatSymbols.java:1.15->1.16
libraries/javalib/java/text/NumberFormat.java:1.23->1.24
libraries/javalib/java/util/Calendar.java:1.21->1.22
libraries/javalib/java/util/Currency.java:1.4->1.5
libraries/javalib/java/util/GregorianCalendar.java:1.23->1.24
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2416 kaffe/ChangeLog:1.2417
--- kaffe/ChangeLog:1.2416 Tue Jun 15 21:55:42 2004
+++ kaffe/ChangeLog Wed Jun 16 20:28:30 2004
@@ -1,3 +1,28 @@
+2003-06-16 Dalibor Topic <[EMAIL PROTECTED]>
+
+ * libraries/javalib/java/text/BreakIterator.java,
+ libraries/javalib/java/text/Collator.java,
+ libraries/javalib/java/text/DateFormat.java,
+ libraries/javalib/java/text/DateFormatSymbols.java,
+ libraries/javalib/java/text/NumberFormat.java,
+ libraries/javalib/java/util/Calendar.java,
+ libraries/javalib/java/util/Currency.java,
+ libraries/javalib/java/util/GregorianCalendar.java:
+ Resynced with GNU Classpath.
+
+ 2004-06-15 Bryce McKinlay <[EMAIL PROTECTED]>
+
+ * java/util/Calendar.java: Use getSystemClassLoader as argument for
+ ResourceBundle.getBundle() calls.
+ * 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.
+
2004-06-15 Ito Kazumitsu <[EMAIL PROTECTED]>
* libraries/javalib/java/text/MessageFormat.java
Index: kaffe/libraries/javalib/java/text/BreakIterator.java
diff -u kaffe/libraries/javalib/java/text/BreakIterator.java:1.10
kaffe/libraries/javalib/java/text/BreakIterator.java:1.11
--- kaffe/libraries/javalib/java/text/BreakIterator.java:1.10 Tue Jun 15 18:42:53
2004
+++ kaffe/libraries/javalib/java/text/BreakIterator.java Wed Jun 16 20:28:32
2004
@@ -136,7 +136,7 @@
{
ResourceBundle res
= ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
- loc, BreakIterator.class.getClassLoader());
+ loc, ClassLoader.getSystemClassLoader());
className = res.getString(type);
}
catch (MissingResourceException x)
Index: kaffe/libraries/javalib/java/text/Collator.java
diff -u kaffe/libraries/javalib/java/text/Collator.java:1.15
kaffe/libraries/javalib/java/text/Collator.java:1.16
--- kaffe/libraries/javalib/java/text/Collator.java:1.15 Tue Jun 15 18:42:53
2004
+++ kaffe/libraries/javalib/java/text/Collator.java Wed Jun 16 20:28:32 2004
@@ -303,7 +303,7 @@
try
{
res = ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
- loc, Collator.class.getClassLoader());
+ loc, ClassLoader.getSystemClassLoader());
pattern = res.getString("collation_rules");
}
catch (MissingResourceException x)
Index: kaffe/libraries/javalib/java/text/DateFormat.java
diff -u kaffe/libraries/javalib/java/text/DateFormat.java:1.21
kaffe/libraries/javalib/java/text/DateFormat.java:1.22
--- kaffe/libraries/javalib/java/text/DateFormat.java:1.21 Tue Jun 15 18:42:53
2004
+++ kaffe/libraries/javalib/java/text/DateFormat.java Wed Jun 16 20:28:32 2004
@@ -325,7 +325,7 @@
try
{
res = ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
- loc, DateFormat.class.getClassLoader());
+ loc, ClassLoader.getSystemClassLoader());
}
catch (MissingResourceException x)
{
Index: kaffe/libraries/javalib/java/text/DateFormatSymbols.java
diff -u kaffe/libraries/javalib/java/text/DateFormatSymbols.java:1.13
kaffe/libraries/javalib/java/text/DateFormatSymbols.java:1.14
--- kaffe/libraries/javalib/java/text/DateFormatSymbols.java:1.13 Tue Jun 15
18:42:53 2004
+++ kaffe/libraries/javalib/java/text/DateFormatSymbols.java Wed Jun 16 20:28:32
2004
@@ -99,7 +99,7 @@
{
ResourceBundle res
= ResourceBundle.getBundle("gnu.java.locale.LocaleInformation", locale,
- getClass().getClassLoader());
+ ClassLoader.getSystemClassLoader());
ampms = res.getStringArray ("ampms");
eras = res.getStringArray ("eras");
Index: kaffe/libraries/javalib/java/text/DecimalFormatSymbols.java
diff -u kaffe/libraries/javalib/java/text/DecimalFormatSymbols.java:1.15
kaffe/libraries/javalib/java/text/DecimalFormatSymbols.java:1.16
--- kaffe/libraries/javalib/java/text/DecimalFormatSymbols.java:1.15 Fri Apr 23
17:35:12 2004
+++ kaffe/libraries/javalib/java/text/DecimalFormatSymbols.java Wed Jun 16 20:28:32
2004
@@ -130,7 +130,7 @@
try
{
res = ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
- loc);
+ loc, ClassLoader.getSystemClassLoader());
}
catch (MissingResourceException x)
{
Index: kaffe/libraries/javalib/java/text/NumberFormat.java
diff -u kaffe/libraries/javalib/java/text/NumberFormat.java:1.23
kaffe/libraries/javalib/java/text/NumberFormat.java:1.24
--- kaffe/libraries/javalib/java/text/NumberFormat.java:1.23 Tue Jun 15 18:42:53
2004
+++ kaffe/libraries/javalib/java/text/NumberFormat.java Wed Jun 16 20:28:32 2004
@@ -310,7 +310,7 @@
try
{
res = ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
- loc, NumberFormat.class.getClassLoader());
+ loc, ClassLoader.getSystemClassLoader());
}
catch (MissingResourceException x)
{
Index: kaffe/libraries/javalib/java/util/Calendar.java
diff -u kaffe/libraries/javalib/java/util/Calendar.java:1.21
kaffe/libraries/javalib/java/util/Calendar.java:1.22
--- kaffe/libraries/javalib/java/util/Calendar.java:1.21 Tue Jun 15 18:42:53
2004
+++ kaffe/libraries/javalib/java/util/Calendar.java Wed Jun 16 20:28:32 2004
@@ -377,7 +377,7 @@
private static ResourceBundle getBundle(Locale locale)
{
return ResourceBundle.getBundle(bundleName, locale,
- Calendar.class.getClassLoader());
+ ClassLoader.getSystemClassLoader());
}
/**
Index: kaffe/libraries/javalib/java/util/Currency.java
diff -u kaffe/libraries/javalib/java/util/Currency.java:1.4
kaffe/libraries/javalib/java/util/Currency.java:1.5
--- kaffe/libraries/javalib/java/util/Currency.java:1.4 Tue Jun 15 18:42:53 2004
+++ kaffe/libraries/javalib/java/util/Currency.java Wed Jun 16 20:28:33 2004
@@ -55,7 +55,7 @@
{
this.locale = loc;
this.res = ResourceBundle.getBundle ("gnu.java.locale.LocaleInformation",
- locale, Currency.class.getClassLoader());
+ locale, ClassLoader.getSystemClassLoader());
}
/**
Index: kaffe/libraries/javalib/java/util/GregorianCalendar.java
diff -u kaffe/libraries/javalib/java/util/GregorianCalendar.java:1.23
kaffe/libraries/javalib/java/util/GregorianCalendar.java:1.24
--- kaffe/libraries/javalib/java/util/GregorianCalendar.java:1.23 Tue Jun 15
18:42:53 2004
+++ kaffe/libraries/javalib/java/util/GregorianCalendar.java Wed Jun 16 20:28:33
2004
@@ -91,7 +91,7 @@
private static ResourceBundle getBundle(Locale locale)
{
return ResourceBundle.getBundle(bundleName, locale,
- GregorianCalendar.class.getClassLoader());
+ ClassLoader.getSystemClassLoader());
}
/**
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
