Commit 20d513ff by Michael Koch Committed by Michael Koch

2003-06-18 Michael Koch <konqueror@gmx.de>

	* java/util/Locale.java
	(equals): Merged from classpath.

From-SVN: r68144
parent 75da2103
2003-06-18 Michael Koch <konqueror@gmx.de> 2003-06-18 Michael Koch <konqueror@gmx.de>
* java/util/Locale.java
(equals): Merged from classpath.
2003-06-18 Michael Koch <konqueror@gmx.de>
* java/net/InetAddress.java: * java/net/InetAddress.java:
Reformatted to better match classpath's version. Reformatted to better match classpath's version.
* java/net/URL.java * java/net/URL.java
......
...@@ -723,9 +723,12 @@ public final class Locale implements Serializable, Cloneable ...@@ -723,9 +723,12 @@ public final class Locale implements Serializable, Cloneable
*/ */
public boolean equals(Object obj) public boolean equals(Object obj)
{ {
if (this == obj)
return true;
if (! (obj instanceof Locale)) if (! (obj instanceof Locale))
return false; return false;
Locale l = (Locale) obj; Locale l = (Locale) obj;
return (language.equals(l.language) return (language.equals(l.language)
&& country.equals(l.country) && country.equals(l.country)
&& variant.equals(l.variant)); && variant.equals(l.variant));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment