nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 96b22200: Privatize a few constants in BinaryDictionary.java 

* commit '96b22200beb98fd1a6288f4cf53e38611a09cdd0':
  Privatize a few constants in BinaryDictionary.java
main
Ken Wakasa 2012-12-17 00:52:39 -08:00 committed by Android Git Automerger
parent 68fd58c3c1 96b22200be
commit 5636930439
7 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
java/src/com/android/inputmethod/latin/BinaryDictionary.java
View File

@ -41,9 +41,9 @@ public final class BinaryDictionary extends Dictionary {
* It is necessary to keep it at this value because some languages e.g. German have * It is necessary to keep it at this value because some languages e.g. German have
* really long words. * really long words.
*/ */
public static final int MAX_WORD_LENGTH = Constants.Dictionary.MAX_WORD_LENGTH; private static final int MAX_WORD_LENGTH = Constants.Dictionary.MAX_WORD_LENGTH;
public static final int MAX_WORDS = 18; private static final int MAX_WORDS = 18;
public static final int MAX_SPACES = 16; private static final int MAX_SPACES = 16;
private static final int MAX_PREDICTIONS = 60; private static final int MAX_PREDICTIONS = 60;
private static final int MAX_RESULTS = Math.max(MAX_PREDICTIONS, MAX_WORDS); private static final int MAX_RESULTS = Math.max(MAX_PREDICTIONS, MAX_WORDS);

5
java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
View File

@ -51,10 +51,9 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
private static boolean DEBUG = false; private static boolean DEBUG = false;
/** /**
* The maximum length of a word in this dictionary. This is the same value as the binary * The maximum length of a word in this dictionary.
* dictionary.
*/ */
protected static final int MAX_WORD_LENGTH = BinaryDictionary.MAX_WORD_LENGTH; protected static final int MAX_WORD_LENGTH = Constants.Dictionary.MAX_WORD_LENGTH;
/** /**
* A static map of locks, each of which controls access to a single binary dictionary file. They * A static map of locks, each of which controls access to a single binary dictionary file. They

16
java/src/com/android/inputmethod/latin/ExpandableDictionary.java
View File

@ -40,7 +40,7 @@ public class ExpandableDictionary extends Dictionary {
protected static final int BIGRAM_MAX_FREQUENCY = 255; protected static final int BIGRAM_MAX_FREQUENCY = 255;
private Context mContext; private Context mContext;
private char[] mWordBuilder = new char[BinaryDictionary.MAX_WORD_LENGTH]; private char[] mWordBuilder = new char[Constants.Dictionary.MAX_WORD_LENGTH];
private int mMaxDepth; private int mMaxDepth;
private int mInputLength; private int mInputLength;
@ -158,7 +158,7 @@ public class ExpandableDictionary extends Dictionary {
super(dictType); super(dictType);
mContext = context; mContext = context;
clearDictionary(); clearDictionary();
mCodes = new int[BinaryDictionary.MAX_WORD_LENGTH][]; mCodes = new int[Constants.Dictionary.MAX_WORD_LENGTH][];
} }
public void loadDictionary() { public void loadDictionary() {
@ -195,11 +195,11 @@ public class ExpandableDictionary extends Dictionary {
} }
public int getMaxWordLength() { public int getMaxWordLength() {
return BinaryDictionary.MAX_WORD_LENGTH; return Constants.Dictionary.MAX_WORD_LENGTH;
} }
public void addWord(final String word, final String shortcutTarget, final int frequency) { public void addWord(final String word, final String shortcutTarget, final int frequency) {
if (word.length() >= BinaryDictionary.MAX_WORD_LENGTH) { if (word.length() >= Constants.Dictionary.MAX_WORD_LENGTH) {
return; return;
} }
addWordRec(mRoots, word, 0, shortcutTarget, frequency, null); addWordRec(mRoots, word, 0, shortcutTarget, frequency, null);
@ -254,7 +254,7 @@ public class ExpandableDictionary extends Dictionary {
final String prevWord, final ProximityInfo proximityInfo) { final String prevWord, final ProximityInfo proximityInfo) {
if (reloadDictionaryIfRequired()) return null; if (reloadDictionaryIfRequired()) return null;
if (composer.size() > 1) { if (composer.size() > 1) {
if (composer.size() >= BinaryDictionary.MAX_WORD_LENGTH) { if (composer.size() >= Constants.Dictionary.MAX_WORD_LENGTH) {
return null; return null;
} }
final ArrayList<SuggestedWordInfo> suggestions = final ArrayList<SuggestedWordInfo> suggestions =
@ -620,7 +620,7 @@ public class ExpandableDictionary extends Dictionary {
} }
// Local to reverseLookUp, but do not allocate each time. // Local to reverseLookUp, but do not allocate each time.
private final char[] mLookedUpString = new char[BinaryDictionary.MAX_WORD_LENGTH]; private final char[] mLookedUpString = new char[Constants.Dictionary.MAX_WORD_LENGTH];
/** /**
* reverseLookUp retrieves the full word given a list of terminal nodes and adds those words * reverseLookUp retrieves the full word given a list of terminal nodes and adds those words
@ -635,7 +635,7 @@ public class ExpandableDictionary extends Dictionary {
for (NextWord nextWord : terminalNodes) { for (NextWord nextWord : terminalNodes) {
node = nextWord.getWordNode(); node = nextWord.getWordNode();
freq = nextWord.getFrequency(); freq = nextWord.getFrequency();
int index = BinaryDictionary.MAX_WORD_LENGTH; int index = Constants.Dictionary.MAX_WORD_LENGTH;
do { do {
--index; --index;
mLookedUpString[index] = node.mCode; mLookedUpString[index] = node.mCode;
@ -647,7 +647,7 @@ public class ExpandableDictionary extends Dictionary {
// to ignore the word in this case. // to ignore the word in this case.
if (freq >= 0 && node == null) { if (freq >= 0 && node == null) {
suggestions.add(new SuggestedWordInfo(new String(mLookedUpString, index, suggestions.add(new SuggestedWordInfo(new String(mLookedUpString, index,
BinaryDictionary.MAX_WORD_LENGTH - index), Constants.Dictionary.MAX_WORD_LENGTH - index),
freq, SuggestedWordInfo.KIND_CORRECTION, mDictType)); freq, SuggestedWordInfo.KIND_CORRECTION, mDictType));
} }
} }

3
java/src/com/android/inputmethod/latin/LastComposedWord.java
View File

@ -45,7 +45,8 @@ public final class LastComposedWord {
public final String mCommittedWord; public final String mCommittedWord;
public final String mSeparatorString; public final String mSeparatorString;
public final String mPrevWord; public final String mPrevWord;
public final InputPointers mInputPointers = new InputPointers(BinaryDictionary.MAX_WORD_LENGTH); public final InputPointers mInputPointers =
new InputPointers(Constants.Dictionary.MAX_WORD_LENGTH);
private boolean mActive; private boolean mActive;

2
java/src/com/android/inputmethod/latin/RichInputConnection.java
View File

@ -46,7 +46,7 @@ public final class RichInputConnection {
private static final boolean DEBUG_PREVIOUS_TEXT = false; private static final boolean DEBUG_PREVIOUS_TEXT = false;
private static final boolean DEBUG_BATCH_NESTING = false; private static final boolean DEBUG_BATCH_NESTING = false;
// Provision for a long word pair and a separator // Provision for a long word pair and a separator
private static final int LOOKBACK_CHARACTER_NUM = BinaryDictionary.MAX_WORD_LENGTH * 2 + 1; private static final int LOOKBACK_CHARACTER_NUM = Constants.Dictionary.MAX_WORD_LENGTH * 2 + 1;
private static final Pattern spaceRegex = Pattern.compile("\\s+"); private static final Pattern spaceRegex = Pattern.compile("\\s+");
private static final int INVALID_CURSOR_POSITION = -1; private static final int INVALID_CURSOR_POSITION = -1;

8
java/src/com/android/inputmethod/latin/UserHistoryDictionary.java
View File

@ -147,8 +147,8 @@ public final class UserHistoryDictionary extends ExpandableDictionary {
* The second word may not be null (a NullPointerException would be thrown). * The second word may not be null (a NullPointerException would be thrown).
*/ */
public int addToUserHistory(final String word1, final String word2, final boolean isValid) { public int addToUserHistory(final String word1, final String word2, final boolean isValid) {
if (word2.length() >= BinaryDictionary.MAX_WORD_LENGTH || if (word2.length() >= Constants.Dictionary.MAX_WORD_LENGTH ||
(word1 != null && word1.length() >= BinaryDictionary.MAX_WORD_LENGTH)) { (word1 != null && word1.length() >= Constants.Dictionary.MAX_WORD_LENGTH)) {
return -1; return -1;
} }
if (mBigramListLock.tryLock()) { if (mBigramListLock.tryLock()) {
@ -239,8 +239,8 @@ public final class UserHistoryDictionary extends ExpandableDictionary {
@Override @Override
public void setBigram(final String word1, final String word2, final int frequency) { public void setBigram(final String word1, final String word2, final int frequency) {
if (word1.length() < BinaryDictionary.MAX_WORD_LENGTH if (word1.length() < Constants.Dictionary.MAX_WORD_LENGTH
&& word2.length() < BinaryDictionary.MAX_WORD_LENGTH) { && word2.length() < Constants.Dictionary.MAX_WORD_LENGTH) {
profTotal++; profTotal++;
if (DBG_SAVE_RESTORE) { if (DBG_SAVE_RESTORE) {
Log.d(TAG, "load bigram: " + word1 + "," + word2 + "," + frequency); Log.d(TAG, "load bigram: " + word1 + "," + word2 + "," + frequency);

14
java/src/com/android/inputmethod/latin/WordComposer.java
View File

@ -25,7 +25,7 @@ import java.util.Arrays;
* A place to store the currently composing word with information such as adjacent key codes as well * A place to store the currently composing word with information such as adjacent key codes as well
*/ */
public final class WordComposer { public final class WordComposer {
private static final int N = BinaryDictionary.MAX_WORD_LENGTH; private static final int MAX_WORD_LENGTH = Constants.Dictionary.MAX_WORD_LENGTH;
public static final int CAPS_MODE_OFF = 0; public static final int CAPS_MODE_OFF = 0;
// 1 is shift bit, 2 is caps bit, 4 is auto bit but this is just a convention as these bits // 1 is shift bit, 2 is caps bit, 4 is auto bit but this is just a convention as these bits
@ -36,7 +36,7 @@ public final class WordComposer {
public static final int CAPS_MODE_AUTO_SHIFT_LOCKED = 0x7; public static final int CAPS_MODE_AUTO_SHIFT_LOCKED = 0x7;
private int[] mPrimaryKeyCodes; private int[] mPrimaryKeyCodes;
private final InputPointers mInputPointers = new InputPointers(N); private final InputPointers mInputPointers = new InputPointers(MAX_WORD_LENGTH);
private final StringBuilder mTypedWord; private final StringBuilder mTypedWord;
private String mAutoCorrection; private String mAutoCorrection;
private boolean mIsResumed; private boolean mIsResumed;
@ -55,8 +55,8 @@ public final class WordComposer {
private boolean mIsFirstCharCapitalized; private boolean mIsFirstCharCapitalized;
public WordComposer() { public WordComposer() {
mPrimaryKeyCodes = new int[N]; mPrimaryKeyCodes = new int[MAX_WORD_LENGTH];
mTypedWord = new StringBuilder(N); mTypedWord = new StringBuilder(MAX_WORD_LENGTH);
mAutoCorrection = null; mAutoCorrection = null;
mTrailingSingleQuotesCount = 0; mTrailingSingleQuotesCount = 0;
mIsResumed = false; mIsResumed = false;
@ -111,7 +111,7 @@ public final class WordComposer {
// TODO: make sure that the index should not exceed MAX_WORD_LENGTH // TODO: make sure that the index should not exceed MAX_WORD_LENGTH
public int getCodeAt(int index) { public int getCodeAt(int index) {
if (index >= BinaryDictionary.MAX_WORD_LENGTH) { if (index >= MAX_WORD_LENGTH) {
return -1; return -1;
} }
return mPrimaryKeyCodes[index]; return mPrimaryKeyCodes[index];
@ -134,7 +134,7 @@ public final class WordComposer {
final int newIndex = size(); final int newIndex = size();
mTypedWord.appendCodePoint(primaryCode); mTypedWord.appendCodePoint(primaryCode);
refreshSize(); refreshSize();
if (newIndex < BinaryDictionary.MAX_WORD_LENGTH) { if (newIndex < MAX_WORD_LENGTH) {
mPrimaryKeyCodes[newIndex] = primaryCode >= Constants.CODE_SPACE mPrimaryKeyCodes[newIndex] = primaryCode >= Constants.CODE_SPACE
? Character.toLowerCase(primaryCode) : primaryCode; ? Character.toLowerCase(primaryCode) : primaryCode;
// In the batch input mode, the {@code mInputPointers} holds batch input points and // In the batch input mode, the {@code mInputPointers} holds batch input points and
@ -347,7 +347,7 @@ public final class WordComposer {
// or a DECIDED_WORD we may cancel the commit later; otherwise, we should deactivate // or a DECIDED_WORD we may cancel the commit later; otherwise, we should deactivate
// the last composed word to ensure this does not happen. // the last composed word to ensure this does not happen.
final int[] primaryKeyCodes = mPrimaryKeyCodes; final int[] primaryKeyCodes = mPrimaryKeyCodes;
mPrimaryKeyCodes = new int[N]; mPrimaryKeyCodes = new int[MAX_WORD_LENGTH];
final LastComposedWord lastComposedWord = new LastComposedWord(primaryKeyCodes, final LastComposedWord lastComposedWord = new LastComposedWord(primaryKeyCodes,
mInputPointers, mTypedWord.toString(), committedWord, separatorString, mInputPointers, mTypedWord.toString(), committedWord, separatorString,
prevWord); prevWord);