Small cleanups

Change-Id: Ic1a198ab1b4f0323fde9e4245729fd0e6011b914
main
Ken Wakasa 2012-06-27 14:35:24 +09:00
parent 1850551d6d
commit e55c23e4b0
3 changed files with 6 additions and 6 deletions

View File

@ -161,7 +161,7 @@ public class ContactsBinaryDictionary extends ExpandableBinaryDictionary {
* bigrams depending on locale. * bigrams depending on locale.
*/ */
private void addName(String name) { private void addName(String name) {
int len = name.codePointCount(0, name.length()); int len = StringUtils.codePointCount(name);
String prevWord = null; String prevWord = null;
// TODO: Better tokenization for non-Latin writing systems // TODO: Better tokenization for non-Latin writing systems
for (int i = 0; i < len; i++) { for (int i = 0; i < len; i++) {
@ -171,7 +171,7 @@ public class ContactsBinaryDictionary extends ExpandableBinaryDictionary {
i = end - 1; i = end - 1;
// Don't add single letter words, possibly confuses // Don't add single letter words, possibly confuses
// capitalization of i. // capitalization of i.
final int wordLen = word.codePointCount(0, word.length()); final int wordLen = StringUtils.codePointCount(word);
if (wordLen < MAX_WORD_LENGTH && wordLen > 1) { if (wordLen < MAX_WORD_LENGTH && wordLen > 1) {
super.addWord(word, null /* shortcut */, FREQUENCY_FOR_CONTACTS); super.addWord(word, null /* shortcut */, FREQUENCY_FOR_CONTACTS);
if (!TextUtils.isEmpty(prevWord)) { if (!TextUtils.isEmpty(prevWord)) {
@ -260,14 +260,14 @@ public class ContactsBinaryDictionary extends ExpandableBinaryDictionary {
* Checks if the words in a name are in the current binary dictionary. * Checks if the words in a name are in the current binary dictionary.
*/ */
private boolean isNameInDictionary(String name) { private boolean isNameInDictionary(String name) {
int len = name.codePointCount(0, name.length()); int len = StringUtils.codePointCount(name);
String prevWord = null; String prevWord = null;
for (int i = 0; i < len; i++) { for (int i = 0; i < len; i++) {
if (Character.isLetter(name.codePointAt(i))) { if (Character.isLetter(name.codePointAt(i))) {
int end = getWordEndPosition(name, len, i); int end = getWordEndPosition(name, len, i);
String word = name.substring(i, end); String word = name.substring(i, end);
i = end - 1; i = end - 1;
final int wordLen = word.codePointCount(0, word.length()); final int wordLen = StringUtils.codePointCount(word);
if (wordLen < MAX_WORD_LENGTH && wordLen > 1) { if (wordLen < MAX_WORD_LENGTH && wordLen > 1) {
if (!TextUtils.isEmpty(prevWord) && mUseFirstLastBigrams) { if (!TextUtils.isEmpty(prevWord) && mUseFirstLastBigrams) {
if (!super.isValidBigramLocked(prevWord, word)) { if (!super.isValidBigramLocked(prevWord, word)) {

View File

@ -142,7 +142,7 @@ public class SuggestedWords {
mWord = word; mWord = word;
mScore = score; mScore = score;
mKind = kind; mKind = kind;
mCodePointCount = mWordStr.codePointCount(0, mWordStr.length()); mCodePointCount = StringUtils.codePointCount(mWordStr);
} }

View File

@ -92,7 +92,7 @@ public class WordComposer {
refreshSize(); refreshSize();
} }
public final void refreshSize() { private final void refreshSize() {
mCodePointSize = mTypedWord.codePointCount(0, mTypedWord.length()); mCodePointSize = mTypedWord.codePointCount(0, mTypedWord.length());
} }