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

Merge "Get rid of redundant CharSequence member from SuggestedWordInfo"

Browse source
This commit is contained in:
Tadashi G. Takaoka 2012-07-04 00:27:07 -07:00 committed by Android (Google) Code Review
commit 040aa28ed4
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
java/src/com/android/inputmethod/latin/SuggestedWords.java
View file

@ -55,7 +55,7 @@ public class SuggestedWords {
return mSuggestedWordInfoList.size(); return mSuggestedWordInfoList.size();
} }
public CharSequence getWord(int pos) { public String getWord(int pos) {
return mSuggestedWordInfoList.get(pos).mWord; return mSuggestedWordInfoList.get(pos).mWord;
} }
@ -125,8 +125,7 @@ public class SuggestedWords {
public static final int KIND_HARDCODED = 5; // Hardcoded suggestion, e.g. punctuation public static final int KIND_HARDCODED = 5; // Hardcoded suggestion, e.g. punctuation
public static final int KIND_APP_DEFINED = 6; // Suggested by the application public static final int KIND_APP_DEFINED = 6; // Suggested by the application
public static final int KIND_SHORTCUT = 7; // A shortcut public static final int KIND_SHORTCUT = 7; // A shortcut
private final String mWordStr; public final String mWord;
public final CharSequence mWord;
public final int mScore; public final int mScore;
public final int mKind; // one of the KIND_* constants above public final int mKind; // one of the KIND_* constants above
public final int mCodePointCount; public final int mCodePointCount;
@ -135,12 +134,11 @@ public class SuggestedWords {
public SuggestedWordInfo(final CharSequence word, final int score, final int kind, public SuggestedWordInfo(final CharSequence word, final int score, final int kind,
final String sourceDict) { final String sourceDict) {
mWordStr = word.toString(); mWord = word.toString();
mWord = word;
mScore = score; mScore = score;
mKind = kind; mKind = kind;
mSourceDict = sourceDict; mSourceDict = sourceDict;
mCodePointCount = StringUtils.codePointCount(mWordStr); mCodePointCount = StringUtils.codePointCount(mWord);
} }
@ -158,15 +156,15 @@ public class SuggestedWords {
} }
public int codePointAt(int i) { public int codePointAt(int i) {
return mWordStr.codePointAt(i); return mWord.codePointAt(i);
} }
@Override @Override
public String toString() { public String toString() {
if (TextUtils.isEmpty(mDebugString)) { if (TextUtils.isEmpty(mDebugString)) {
return mWordStr; return mWord;
} else { } else {
return mWordStr + " (" + mDebugString.toString() + ")"; return mWord + " (" + mDebugString.toString() + ")";
} }
} }
@ -180,7 +178,7 @@ public class SuggestedWords {
final SuggestedWordInfo cur = candidates.get(i); final SuggestedWordInfo cur = candidates.get(i);
for (int j = 0; j < i; ++j) { for (int j = 0; j < i; ++j) {
final SuggestedWordInfo previous = candidates.get(j); final SuggestedWordInfo previous = candidates.get(j);
if (TextUtils.equals(cur.mWord, previous.mWord)) { if (cur.mWord.equals(previous.mWord)) {
candidates.remove(cur.mScore < previous.mScore ? i : j); candidates.remove(cur.mScore < previous.mScore ? i : j);
--i; --i;
break; break;