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

am d2547c68: Merge "Have the spell checker report IN_DICT correctly" 

* commit 'd2547c68884860d19429f40ec1fd5fbfadebc366':
  Have the spell checker report IN_DICT correctly
main
Jean Chalard 2011-09-20 14:14:18 -07:00 committed by Android Git Automerger
parent b99ddf7aed d2547c6888
commit e373f10e49
2 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java
View File

@ -60,8 +60,11 @@ public class AndroidSpellCheckerService extends SpellCheckerService {
private static final int CAPITALIZE_ALL = 2; // All caps private static final int CAPITALIZE_ALL = 2; // All caps
private final static String[] EMPTY_STRING_ARRAY = new String[0]; private final static String[] EMPTY_STRING_ARRAY = new String[0];
private final static SuggestionsInfo EMPTY_SUGGESTIONS_INFO = private final static SuggestionsInfo NOT_IN_DICT_EMPTY_SUGGESTIONS =
new SuggestionsInfo(0, EMPTY_STRING_ARRAY); new SuggestionsInfo(0, EMPTY_STRING_ARRAY);
private final static SuggestionsInfo IN_DICT_EMPTY_SUGGESTIONS =
new SuggestionsInfo(SuggestionsInfo.RESULT_ATTR_IN_THE_DICTIONARY,
EMPTY_STRING_ARRAY);
private Map<String, DictionaryPool> mDictionaryPools = private Map<String, DictionaryPool> mDictionaryPools =
Collections.synchronizedMap(new TreeMap<String, DictionaryPool>()); Collections.synchronizedMap(new TreeMap<String, DictionaryPool>());
private Map<String, Dictionary> mUserDictionaries = private Map<String, Dictionary> mUserDictionaries =
@ -330,7 +333,12 @@ public class AndroidSpellCheckerService extends SpellCheckerService {
try { try {
final String text = textInfo.getText(); final String text = textInfo.getText();
if (shouldFilterOut(text)) return EMPTY_SUGGESTIONS_INFO; if (shouldFilterOut(text)) {
final DictAndProximity dictInfo = mDictionaryPool.takeOrGetNull();
if (null == dictInfo) return NOT_IN_DICT_EMPTY_SUGGESTIONS;
return dictInfo.mDictionary.isValidWord(text) ? IN_DICT_EMPTY_SUGGESTIONS
: NOT_IN_DICT_EMPTY_SUGGESTIONS;
}
final SuggestionsGatherer suggestionsGatherer = final SuggestionsGatherer suggestionsGatherer =
new SuggestionsGatherer(suggestionsLimit); new SuggestionsGatherer(suggestionsLimit);
@ -353,23 +361,19 @@ public class AndroidSpellCheckerService extends SpellCheckerService {
final int capitalizeType = getCapitalizationType(text); final int capitalizeType = getCapitalizationType(text);
boolean isInDict = true; boolean isInDict = true;
try { final DictAndProximity dictInfo = mDictionaryPool.takeOrGetNull();
final DictAndProximity dictInfo = mDictionaryPool.take(); if (null == dictInfo) return NOT_IN_DICT_EMPTY_SUGGESTIONS;
dictInfo.mDictionary.getWords(composer, suggestionsGatherer, dictInfo.mDictionary.getWords(composer, suggestionsGatherer,
dictInfo.mProximityInfo); dictInfo.mProximityInfo);
isInDict = dictInfo.mDictionary.isValidWord(text); isInDict = dictInfo.mDictionary.isValidWord(text);
if (!isInDict && CAPITALIZE_NONE != capitalizeType) { if (!isInDict && CAPITALIZE_NONE != capitalizeType) {
// We want to test the word again if it's all caps or first caps only. // We want to test the word again if it's all caps or first caps only.
// If it's fully down, we already tested it, if it's mixed case, we don't // If it's fully down, we already tested it, if it's mixed case, we don't
// want to test a lowercase version of it. // want to test a lowercase version of it.
isInDict = dictInfo.mDictionary.isValidWord(text.toLowerCase(mLocale)); isInDict = dictInfo.mDictionary.isValidWord(text.toLowerCase(mLocale));
} }
if (!mDictionaryPool.offer(dictInfo)) { if (!mDictionaryPool.offer(dictInfo)) {
Log.e(TAG, "Can't re-insert a dictionary into its pool"); Log.e(TAG, "Can't re-insert a dictionary into its pool");
}
} catch (InterruptedException e) {
// I don't think this can happen.
return EMPTY_SUGGESTIONS_INFO;
} }
final SuggestionsGatherer.Result result = suggestionsGatherer.getResults(text, final SuggestionsGatherer.Result result = suggestionsGatherer.getResults(text,
@ -396,7 +400,7 @@ public class AndroidSpellCheckerService extends SpellCheckerService {
throw e; throw e;
} else { } else {
Log.e(TAG, "Exception while spellcheking: " + e); Log.e(TAG, "Exception while spellcheking: " + e);
return EMPTY_SUGGESTIONS_INFO; return NOT_IN_DICT_EMPTY_SUGGESTIONS;
} }
} }
} }

9
java/src/com/android/inputmethod/latin/spellcheck/DictionaryPool.java
View File

@ -56,6 +56,15 @@ public class DictionaryPool extends LinkedBlockingQueue<DictAndProximity> {
} }
} }
// Convenience method
public DictAndProximity takeOrGetNull() {
try {
return take();
} catch (InterruptedException e) {
return null;
}
}
public void close() { public void close() {
synchronized(this) { synchronized(this) {
mClosed = true; mClosed = true;