// Copyright 2011 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//     http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package com.hughes.android.dictionary.engine;

import com.ibm.icu.text.Transliterator;

import java.util.Comparator;

public class NormalizeComparator implements Comparator<String> {

    final Transliterator normalizer;
    final Comparator<Object> comparator;
    int version;

    public NormalizeComparator(final Transliterator normalizer,
                               final Comparator<Object> comparator, int version) {
        this.normalizer = normalizer;
        this.comparator = comparator;
        this.version = version;
    }

    // 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");
        return c.compare(s1, s2);
    }

    @Override
    public int compare(final String s1, final String s2) {
        final String n1 = normalizer.transform(s1);
        final String n2 = normalizer.transform(s2);
        int cn = compareWithoutDash(n1, n2, comparator, version);
        if (cn != 0) {
            return cn;
        }
        cn = comparator.compare(n1, n2);
        if (cn != 0) {
            return cn;
        }
        return comparator.compare(s1, s2);
    }

}

@@ -837,38 +837,38 @@
 inal Comparator%3C
-Object
+String
 %3E comparator;%0A  
@@ -999,14 +999,14 @@
 tor%3C
-Object
+String
 %3E co
@@ -1698,16 +1698,56 @@
 ing n1 =
+ normalizer == null ? s1.toLowerCase() :
  normali
@@ -1790,16 +1790,56 @@
 ing n2 =
+ normalizer == null ? s2.toLowerCase() :
  normali

improve type, support null normalizer.