FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DateFormat.java, [...]: New versions from classpath.

Browse source 
2003-06-21  Michael Koch  <konqueror@gmx.de>

	* java/text/DateFormat.java,
	java/text/SimpleDateFormat.java,
	java/util/Locale.java:
	New versions from classpath.

From-SVN: r68300
This commit is contained in:
Michael Koch 2003-06-21 12:42:26 +00:00 • committed by Michael Koch
parent 5ee8128f1b
commit 73c7dd50e8
4 changed files with 40 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

20
libjava/java/util/Locale.java
View file

@ -231,9 +231,9 @@ public final class Locale implements Serializable, Cloneable
// default locale.
if (defaultLocale != null)
{
language = convertLanguage(language);
country = country.toUpperCase();
variant = variant.toUpperCase();
language = convertLanguage(language).intern();
country = country.toUpperCase().intern();
variant = variant.toUpperCase().intern();
}
this.language = language;
this.country = country;
@ -436,7 +436,7 @@ public final class Locale implements Serializable, Cloneable
*/
public String getISO3Language()
{
if ("".equals(language))
if (language == "")
return "";
int index
= ("aa,ab,af,am,ar,as,ay,az,ba,be,bg,bh,bi,bn,bo,br,ca,co,cs,cy,da,"
@ -472,7 +472,7 @@ public final class Locale implements Serializable, Cloneable
*/
public String getISO3Country()
{
if ("".equals(country))
if (country == "")
return "";
int index
= ("AD,AE,AF,AG,AI,AL,AM,AN,AO,AQ,AR,AS,AT,AU,AW,AZ,BA,BB,BD,BE,BF,"
@ -729,9 +729,13 @@ public final class Locale implements Serializable, Cloneable
return false;
Locale l = (Locale) obj;
return (language.equals(l.language)
&& country.equals(l.country)
&& variant.equals(l.variant));
// ??? We might also want to add:
// hashCode() == l.hashCode()
// But this is a synchronized method. Is the overhead worth it?
// Measure this to make a decision.
return (language == l.language
&& country == l.country
&& variant == l.variant);
}
/**