1 files changed, 13 insertions, 13 deletions
diff --git a/java/src/com/android/inputmethod/latin/UserBigramDictionary.java b/java/src/com/android/inputmethod/latin/UserBigramDictionary.java
index 67d9c0bcf..4750fb991 100644
--- a/java/src/com/android/inputmethod/latin/UserBigramDictionary.java
+++ b/java/src/com/android/inputmethod/latin/UserBigramDictionary.java
@@ -16,10 +16,6 @@
 
 package com.android.inputmethod.latin;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
@@ -30,6 +26,10 @@ import android.os.AsyncTask;
 import android.provider.BaseColumns;
 import android.util.Log;
 
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+
 /**
  * Stores all the pairs user types in databases. Prune the database if the size
  * gets too big. Unlike AutoDictionary, it even stores the pairs that are already
@@ -108,25 +108,25 @@ public class UserBigramDictionary extends ExpandableDictionary {
     private static DatabaseHelper sOpenHelper = null;
 
     private static class Bigram {
-        String word1;
-        String word2;
-        int frequency;
+        public final String mWord1;
+        public final String mWord2;
+        public final int frequency;
 
         Bigram(String word1, String word2, int frequency) {
-            this.word1 = word1;
-            this.word2 = word2;
+            this.mWord1 = word1;
+            this.mWord2 = word2;
             this.frequency = frequency;
         }
 
         @Override
         public boolean equals(Object bigram) {
             Bigram bigram2 = (Bigram) bigram;
-            return (word1.equals(bigram2.word1) && word2.equals(bigram2.word2));
+            return (mWord1.equals(bigram2.mWord1) && mWord2.equals(bigram2.mWord2));
         }
 
         @Override
         public int hashCode() {
-            return (word1 + " " + word2).hashCode();
+            return (mWord1 + " " + mWord2).hashCode();
         }
     }
 
@@ -357,7 +357,7 @@ public class UserBigramDictionary extends ExpandableDictionary {
                 Cursor c = db.query(MAIN_TABLE_NAME, new String[] { MAIN_COLUMN_ID },
                         MAIN_COLUMN_WORD1 + "=? AND " + MAIN_COLUMN_WORD2 + "=? AND "
                         + MAIN_COLUMN_LOCALE + "=?",
-                        new String[] { bi.word1, bi.word2, mLocale }, null, null, null);
+                        new String[] { bi.mWord1, bi.mWord2, mLocale }, null, null, null);
 
                 int pairId;
                 if (c.moveToFirst()) {
@@ -368,7 +368,7 @@ public class UserBigramDictionary extends ExpandableDictionary {
                 } else {
                     // new pair
                     Long pairIdLong = db.insert(MAIN_TABLE_NAME, null,
-                            getContentValues(bi.word1, bi.word2, mLocale));
+                            getContentValues(bi.mWord1, bi.mWord2, mLocale));
                     pairId = pairIdLong.intValue();
                 }
                 c.close();