From 2225b3bace388ba0b8789254da09fb9f6a6250e3 Mon Sep 17 00:00:00 2001 From: Jean Chalard Date: Thu, 21 Jun 2012 13:24:13 +0900 Subject: [PATCH] Do away with Utils#addAllSuggestions (A14) It's not used any more. Change-Id: Id9da40fdbf7078f3ac647d1368237d6601f5a2ba --- .../android/inputmethod/latin/BinaryDictionary.java | 2 -- .../inputmethod/latin/ExpandableDictionary.java | 2 -- java/src/com/android/inputmethod/latin/Utils.java | 10 ---------- .../latin/spellcheck/AndroidSpellCheckerService.java | 2 +- 4 files changed, 1 insertion(+), 15 deletions(-) diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionary.java b/java/src/com/android/inputmethod/latin/BinaryDictionary.java index 6b6ec2b45..9b950d260 100644 --- a/java/src/com/android/inputmethod/latin/BinaryDictionary.java +++ b/java/src/com/android/inputmethod/latin/BinaryDictionary.java @@ -141,7 +141,6 @@ public class BinaryDictionary extends Dictionary { mBigramScores[j], SuggestedWordInfo.KIND_CORRECTION)); } } - Utils.addAllSuggestions(mDicTypeId, Dictionary.BIGRAM, suggestions, callback); return suggestions; } @@ -168,7 +167,6 @@ public class BinaryDictionary extends Dictionary { mScores[j], SuggestedWordInfo.KIND_CORRECTION)); } } - Utils.addAllSuggestions(mDicTypeId, Dictionary.UNIGRAM, suggestions, callback); return suggestions; } diff --git a/java/src/com/android/inputmethod/latin/ExpandableDictionary.java b/java/src/com/android/inputmethod/latin/ExpandableDictionary.java index 7d131a664..e48e9e974 100644 --- a/java/src/com/android/inputmethod/latin/ExpandableDictionary.java +++ b/java/src/com/android/inputmethod/latin/ExpandableDictionary.java @@ -262,7 +262,6 @@ public class ExpandableDictionary extends Dictionary { } final ArrayList suggestions = getWordsInner(codes, prevWordForBigrams, proximityInfo); - Utils.addAllSuggestions(mDicTypeId, Dictionary.UNIGRAM, suggestions, callback); return suggestions; } @@ -618,7 +617,6 @@ public class ExpandableDictionary extends Dictionary { if (!reloadDictionaryIfRequired()) { final ArrayList suggestions = new ArrayList(); runBigramReverseLookUp(previousWord, suggestions); - Utils.addAllSuggestions(mDicTypeId, Dictionary.BIGRAM, suggestions, callback); return suggestions; } return null; diff --git a/java/src/com/android/inputmethod/latin/Utils.java b/java/src/com/android/inputmethod/latin/Utils.java index 19ac71876..8f71de0e7 100644 --- a/java/src/com/android/inputmethod/latin/Utils.java +++ b/java/src/com/android/inputmethod/latin/Utils.java @@ -531,14 +531,4 @@ public class Utils { } return builder.toString(); } - - public static void addAllSuggestions(final int dicTypeId, final int dataType, - final ArrayList suggestions, - final Dictionary.WordCallback callback) { - for (SuggestedWordInfo suggestion : suggestions) { - final String suggestionStr = suggestion.mWord.toString(); - callback.addWord(suggestionStr.toCharArray(), null, 0, suggestionStr.length(), - suggestion.mScore, dicTypeId, dataType); - } - } } diff --git a/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java b/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java index f68fc10ea..acaf3d235 100644 --- a/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java +++ b/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java @@ -792,7 +792,7 @@ public class AndroidSpellCheckerService extends SpellCheckerService composer, prevWord, suggestionsGatherer, dictInfo.mProximityInfo); for (final SuggestedWordInfo suggestion : suggestions) { final String suggestionStr = suggestion.mWord.toString(); - suggestionsGatherer.oldAddWord(suggestionStr.toCharArray(), 0, + suggestionsGatherer.oldAddWord(suggestionStr.toCharArray(), null, 0, suggestionStr.length(), suggestion.mScore, 0 /* ignored */, Dictionary.UNIGRAM); }