From 2ae75ed56be5d08979d832cf3ddec16dc61e8dcf Mon Sep 17 00:00:00 2001
From: Jean Chalard <jchalard@google.com>
Date: Tue, 10 Jul 2012 20:13:54 +0900
Subject: [PATCH] Start converging two identical methods (A92)

Change-Id: I3c85a80610fde664a328f5606d0724f00d445ebe
---
 .../com/android/inputmethod/latin/BinaryDictionary.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionary.java b/java/src/com/android/inputmethod/latin/BinaryDictionary.java
index 4cae6bcdb..37bf3c789 100644
--- a/java/src/com/android/inputmethod/latin/BinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/BinaryDictionary.java
@@ -118,7 +118,7 @@ public class BinaryDictionary extends Dictionary {
     // TODO: move to native code
     private ArrayList<SuggestedWordInfo> getBigramsInternal(final WordComposer codes,
             final CharSequence previousWord) {
-        if (mNativeDict == 0) return null;
+        if (!isValidDictionary()) return null;
 
         int[] codePoints = StringUtils.toCodePointArray(previousWord.toString());
         Arrays.fill(mOutputChars_bigrams, (char) 0);
@@ -157,6 +157,8 @@ public class BinaryDictionary extends Dictionary {
     // proximityInfo and/or prevWordForBigrams may not be null.
     private ArrayList<SuggestedWordInfo> getWordsInternal(final WordComposer codes,
             final CharSequence prevWordForBigrams, final ProximityInfo proximityInfo) {
+        if (!isValidDictionary()) return null;
+
         final int count = getSuggestions(codes, prevWordForBigrams, proximityInfo, mOutputChars,
                 mScores, mSpaceIndices);
 
@@ -183,11 +185,9 @@ public class BinaryDictionary extends Dictionary {
     }
 
     // proximityInfo may not be null.
-    /* package for test */ int getSuggestions(final WordComposer codes,
+    private int getSuggestions(final WordComposer codes,
             final CharSequence prevWordForBigrams, final ProximityInfo proximityInfo,
             char[] outputChars, int[] scores, int[] spaceIndices) {
-        if (!isValidDictionary()) return -1;
-
         Arrays.fill(mInputCodes, WordComposer.NOT_A_CODE);
         Arrays.fill(outputChars, (char) 0);
         Arrays.fill(scores, 0);