Remove an unused method, make others static, fix a formatting
issue

Change-Id: I40cb0b5e01a6f8e2f7b953bd9aad3168dfee71d1
This commit is contained in:
Jean Chalard 2012-03-13 18:34:19 +09:00
parent 4ee186920e
commit d6662ecd30
2 changed files with 8 additions and 27 deletions

View file

@ -180,7 +180,7 @@ public class Suggest implements Dictionary.WordCallback {
return mUnigramDictionaries;
}
public int getApproxMaxWordLength() {
public static int getApproxMaxWordLength() {
return APPROX_MAX_WORD_LENGTH;
}
@ -215,23 +215,8 @@ public class Suggest implements Dictionary.WordCallback {
mAutoCorrectionThreshold = threshold;
}
/**
* Number of suggestions to generate from the input key sequence. This has
* to be a number between 1 and 100 (inclusive).
* @param maxSuggestions
* @throws IllegalArgumentException if the number is out of range
*/
public void setMaxSuggestions(int maxSuggestions) {
if (maxSuggestions < 1 || maxSuggestions > 100) {
throw new IllegalArgumentException("maxSuggestions must be between 1 and 100");
}
mPrefMaxSuggestions = maxSuggestions;
mScores = new int[mPrefMaxSuggestions];
mBigramScores = new int[PREF_MAX_BIGRAMS];
mSuggestions = new ArrayList<CharSequence>(mPrefMaxSuggestions);
}
private CharSequence capitalizeWord(boolean all, boolean first, CharSequence word) {
private static CharSequence capitalizeWord(final boolean all, final boolean first,
final CharSequence word) {
if (TextUtils.isEmpty(word) || !(all || first)) return word;
final int wordLength = word.length();
final StringBuilder sb = new StringBuilder(getApproxMaxWordLength());
@ -563,16 +548,16 @@ public class Suggest implements Dictionary.WordCallback {
// TODO This is almost O(n^2). Might need fix.
// search whether the word appeared in bigram data
int bigramSuggestSize = mBigramSuggestions.size();
for(int i = 0; i < bigramSuggestSize; i++) {
if(mBigramSuggestions.get(i).length() == length) {
for (int i = 0; i < bigramSuggestSize; i++) {
if (mBigramSuggestions.get(i).length() == length) {
boolean chk = true;
for(int j = 0; j < length; j++) {
if(mBigramSuggestions.get(i).charAt(j) != word[offset+j]) {
for (int j = 0; j < length; j++) {
if (mBigramSuggestions.get(i).charAt(j) != word[offset+j]) {
chk = false;
break;
}
}
if(chk) return i;
if (chk) return i;
}
}

View file

@ -191,10 +191,6 @@ public class SuggestedWords {
return mAllowsToBeAutoCorrected;
}
public boolean hasAutoCorrection() {
return mHasAutoCorrection;
}
@Override
public String toString() {
// Pretty-print method to help debug