From b5ac8ef5864ab198c26da55f4134f6e550d37015 Mon Sep 17 00:00:00 2001
From: Kurt Partridge <kep@google.com>
Date: Thu, 17 Jan 2013 07:50:15 -0800
Subject: [PATCH] Consolidate SuggestedWords.getWordInfo and .getInfo
Change-Id: I959cf049f550b7be3ec002281ca7457e566b0214
---
java/src/com/android/inputmethod/latin/SuggestedWords.java | 6 +-----
java/src/com/android/inputmethod/research/JsonUtils.java | 2 +-
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/java/src/com/android/inputmethod/latin/SuggestedWords.java b/java/src/com/android/inputmethod/latin/SuggestedWords.java
index 572f2906e1..b7ca60fecf 100644
--- a/java/src/com/android/inputmethod/latin/SuggestedWords.java
+++ b/java/src/com/android/inputmethod/latin/SuggestedWords.java
@@ -65,10 +65,6 @@ public final class SuggestedWords {
return mSuggestedWordInfoList.get(pos).mWord;
}
- public SuggestedWordInfo getWordInfo(int pos) {
- return mSuggestedWordInfoList.get(pos);
- }
-
public SuggestedWordInfo getInfo(int pos) {
return mSuggestedWordInfoList.get(pos);
}
@@ -113,7 +109,7 @@ public final class SuggestedWords {
alreadySeen.add(typedWord.toString());
final int previousSize = previousSuggestions.size();
for (int pos = 1; pos < previousSize; pos++) {
- final SuggestedWordInfo prevWordInfo = previousSuggestions.getWordInfo(pos);
+ final SuggestedWordInfo prevWordInfo = previousSuggestions.getInfo(pos);
final String prevWord = prevWordInfo.mWord;
// Filter out duplicate suggestion.
if (!alreadySeen.contains(prevWord)) {
diff --git a/java/src/com/android/inputmethod/research/JsonUtils.java b/java/src/com/android/inputmethod/research/JsonUtils.java
index 1dfd01c695..ceba08d47d 100644
--- a/java/src/com/android/inputmethod/research/JsonUtils.java
+++ b/java/src/com/android/inputmethod/research/JsonUtils.java
@@ -98,7 +98,7 @@ import java.util.Map;
jsonWriter.beginArray();
final int size = words.size();
for (int j = 0; j < size; j++) {
- final SuggestedWordInfo wordInfo = words.getWordInfo(j);
+ final SuggestedWordInfo wordInfo = words.getInfo(j);
jsonWriter.value(wordInfo.toString());
}
jsonWriter.endArray();
--
GitLab