go

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

diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index afca2b59e7aa84fa69094fe6386ba59d03e9b148..a1521fa2fecae8db0c4d9367576dc1812e97249d 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -139,9 +139,7 @@ public class DictionaryActivity extends ListActivity {
       public void run() {\r
         final long startMillis = System.currentTimeMillis();\r
         for (final Index index : dictionary.indices) {\r
-          index.sortLanguage.getFindCollator();\r
-          final com.ibm.icu.text.Collator c = index.sortLanguage\r
-              .getSortCollator();\r
+          final com.ibm.icu.text.Collator c = index.sortLanguage.getCollator();\r
           if (c.compare("pre-print", "preppy") >= 0) {\r
             Log.e(LOG, c.getClass()\r
                 + " is buggy, lookups may not work properly.");\r
@@ -438,19 +436,19 @@ public class DictionaryActivity extends ListActivity {
       return;\r
     }\r
     \r
-    final Index.SearchResult searchResult = searchOperation.searchResult;\r
+    final Index.IndexEntry searchResult = searchOperation.searchResult;\r
     Log.d(LOG, "searchFinished: " + searchOperation + ", searchResult=" + searchResult);\r
 \r
     jumpToRow(searchResult.longestPrefix.startRow);\r
     \r
-    if (!searchResult.success) {\r
-      if (vibrator != null) {\r
-        vibrator.vibrate(VIBRATE_MILLIS);\r
-      }\r
-      searchText.setText(searchResult.longestPrefixString);\r
-      searchText.setSelection(searchResult.longestPrefixString.length());\r
-      return;\r
-    }\r
+//    if (!searchResult.success) {\r
+//      if (vibrator != null) {\r
+//        vibrator.vibrate(VIBRATE_MILLIS);\r
+//      }\r
+//      searchText.setText(searchResult.longestPrefixString);\r
+//      searchText.setSelection(searchResult.longestPrefixString.length());\r
+//      return;\r
+//    }\r
   }\r
   \r
   private final void jumpToRow(final int row) {\r
@@ -466,7 +464,7 @@ public class DictionaryActivity extends ListActivity {
     \r
     long searchStartMillis;\r
 \r
-    Index.SearchResult searchResult;\r
+    Index.IndexEntry searchResult;\r
     \r
     SearchOperation(final String searchText, final Index index) {\r
       this.searchText = searchText.trim();\r
@@ -480,7 +478,7 @@ public class DictionaryActivity extends ListActivity {
     @Override\r
     public void run() {\r
       searchStartMillis = System.currentTimeMillis();\r
-      searchResult = index.findLongestSubstring(searchText, interrupted);\r
+      searchResult = index.findInsertionPoint(searchText, interrupted);\r
       Log.d(LOG, "searchText=" + searchText + ", searchDuration="\r
           + (System.currentTimeMillis() - searchStartMillis) + ", interrupted="\r
           + interrupted.get());\r