Make readNode read linked list nodes. (c2fdf0df) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/latin/makedict/BinaryDictInputOutput.java

+50 −32

Original line number	Diff line number	Diff line
		@@ -1347,11 +1347,14 @@ public class BinaryDictInputOutput {
		final Map<Integer, Node> reverseNodeMap, final Map<Integer, CharGroup> reverseGroupMap,
		final FormatOptions options)
		throws IOException {
		final ArrayList<CharGroup> nodeContents = new ArrayList<CharGroup>();
		final int nodeOrigin = buffer.position() - headerSize;

		do { // Scan the linked-list node.
		final int nodeHeadPosition = buffer.position() - headerSize;
		final int count = readCharGroupCount(buffer);
		final ArrayList<CharGroup> nodeContents = new ArrayList<CharGroup>();
		int groupOffset = nodeOrigin + getGroupCountSize(count);
		for (int i = count; i > 0; --i) {
		int groupOffset = nodeHeadPosition + getGroupCountSize(count);
		for (int i = count; i > 0; --i) { // Scan the array of CharGroup.
		CharGroupInfo info = readCharGroup(buffer, groupOffset, options);
		ArrayList<WeightedString> shortcutTargets = info.mShortcutTargets;
		ArrayList<WeightedString> bigrams = null;
		@@ -1373,17 +1376,32 @@ public class BinaryDictInputOutput {
		buffer.position(currentPosition);
		}
		nodeContents.add(
		new CharGroup(info.mCharacters, shortcutTargets, bigrams, info.mFrequency,
		new CharGroup(info.mCharacters, shortcutTargets, bigrams,
		info.mFrequency,
		0 != (info.mFlags & FormatSpec.FLAG_IS_NOT_A_WORD),
		0 != (info.mFlags & FormatSpec.FLAG_IS_BLACKLISTED), children));
		} else {
		nodeContents.add(
		new CharGroup(info.mCharacters, shortcutTargets, bigrams, info.mFrequency,
		new CharGroup(info.mCharacters, shortcutTargets, bigrams,
		info.mFrequency,
		0 != (info.mFlags & FormatSpec.FLAG_IS_NOT_A_WORD),
		0 != (info.mFlags & FormatSpec.FLAG_IS_BLACKLISTED)));
		}
		groupOffset = info.mEndAddress;
		}

		// reach the end of the array.
		if (options.mHasLinkedListNode) {
		final int nextAddress = buffer.readUnsignedInt24();
		if (nextAddress >= 0 && nextAddress < buffer.limit()) {
		buffer.position(nextAddress);
		} else {
		break;
		}
		}
		} while (options.mHasLinkedListNode &&
		buffer.position() != FormatSpec.NO_FORWARD_LINK_ADDRESS);

		final Node node = new Node(nodeContents);
		node.mCachedAddress = nodeOrigin;
		reverseNodeMap.put(node.mCachedAddress, node);