From b8a2772b0e0367bc98b897f8b464e1dd042511df Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Wed, 15 Jan 2014 16:17:53 +0900
Subject: [PATCH] Consolidate LanguageModelParam constructors
Change-Id: I142651d1f268456a5901da524cbe55d315f76d28
---
.../inputmethod/latin/utils/LanguageModelParam.java | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/java/src/com/android/inputmethod/latin/utils/LanguageModelParam.java b/java/src/com/android/inputmethod/latin/utils/LanguageModelParam.java
index 847b7bb91b..663b6cdbe2 100644
--- a/java/src/com/android/inputmethod/latin/utils/LanguageModelParam.java
+++ b/java/src/com/android/inputmethod/latin/utils/LanguageModelParam.java
@@ -35,16 +35,7 @@ public class LanguageModelParam {
// Constructor for unigram. TODO: support shortcuts
public LanguageModelParam(final String word, final int unigramProbability,
final int timestamp) {
- mTargetWord = word;
- mWord0 = null;
- mWord1 = StringUtils.toCodePointArray(word);
- mShortcutTarget = null;
- mUnigramProbability = unigramProbability;
- mBigramProbability = Dictionary.NOT_A_PROBABILITY;
- mShortcutProbability = Dictionary.NOT_A_PROBABILITY;
- mIsNotAWord = false;
- mIsBlacklisted = false;
- mTimestamp = timestamp;
+ this(null /* word0 */, word, unigramProbability, Dictionary.NOT_A_PROBABILITY, timestamp);
}
// Constructor for unigram and bigram.
@@ -52,7 +43,7 @@ public class LanguageModelParam {
final int unigramProbability, final int bigramProbability,
final int timestamp) {
mTargetWord = word1;
- mWord0 = StringUtils.toCodePointArray(word0);
+ mWord0 = (word0 == null) ? null : StringUtils.toCodePointArray(word0);
mWord1 = StringUtils.toCodePointArray(word1);
mShortcutTarget = null;
mUnigramProbability = unigramProbability;
--
GitLab