From 870d89b1a81c263b3de96d0d035c2fb40071eed8 Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Thu, 13 Feb 2014 12:12:13 +0900 Subject: Refactor dictionary constructor This change must be checked in together with I3923d5af2a. Bug: 12994268 Change-Id: I19de6efbdfa3b6c6c69a20a836e53962fd5737de --- .../DecayingExpandableBinaryDictionaryBase.java | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'java/src/com/android/inputmethod/latin/personalization/DecayingExpandableBinaryDictionaryBase.java') diff --git a/java/src/com/android/inputmethod/latin/personalization/DecayingExpandableBinaryDictionaryBase.java b/java/src/com/android/inputmethod/latin/personalization/DecayingExpandableBinaryDictionaryBase.java index 6a7a3368e..9c74c243e 100644 --- a/java/src/com/android/inputmethod/latin/personalization/DecayingExpandableBinaryDictionaryBase.java +++ b/java/src/com/android/inputmethod/latin/personalization/DecayingExpandableBinaryDictionaryBase.java @@ -52,21 +52,10 @@ public abstract class DecayingExpandableBinaryDictionaryBase extends ExpandableB private final String mDictName; /* package */ DecayingExpandableBinaryDictionaryBase(final Context context, - final Locale locale, final String dictionaryType, final String dictName) { - super(context, dictName, locale, dictionaryType, true); - mLocale = locale; - mDictName = dictName; - if (mLocale != null && mLocale.toString().length() > 1) { - reloadDictionaryIfRequired(); - } - } - - // Creates an instance that uses a given dictionary file for testing. - @UsedForTesting - /* package */ DecayingExpandableBinaryDictionaryBase(final Context context, - final Locale locale, final String dictionaryType, final String dictName, + final String dictName, final Locale locale, final String dictionaryType, final File dictFile) { - super(context, dictName, locale, dictionaryType, true, dictFile); + super(context, getDictName(dictName, locale, dictFile), locale, dictionaryType, + true /* isUpdatable */, dictFile); mLocale = locale; mDictName = dictName; if (mLocale != null && mLocale.toString().length() > 1) { -- cgit v1.2.3-83-g751a