re PR libgcj/18014 (java.util.Locale changes variant to upper case)

2005-01-10  Michael Koch  <konqueror@gmx.de>

	PR libgcj/18014
	* java/util/Locale.java (Locale): Don't uppercase variant.
	(getISOCountries): Fixed typo in javadoc.

From-SVN: r93150

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 42ad4c42e359757d32034879649c9d9697503b94..a0d212c90786b9561f2b1ee6daca0ee179c1ec04 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-10  Michael Koch  <konqueror@gmx.de>
+
+       PR libgcj/18014
+       * java/util/Locale.java (Locale): Don't uppercase variant.
+       (getISOCountries): Fixed typo in javadoc.
+
 2005-01-10  Michael Koch  <konqueror@gmx.de>
 
        * java/util/SimpleTimeZone.java (checkRule):

diff --git a/libjava/java/util/Locale.java b/libjava/java/util/Locale.java
index 54fd097a0ef8cd04a6f8bd92ca48766a2798fbc9..f4498c69f3afc4c430beffc381a0b0a33a48523e 100644 (file)
--- a/libjava/java/util/Locale.java
+++ b/libjava/java/util/Locale.java
@@ -35,6 +35,7 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package java.util;
 
 import java.io.IOException;
@@ -74,7 +75,7 @@ import java.io.Serializable;
  * @see java.text.Collator
  * @author Jochen Hoenicke
  * @author Paul Fisher
- * @author Eric Blake <ebb9@email.byu.edu>
+ * @author Eric Blake (ebb9@email.byu.edu)
  * @since 1.1
  * @status updated to 1.4
  */
@@ -233,7 +234,7 @@ public final class Locale implements Serializable, Cloneable
       {
         language = convertLanguage(language).intern();
         country = country.toUpperCase().intern();
-        variant = variant.toUpperCase().intern();
+        variant = variant.intern();
       }
     this.language = language;
     this.country = country;
@@ -321,7 +322,7 @@ public final class Locale implements Serializable, Cloneable
    * Returns a list of all 2-letter uppercase country codes as defined
    * in ISO 3166.
    *
-   * @return a list of acceptible country codes
+   * @return a list of acceptable country codes
    */
   public static String[] getISOCountries()
   {