AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-5073 Move initialization of folded string to private method, use that method to compare with another CaseInsensitiveString, fix copyright date.

Browse Source 
X-SVN-Rev: 21576
This commit is contained in:
Eric Mader 2007-05-23 23:09:18 +00:00
parent 59379e9e9f
commit efd76e19f8
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
icu4j/src/com/ibm/icu/util/CaseInsensitiveString.java
View File

@ -1,6 +1,6 @@
/**
*******************************************************************************
* Copyright (C) 2001-2006, International Business Machines Corporation and *
* Copyright (C) 2001-2007, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@ -22,11 +22,18 @@ public class CaseInsensitiveString {
private String folded = null;
private static String fold(String foldee)
private static String foldCase(String foldee)
{
return UCharacter.foldCase(foldee, true);
}
private void getFolded()
{
if (folded == null) {
folded = foldCase(string);
}
}
/**
* Constructs an CaseInsentiveString object from the given string
* @param s The string to construct this object from
@ -49,15 +56,19 @@ public class CaseInsensitiveString {
* @stable ICU 2.0
*/
public boolean equals(Object o) {
if (folded == null) {
folded = fold(string);
}
getFolded();
try {
return folded.equals(fold(((CaseInsensitiveString)o).string));
CaseInsensitiveString cis = (CaseInsensitiveString) o;
cis.getFolded();
return folded.equals(cis.folded);
} catch (ClassCastException e) {
try {
return folded.equals(fold((String) o));
String s = (String) o;
return folded.equals(foldCase(s));
} catch (ClassCastException e2) {
return false;
}
@ -70,9 +81,7 @@ public class CaseInsensitiveString {
* @stable ICU 2.0
*/
public int hashCode() {
if (folded == null) {
folded = fold(string);
}
getFolded();
if (hash == 0) {
hash = folded.hashCode();