From: mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 10 Jan 2005 18:26:59 +0000 (+0000)
Subject: 2005-01-10  Michael Koch  <konqueror@gmx.de>
X-Git-Tag: upstream/4.9.2~64564
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3f4246de9ff615a3b697825b2cb4efb717bb6d15;p=platform%2Fupstream%2Flinaro-gcc.git

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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@93150 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 42ad4c4..a0d212c 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,11 @@
 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):
 	Throw IllegalArgumentException on invalid month values.
 	* java/util/TimeZone.java (setID):
diff --git a/libjava/java/util/Locale.java b/libjava/java/util/Locale.java
index 54fd097..f4498c6 100644
--- 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()
   {