[Refactor] Move some helper methods to BinaryDictIOUtils. (1db93c9c) · Commits · e / os / android_packages_inputmethods_LatinIME

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

+58 −12

Original line number	Diff line number	Diff line
		@@ -87,7 +87,7 @@ public final class BinaryDictIOUtils {

		if (p.mNumOfCharGroup == Position.NOT_READ_GROUPCOUNT) {
		p.mNumOfCharGroup = BinaryDictInputOutput.readCharGroupCount(buffer);
		p.mAddress += BinaryDictInputOutput.getGroupCountSize(p.mNumOfCharGroup);
		p.mAddress += getGroupCountSize(p.mNumOfCharGroup);
		p.mPosition = 0;
		}
		if (p.mNumOfCharGroup == 0) {
		@@ -101,9 +101,9 @@ public final class BinaryDictIOUtils {
		}
		p.mPosition++;

		final boolean isMovedGroup = BinaryDictInputOutput.isMovedGroup(info.mFlags,
		final boolean isMovedGroup = isMovedGroup(info.mFlags,
		formatOptions);
		final boolean isDeletedGroup = BinaryDictInputOutput.isDeletedGroup(info.mFlags,
		final boolean isDeletedGroup = isDeletedGroup(info.mFlags,
		formatOptions);
		if (!isMovedGroup && !isDeletedGroup
		&& info.mFrequency != FusionDictionary.CharGroup.NOT_A_TERMINAL) {// found word
		@@ -130,7 +130,7 @@ public final class BinaryDictIOUtils {
		p.mAddress = buffer.position();
		}

		if (!isMovedGroup && BinaryDictInputOutput.hasChildrenAddress(info.mChildrenAddress)) {
		if (!isMovedGroup && hasChildrenAddress(info.mChildrenAddress)) {
		Position childrenPos = new Position(info.mChildrenAddress + headerSize, index);
		stack.push(childrenPos);
		}
		@@ -187,11 +187,9 @@ public final class BinaryDictIOUtils {
		final int charGroupPos = buffer.position();
		final CharGroupInfo currentInfo = BinaryDictInputOutput.readCharGroup(buffer,
		buffer.position(), header.mFormatOptions);
		final boolean isMovedGroup =
		BinaryDictInputOutput.isMovedGroup(currentInfo.mFlags,
		final boolean isMovedGroup = isMovedGroup(currentInfo.mFlags,
		header.mFormatOptions);
		final boolean isDeletedGroup =
		BinaryDictInputOutput.isDeletedGroup(currentInfo.mFlags,
		final boolean isDeletedGroup = isDeletedGroup(currentInfo.mFlags,
		header.mFormatOptions);
		if (isMovedGroup) continue;
		boolean same = true;
		@@ -490,8 +488,8 @@ public final class BinaryDictIOUtils {
		*/
		static int writeNode(final OutputStream destination, final CharGroupInfo[] infos)
		throws IOException {
		int size = BinaryDictInputOutput.getGroupCountSize(infos.length);
		switch (BinaryDictInputOutput.getGroupCountSize(infos.length)) {
		int size = getGroupCountSize(infos.length);
		switch (getGroupCountSize(infos.length)) {
		case 1:
		destination.write((byte)infos.length);
		break;
		@@ -566,4 +564,52 @@ public final class BinaryDictIOUtils {
		return null;
		}
		}

		/**
		* Helper method to hide the actual value of the no children address.
		*/
		public static boolean hasChildrenAddress(final int address) {
		return FormatSpec.NO_CHILDREN_ADDRESS != address;
		}

		/**
		* Helper method to check whether the group is moved.
		*/
		public static boolean isMovedGroup(final int flags, final FormatOptions options) {
		return options.mSupportsDynamicUpdate
		&& ((flags & FormatSpec.MASK_GROUP_ADDRESS_TYPE) == FormatSpec.FLAG_IS_MOVED);
		}

		/**
		* Helper method to check whether the dictionary can be updated dynamically.
		*/
		public static boolean supportsDynamicUpdate(final FormatOptions options) {
		return options.mVersion >= FormatSpec.FIRST_VERSION_WITH_DYNAMIC_UPDATE
		&& options.mSupportsDynamicUpdate;
		}

		/**
		* Helper method to check whether the group is deleted.
		*/
		public static boolean isDeletedGroup(final int flags, final FormatOptions formatOptions) {
		return formatOptions.mSupportsDynamicUpdate
		&& ((flags & FormatSpec.MASK_GROUP_ADDRESS_TYPE) == FormatSpec.FLAG_IS_DELETED);
		}

		/**
		* Compute the binary size of the group count
		* @param count the group count
		* @return the size of the group count, either 1 or 2 bytes.
		*/
		public static int getGroupCountSize(final int count) {
		if (FormatSpec.MAX_CHARGROUPS_FOR_ONE_BYTE_CHARGROUP_COUNT >= count) {
		return 1;
		} else if (FormatSpec.MAX_CHARGROUPS_IN_A_NODE >= count) {
		return 2;
		} else {
		throw new RuntimeException("Can't have more than "
		+ FormatSpec.MAX_CHARGROUPS_IN_A_NODE + " groups in a node (found " + count
		+ ")");
		}
		}
		}

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

+18 −66

Original line number	Diff line number	Diff line
		@@ -306,30 +306,13 @@ public final class BinaryDictInputOutput {
		return getGroupCharactersSize(group.mChars);
		}

		/**
		* Compute the binary size of the group count
		* @param count the group count
		* @return the size of the group count, either 1 or 2 bytes.
		*/
		public static int getGroupCountSize(final int count) {
		if (FormatSpec.MAX_CHARGROUPS_FOR_ONE_BYTE_CHARGROUP_COUNT >= count) {
		return 1;
		} else if (FormatSpec.MAX_CHARGROUPS_IN_A_NODE >= count) {
		return 2;
		} else {
		throw new RuntimeException("Can't have more than "
		+ FormatSpec.MAX_CHARGROUPS_IN_A_NODE + " groups in a node (found " + count
		+ ")");
		}
		}

		/**
		* Compute the binary size of the group count for a node
		* @param node the node
		* @return the size of the group count, either 1 or 2 bytes.
		*/
		private static int getGroupCountSize(final Node node) {
		return getGroupCountSize(node.mData.size());
		return BinaryDictIOUtils.getGroupCountSize(node.mData.size());
		}

		/**
		@@ -403,37 +386,6 @@ public final class BinaryDictInputOutput {
		node.mCachedSize = size;
		}

		/**
		* Helper method to hide the actual value of the no children address.
		*/
		public static boolean hasChildrenAddress(final int address) {
		return FormatSpec.NO_CHILDREN_ADDRESS != address;
		}

		/**
		* Helper method to check whether the group is moved.
		*/
		public static boolean isMovedGroup(final int flags, final FormatOptions options) {
		return options.mSupportsDynamicUpdate
		&& ((flags & FormatSpec.MASK_GROUP_ADDRESS_TYPE) == FormatSpec.FLAG_IS_MOVED);
		}

		/**
		* Helper method to check whether the group is deleted.
		*/
		public static boolean isDeletedGroup(final int flags, final FormatOptions formatOptions) {
		return formatOptions.mSupportsDynamicUpdate
		&& ((flags & FormatSpec.MASK_GROUP_ADDRESS_TYPE) == FormatSpec.FLAG_IS_DELETED);
		}

		/**
		* Helper method to check whether the dictionary can be updated dynamically.
		*/
		public static boolean supportsDynamicUpdate(final FormatOptions options) {
		return options.mVersion >= FormatSpec.FIRST_VERSION_WITH_DYNAMIC_UPDATE
		&& options.mSupportsDynamicUpdate;
		}

		/**
		* Compute the size of the header (flag + [parent address] + characters size) of a CharGroup.
		*
		@@ -441,7 +393,7 @@ public final class BinaryDictInputOutput {
		* @param options file format options.
		*/
		private static int getGroupHeaderSize(final CharGroup group, final FormatOptions options) {
		if (supportsDynamicUpdate(options)) {
		if (BinaryDictIOUtils.supportsDynamicUpdate(options)) {
		return FormatSpec.GROUP_FLAGS_SIZE + FormatSpec.PARENT_ADDRESS_SIZE
		+ getGroupCharactersSize(group);
		} else {
		@@ -461,7 +413,7 @@ public final class BinaryDictInputOutput {
		*/
		static int getByteSize(final int address) {
		assert(address <= FormatSpec.UINT24_MAX);
		if (!hasChildrenAddress(address)) {
		if (!BinaryDictIOUtils.hasChildrenAddress(address)) {
		return 0;
		} else if (Math.abs(address) <= FormatSpec.UINT8_MAX) {
		return 1;
		@@ -802,7 +754,7 @@ public final class BinaryDictInputOutput {
		*/
		private static int writeVariableSignedAddress(final byte[] buffer, int index,
		final int address) {
		if (!hasChildrenAddress(address)) {
		if (!BinaryDictIOUtils.hasChildrenAddress(address)) {
		buffer[index] = buffer[index + 1] = buffer[index + 2] = 0;
		} else {
		final int absAddress = Math.abs(address);
		@@ -966,7 +918,7 @@ public final class BinaryDictInputOutput {

		private static final int writeParentAddress(final byte[] buffer, final int index,
		final int address, final FormatOptions formatOptions) {
		if (supportsDynamicUpdate(formatOptions)) {
		if (BinaryDictIOUtils.supportsDynamicUpdate(formatOptions)) {
		if (address == FormatSpec.NO_PARENT_ADDRESS) {
		buffer[index] = buffer[index + 1] = buffer[index + 2] = 0;
		} else {
		@@ -1315,7 +1267,7 @@ public final class BinaryDictInputOutput {

		static int readParentAddress(final FusionDictionaryBufferInterface buffer,
		final FormatOptions formatOptions) {
		if (supportsDynamicUpdate(formatOptions)) {
		if (BinaryDictIOUtils.supportsDynamicUpdate(formatOptions)) {
		final int parentAddress = buffer.readUnsignedInt24();
		final int sign = ((parentAddress & FormatSpec.MSB24) != 0) ? -1 : 1;
		return sign * (parentAddress & FormatSpec.SINT24_MAX);
		@@ -1332,7 +1284,7 @@ public final class BinaryDictInputOutput {
		++addressPointer;

		final int parentAddress = readParentAddress(buffer, options);
		if (supportsDynamicUpdate(options)) {
		if (BinaryDictIOUtils.supportsDynamicUpdate(options)) {
		addressPointer += 3;
		}

		@@ -1459,7 +1411,7 @@ public final class BinaryDictInputOutput {
		final int originalPointer = buffer.position();
		buffer.position(address);

		if (supportsDynamicUpdate(formatOptions)) {
		if (BinaryDictIOUtils.supportsDynamicUpdate(formatOptions)) {
		result = getWordAtAddressWithParentAddress(buffer, headerSize, address, formatOptions);
		} else {
		result = getWordAtAddressWithoutParentAddress(buffer, headerSize, address,
		@@ -1488,13 +1440,13 @@ public final class BinaryDictInputOutput {
		do {
		buffer.position(currentAddress + headerSize);
		currentInfo = readCharGroup(buffer, currentAddress, options);
		if (isMovedGroup(currentInfo.mFlags, options)) {
		if (BinaryDictIOUtils.isMovedGroup(currentInfo.mFlags, options)) {
		currentAddress = currentInfo.mParentAddress + currentInfo.mOriginalAddress;
		}
		if (DBG && loopCounter++ > MAX_JUMPS) {
		MakedictLog.d("Too many jumps - probably a bug");
		}
		} while (isMovedGroup(currentInfo.mFlags, options));
		} while (BinaryDictIOUtils.isMovedGroup(currentInfo.mFlags, options));
		if (Integer.MIN_VALUE == frequency) frequency = currentInfo.mFrequency;
		for (int i = 0; i < currentInfo.mCharacters.length; ++i) {
		sGetWordBuffer[index--] =
		@@ -1514,7 +1466,7 @@ public final class BinaryDictInputOutput {
		final FormatOptions options) {
		buffer.position(headerSize);
		final int count = readCharGroupCount(buffer);
		int groupOffset = getGroupCountSize(count);
		int groupOffset = BinaryDictIOUtils.getGroupCountSize(count);
		final StringBuilder builder = new StringBuilder();
		WeightedString result = null;

		@@ -1527,23 +1479,23 @@ public final class BinaryDictInputOutput {
		result = new WeightedString(builder.toString(), info.mFrequency);
		break; // and return
		}
		if (hasChildrenAddress(info.mChildrenAddress)) {
		if (BinaryDictIOUtils.hasChildrenAddress(info.mChildrenAddress)) {
		if (info.mChildrenAddress > address) {
		if (null == last) continue;
		builder.append(new String(last.mCharacters, 0, last.mCharacters.length));
		buffer.position(last.mChildrenAddress + headerSize);
		i = readCharGroupCount(buffer);
		groupOffset = last.mChildrenAddress + getGroupCountSize(i);
		groupOffset = last.mChildrenAddress + BinaryDictIOUtils.getGroupCountSize(i);
		last = null;
		continue;
		}
		last = info;
		}
		if (0 == i && hasChildrenAddress(last.mChildrenAddress)) {
		if (0 == i && BinaryDictIOUtils.hasChildrenAddress(last.mChildrenAddress)) {
		builder.append(new String(last.mCharacters, 0, last.mCharacters.length));
		buffer.position(last.mChildrenAddress + headerSize);
		i = readCharGroupCount(buffer);
		groupOffset = last.mChildrenAddress + getGroupCountSize(i);
		groupOffset = last.mChildrenAddress + BinaryDictIOUtils.getGroupCountSize(i);
		last = null;
		continue;
		}
		@@ -1576,10 +1528,10 @@ public final class BinaryDictInputOutput {
		do { // Scan the linked-list node.
		final int nodeHeadPosition = buffer.position() - headerSize;
		final int count = readCharGroupCount(buffer);
		int groupOffset = nodeHeadPosition + getGroupCountSize(count);
		int groupOffset = nodeHeadPosition + BinaryDictIOUtils.getGroupCountSize(count);
		for (int i = count; i > 0; --i) { // Scan the array of CharGroup.
		CharGroupInfo info = readCharGroup(buffer, groupOffset, options);
		if (isMovedGroup(info.mFlags, options)) continue;
		if (BinaryDictIOUtils.isMovedGroup(info.mFlags, options)) continue;
		ArrayList<WeightedString> shortcutTargets = info.mShortcutTargets;
		ArrayList<WeightedString> bigrams = null;
		if (null != info.mBigrams) {
		@@ -1592,7 +1544,7 @@ public final class BinaryDictInputOutput {
		bigrams.add(new WeightedString(word.mWord, reconstructedFrequency));
		}
		}
		if (hasChildrenAddress(info.mChildrenAddress)) {
		if (BinaryDictIOUtils.hasChildrenAddress(info.mChildrenAddress)) {
		Node children = reverseNodeMap.get(info.mChildrenAddress);
		if (null == children) {
		final int currentPosition = buffer.position();

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -85,7 +85,7 @@ public final class DynamicBinaryDictIOUtils {
		throw new RuntimeException("this file format does not support parent addresses");
		}
		final int flags = buffer.readUnsignedByte();
		if (BinaryDictInputOutput.isMovedGroup(flags, formatOptions)) {
		if (BinaryDictIOUtils.isMovedGroup(flags, formatOptions)) {
		// if the group is moved, the parent address is stored in the destination group.
		// We are guaranteed to process the destination group later, so there is no need to
		// update anything here.
		@@ -286,7 +286,7 @@ public final class DynamicBinaryDictIOUtils {
		address = buffer.position();
		final CharGroupInfo currentInfo = BinaryDictInputOutput.readCharGroup(buffer,
		buffer.position(), header.mFormatOptions);
		final boolean isMovedGroup = BinaryDictInputOutput.isMovedGroup(currentInfo.mFlags,
		final boolean isMovedGroup = BinaryDictIOUtils.isMovedGroup(currentInfo.mFlags,
		header.mFormatOptions);
		if (isMovedGroup) continue;
		nodeParentAddress = (currentInfo.mParentAddress == FormatSpec.NO_PARENT_ADDRESS)