From b50a7a4bc718f3611ac1e97a940d5a59b4b0133e Mon Sep 17 00:00:00 2001
From: Yuichiro Hanada <yhanada@google.com>
Date: Sat, 24 Aug 2013 00:24:26 +0900
Subject: [PATCH] Simplify computeActualNodeArraySize.
Change-Id: I128d02866c2cc70c42263496927327b8a2130139
---
.../latin/makedict/BinaryDictEncoderUtils.java | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/java/src/com/android/inputmethod/latin/makedict/BinaryDictEncoderUtils.java b/java/src/com/android/inputmethod/latin/makedict/BinaryDictEncoderUtils.java
index b95db2183c..79f5ad8bda 100644
--- a/java/src/com/android/inputmethod/latin/makedict/BinaryDictEncoderUtils.java
+++ b/java/src/com/android/inputmethod/latin/makedict/BinaryDictEncoderUtils.java
@@ -326,15 +326,11 @@ public class BinaryDictEncoderUtils {
}
int nodeSize = getNodeHeaderSize(ptNode, formatOptions);
if (ptNode.isTerminal()) nodeSize += FormatSpec.PTNODE_FREQUENCY_SIZE;
- if (null == ptNode.mChildren && formatOptions.mSupportsDynamicUpdate) {
+ if (formatOptions.mSupportsDynamicUpdate) {
nodeSize += FormatSpec.SIGNED_CHILDREN_ADDRESS_SIZE;
} else if (null != ptNode.mChildren) {
- if (formatOptions.mSupportsDynamicUpdate) {
- nodeSize += FormatSpec.SIGNED_CHILDREN_ADDRESS_SIZE;
- } else {
- nodeSize += getByteSize(getOffsetToTargetNodeArrayDuringUpdate(ptNodeArray,
- nodeSize + size, ptNode.mChildren));
- }
+ nodeSize += getByteSize(getOffsetToTargetNodeArrayDuringUpdate(ptNodeArray,
+ nodeSize + size, ptNode.mChildren));
}
nodeSize += getShortcutListSize(ptNode.mShortcutTargets);
if (null != ptNode.mBigrams) {
--
GitLab