Merge "Remove DicNode.isFirstWord()."

This commit is contained in:
Keisuke Kuroyanagi 2014-03-27 08:17:04 +00:00 committed by Android (Google) Code Review
commit b4a983d400

View file

@ -218,10 +218,6 @@ class DicNode {
return CharUtils::isAsciiUpper(c); return CharUtils::isAsciiUpper(c);
} }
bool isFirstWord() const {
return mDicNodeProperties.getPrevWordTerminalPtNodePos() == NOT_A_DICT_POS;
}
bool isCompletion(const int inputSize) const { bool isCompletion(const int inputSize) const {
return mDicNodeState.mDicNodeStateInput.getInputIndex(0) >= inputSize; return mDicNodeState.mDicNodeStateInput.getInputIndex(0) >= inputSize;
} }
@ -292,7 +288,9 @@ class DicNode {
// the one that corresponds to the last word of the suggestion, and all the previous words // the one that corresponds to the last word of the suggestion, and all the previous words
// are concatenated together in mDicNodeStateOutput. // are concatenated together in mDicNodeStateOutput.
int getTotalNodeSpaceCount() const { int getTotalNodeSpaceCount() const {
if (isFirstWord()) return 0; if (!hasMultipleWords()) {
return 0;
}
return CharUtils::getSpaceCount(mDicNodeState.mDicNodeStateOutput.getCodePointBuf(), return CharUtils::getSpaceCount(mDicNodeState.mDicNodeStateOutput.getCodePointBuf(),
mDicNodeState.mDicNodeStateOutput.getPrevWordsLength()); mDicNodeState.mDicNodeStateOutput.getPrevWordsLength());
} }