X-Git-Url: http://gitweb.fperrin.net/?p=Dictionary.git;a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fengine%2FNormalizeComparator.java;h=c744334b150ea5073aa9081e71915a40de606656;hp=efe05d1f58e0bd2cba2171ff7d47db90c9ca5cd7;hb=c30780dce1351b55c0e94b05dd8ef327aa31cebd;hpb=1aa504ce21ffacbc661330fbb5ed3db0e696b6aa diff --git a/src/com/hughes/android/dictionary/engine/NormalizeComparator.java b/src/com/hughes/android/dictionary/engine/NormalizeComparator.java index efe05d1..c744334 100644 --- a/src/com/hughes/android/dictionary/engine/NormalizeComparator.java +++ b/src/com/hughes/android/dictionary/engine/NormalizeComparator.java @@ -31,12 +31,16 @@ public class NormalizeComparator implements Comparator { this.version = version; } + public static String withoutDash(final String a) { + return a.replace("-", "").replace("þ", "th").replace("Þ", "Th"); + } + // Handles comparison between items containing "-". // Also replaces other problematic cases like "thorn". public static int compareWithoutDash(final String a, final String b, final Comparator c, int version) { if (version < 7) return 0; - String s1 = a.replace("-", "").replace("þ", "th").replace("Þ", "Th"); - String s2 = b.replace("-", "").replace("þ", "th").replace("Þ", "Th"); + String s1 = withoutDash(a); + String s2 = withoutDash(b); return c.compare(s1, s2); }