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

[IL68] Start refactoring setComposingWord 

Bug: 8636060
Change-Id: I242b7c264abf380bcd6b6b3c848238921f988e54
main
Jean Chalard 2013-12-27 20:24:34 +09:00
parent eb6d41a525
commit 9da4b49ef6
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
java/src/com/android/inputmethod/latin/WordComposer.java
View File

@ -16,6 +16,7 @@
package com.android.inputmethod.latin; package com.android.inputmethod.latin;
import com.android.inputmethod.annotations.UsedForTesting;
import com.android.inputmethod.keyboard.Key; import com.android.inputmethod.keyboard.Key;
import com.android.inputmethod.keyboard.Keyboard; import com.android.inputmethod.keyboard.Keyboard;
import com.android.inputmethod.latin.utils.StringUtils; import com.android.inputmethod.latin.utils.StringUtils;
@ -276,6 +277,8 @@ public final class WordComposer {
/** /**
* Add a dummy key by retrieving reasonable coordinates * Add a dummy key by retrieving reasonable coordinates
*/ */
// TODO: make this private or remove it entirely. Right now it's used in the tests
@UsedForTesting
public void addKeyInfo(final int codePoint, final Keyboard keyboard) { public void addKeyInfo(final int codePoint, final Keyboard keyboard) {
final int x, y; final int x, y;
final Key key; final Key key;

6
java/src/com/android/inputmethod/latin/spellcheck/AndroidWordLevelSpellCheckerSession.java
View File

@ -312,11 +312,7 @@ public abstract class AndroidWordLevelSpellCheckerSession extends Session {
false /* reportAsTypo */); false /* reportAsTypo */);
} }
final WordComposer composer = new WordComposer(); final WordComposer composer = new WordComposer();
final int length = text.length(); composer.setComposingWord(text, null /* previousWord */, dictInfo.mKeyboard);
for (int i = 0; i < length; i = text.offsetByCodePoints(i, 1)) {
final int codePoint = text.codePointAt(i);
composer.addKeyInfo(codePoint, dictInfo.getKeyboard(codePoint));
}
// TODO: make a spell checker option to block offensive words or not // TODO: make a spell checker option to block offensive words or not
final ArrayList<SuggestedWordInfo> suggestions = final ArrayList<SuggestedWordInfo> suggestions =
dictInfo.mDictionary.getSuggestions(composer, prevWord, dictInfo.mDictionary.getSuggestions(composer, prevWord,

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

@ -27,7 +27,7 @@ import com.android.inputmethod.keyboard.ProximityInfo;
*/ */
public final class DictAndKeyboard { public final class DictAndKeyboard {
public final Dictionary mDictionary; public final Dictionary mDictionary;
private final Keyboard mKeyboard; public final Keyboard mKeyboard;
private final Keyboard mManualShiftedKeyboard; private final Keyboard mManualShiftedKeyboard;
public DictAndKeyboard( public DictAndKeyboard(
@ -43,13 +43,6 @@ public final class DictAndKeyboard {
keyboardLayoutSet.getKeyboard(KeyboardId.ELEMENT_ALPHABET_MANUAL_SHIFTED); keyboardLayoutSet.getKeyboard(KeyboardId.ELEMENT_ALPHABET_MANUAL_SHIFTED);
} }
public Keyboard getKeyboard(final int codePoint) {
if (mKeyboard == null) {
return null;
}
return mKeyboard.getKey(codePoint) != null ? mKeyboard : mManualShiftedKeyboard;
}
public ProximityInfo getProximityInfo() { public ProximityInfo getProximityInfo() {
return mKeyboard == null ? null : mKeyboard.getProximityInfo(); return mKeyboard == null ? null : mKeyboard.getProximityInfo();
} }