diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-10-21 15:06:54 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2014-10-21 15:06:55 +0000 |
| commit | 46a007261fcbfbe887e22ecdf16307f95b1e4024 (patch) | |
| tree | d47b90911c51c7ff6eabb6466f47a84d4574cbba /java/src/com/android/inputmethod/latin/NgramContext.java | |
| parent | 0b8bb0c21bda18e77a52d980891d56430e113a6f (diff) | |
| parent | 5f00fe09e9a611b647592188316e5999465df4d3 (diff) | |
| download | latinime-46a007261fcbfbe887e22ecdf16307f95b1e4024.tar.gz latinime-46a007261fcbfbe887e22ecdf16307f95b1e4024.tar.xz latinime-46a007261fcbfbe887e22ecdf16307f95b1e4024.zip | |
Merge "Fix some compiler warnings"
Diffstat (limited to 'java/src/com/android/inputmethod/latin/NgramContext.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/NgramContext.java | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/java/src/com/android/inputmethod/latin/NgramContext.java b/java/src/com/android/inputmethod/latin/NgramContext.java index a02531cc4..2dc409f9f 100644 --- a/java/src/com/android/inputmethod/latin/NgramContext.java +++ b/java/src/com/android/inputmethod/latin/NgramContext.java @@ -31,14 +31,14 @@ public class NgramContext { public static final NgramContext EMPTY_PREV_WORDS_INFO = new NgramContext(WordInfo.EMPTY_WORD_INFO); public static final NgramContext BEGINNING_OF_SENTENCE = - new NgramContext(WordInfo.BEGINNING_OF_SENTENCE); + new NgramContext(WordInfo.BEGINNING_OF_SENTENCE_WORD_INFO); /** * Word information used to represent previous words information. */ public static class WordInfo { public static final WordInfo EMPTY_WORD_INFO = new WordInfo(null); - public static final WordInfo BEGINNING_OF_SENTENCE = new WordInfo(); + public static final WordInfo BEGINNING_OF_SENTENCE_WORD_INFO = new WordInfo(); // This is an empty char sequence when mIsBeginningOfSentence is true. public final CharSequence mWord; @@ -48,7 +48,7 @@ public class NgramContext { public final boolean mIsBeginningOfSentence; // Beginning of sentence. - public WordInfo() { + private WordInfo() { mWord = ""; mIsBeginningOfSentence = true; } @@ -96,18 +96,6 @@ public class NgramContext { mPrevWordsCount = prevWordsInfo.length; } - // Construct from WordInfo array and size. The caller shouldn't change prevWordsInfo after - // calling this method. - private NgramContext(final NgramContext ngramContext, final int prevWordsCount) { - if (ngramContext.mPrevWordsCount < prevWordsCount) { - throw new IndexOutOfBoundsException("ngramContext.mPrevWordsCount (" - + ngramContext.mPrevWordsCount + ") is smaller than prevWordsCount (" - + prevWordsCount + ")"); - } - mPrevWordsInfo = ngramContext.mPrevWordsInfo; - mPrevWordsCount = prevWordsCount; - } - // Create next prevWordsInfo using current prevWordsInfo. public NgramContext getNextNgramContext(final WordInfo wordInfo) { final int nextPrevWordCount = Math.min(Constants.MAX_PREV_WORD_COUNT_FOR_N_GRAM, |