Faster multi search, exact search, moved Normalization around.

[Dictionary.git] / src / com / hughes / android / dictionary / engine / NormalizeComparator.java

diff --git a/src/com/hughes/android/dictionary/engine/NormalizeComparator.java b/src/com/hughes/android/dictionary/engine/NormalizeComparator.java
new file mode 100644 (file)
index 0000000..b0efdee
--- /dev/null
+++ b/src/com/hughes/android/dictionary/engine/NormalizeComparator.java
@@ -0,0 +1,43 @@
+// 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 java.util.Comparator;
+
+import com.ibm.icu.text.Transliterator;
+
+public class NormalizeComparator implements Comparator<String> {
+  
+  final Transliterator normalizer;
+  final Comparator<Object> comparator;
+
+  public NormalizeComparator(final Transliterator normalizer,
+      final Comparator<Object> comparator) {
+    this.normalizer = normalizer;
+    this.comparator = comparator;
+  }
+
+  @Override
+  public int compare(final String s1, final String s2) {
+    final String n1 = normalizer.transform(s1);
+    final String n2 = normalizer.transform(s2);
+    final int cn = comparator.compare(n1, n2);
+    if (cn != 0) {
+      return cn;
+    }
+    return comparator.compare(s1, s2);
+  }
+
+}