Add flag to avoid using ICU collator.

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

diff --git a/src/com/hughes/android/dictionary/engine/Language.java b/src/com/hughes/android/dictionary/engine/Language.java
index eaa11b622424a3f26efc5ac2f87f2bd168c1b8c3..78085f6a26eb498d38b8b7d26cfa9da6440b6d1d 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/Language.java
+++ b/src/com/hughes/android/dictionary/engine/Language.java
@@ -14,8 +14,10 @@
 \r
 package com.hughes.android.dictionary.engine;\r
 \r
+import com.hughes.android.dictionary.DictionaryApplication;\r
 import com.ibm.icu.text.Collator;\r
 \r
+import java.util.Comparator;\r
 import java.util.LinkedHashMap;\r
 import java.util.Locale;\r
 import java.util.Map;\r
@@ -62,7 +64,9 @@ public class Language {
         return isoCode;\r
     }\r
 \r
-    public synchronized Collator getCollator() {\r
+    public synchronized Comparator getCollator() {\r
+        if (!DictionaryApplication.USE_COLLATOR)\r
+            return String.CASE_INSENSITIVE_ORDER;\r
         // Don't think this is thread-safe...\r
         // if (collator == null) {\r
         this.collator = Collator.getInstance(locale);\r