nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 7145ca71: am 228674f6: Merge "fix findWordInTree." into jb-mr1-dev 

* commit '7145ca713854d090eb5c3ceeb588748f575764e3':
  fix findWordInTree.
main
Jean Chalard 2012-08-16 18:58:53 -07:00 committed by Android Git Automerger
parent 7d6a211702 7145ca7138
commit bab6c021bd
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
java/src/com/android/inputmethod/latin/makedict/FusionDictionary.java
View File

@ -532,6 +532,7 @@ public class FusionDictionary implements Iterable<Word> {
} while (null != node && index < s.length()); } while (null != node && index < s.length());
if (index < s.length()) return null; if (index < s.length()) return null;
if (!currentGroup.isTerminal()) return null;
if (DBG && !s.equals(checker.toString())) return null; if (DBG && !s.equals(checker.toString())) return null;
return currentGroup; return currentGroup;
} }

6
tests/src/com/android/inputmethod/latin/FusionDictionaryTests.java
View File

@ -38,5 +38,11 @@ public class FusionDictionaryTests extends AndroidTestCase {
dict.add("aa", 10, null); dict.add("aa", 10, null);
assertNull(FusionDictionary.findWordInTree(dict.mRoot, "aaa")); assertNull(FusionDictionary.findWordInTree(dict.mRoot, "aaa"));
assertNotNull(FusionDictionary.findWordInTree(dict.mRoot, "aa")); assertNotNull(FusionDictionary.findWordInTree(dict.mRoot, "aa"));
dict.add("babcd", 10, null);
dict.add("bacde", 10, null);
assertNull(FusionDictionary.findWordInTree(dict.mRoot, "ba"));
assertNotNull(FusionDictionary.findWordInTree(dict.mRoot, "babcd"));
assertNotNull(FusionDictionary.findWordInTree(dict.mRoot, "bacde"));
} }
} }