am a306e087: Rename BinaryDictEncoder to BinaryDictEncoderUtils. (b6922356) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/latin/DictionaryWriter.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ import android.content.Context;

		import com.android.inputmethod.keyboard.ProximityInfo;
		import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
		import com.android.inputmethod.latin.makedict.BinaryDictEncoder;
		import com.android.inputmethod.latin.makedict.BinaryDictEncoderUtils;
		import com.android.inputmethod.latin.makedict.FormatSpec;
		import com.android.inputmethod.latin.makedict.FusionDictionary;
		import com.android.inputmethod.latin.makedict.FusionDictionary.PtNodeArray;
		@@ -87,7 +87,7 @@ public class DictionaryWriter extends AbstractDictionaryWriter {
		@Override
		protected void writeBinaryDictionary(final FileOutputStream out)
		throws IOException, UnsupportedFormatException {
		BinaryDictEncoder.writeDictionaryBinary(out, mFusionDictionary, FORMAT_OPTIONS);
		BinaryDictEncoderUtils.writeDictionaryBinary(out, mFusionDictionary, FORMAT_OPTIONS);
		}

		@Override

java/src/com/android/inputmethod/latin/makedict/BinaryDictEncoder.java→java/src/com/android/inputmethod/latin/makedict/BinaryDictEncoderUtils.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -34,11 +34,11 @@ import java.util.Iterator;
		*
		* All the methods in this class are static.
		*/
		public class BinaryDictEncoder {
		public class BinaryDictEncoderUtils {

		private static final boolean DBG = MakedictLog.DBG;

		private BinaryDictEncoder() {
		private BinaryDictEncoderUtils() {
		// This utility class is not publicly instantiable.
		}

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

+9 −9

Original line number	Diff line number	Diff line
		@@ -272,7 +272,7 @@ public final class BinaryDictIOUtils {
		*/
		private static int writeVariableAddress(final OutputStream destination, final int value)
		throws IOException {
		switch (BinaryDictEncoder.getByteSize(value)) {
		switch (BinaryDictEncoderUtils.getByteSize(value)) {
		case 1:
		destination.write((byte)value);
		break;
		@@ -286,7 +286,7 @@ public final class BinaryDictIOUtils {
		destination.write((byte)(0xFF & value));
		break;
		}
		return BinaryDictEncoder.getByteSize(value);
		return BinaryDictEncoderUtils.getByteSize(value);
		}

		static void skipCharGroup(final DictBuffer dictBuffer,
		@@ -413,14 +413,14 @@ public final class BinaryDictIOUtils {

		if (info.mShortcutTargets != null && info.mShortcutTargets.size() > 0) {
		final int shortcutListSize =
		BinaryDictEncoder.getShortcutListSize(info.mShortcutTargets);
		BinaryDictEncoderUtils.getShortcutListSize(info.mShortcutTargets);
		destination.write((byte)(shortcutListSize >> 8));
		destination.write((byte)(shortcutListSize & 0xFF));
		size += 2;
		final Iterator<WeightedString> shortcutIterator = info.mShortcutTargets.iterator();
		while (shortcutIterator.hasNext()) {
		final WeightedString target = shortcutIterator.next();
		destination.write((byte)BinaryDictEncoder.makeShortcutFlags(
		destination.write((byte)BinaryDictEncoderUtils.makeShortcutFlags(
		shortcutIterator.hasNext(), target.mFrequency));
		size++;
		size += writeString(destination, target.mWord);
		@@ -429,7 +429,7 @@ public final class BinaryDictIOUtils {

		if (info.mBigrams != null) {
		// TODO: Consolidate this code with the code that computes the size of the bigram list
		// in BinaryDictEncoder#computeActualNodeArraySize
		// in BinaryDictEncoderUtils#computeActualNodeArraySize
		for (int i = 0; i < info.mBigrams.size(); ++i) {

		final int bigramFrequency = info.mBigrams.get(i).mFrequency;
		@@ -439,7 +439,7 @@ public final class BinaryDictIOUtils {
		final int bigramOffset = info.mBigrams.get(i).mAddress - (info.mOriginalAddress
		+ size);
		bigramFlags \|= (bigramOffset < 0) ? FormatSpec.FLAG_ATTRIBUTE_OFFSET_NEGATIVE : 0;
		switch (BinaryDictEncoder.getByteSize(bigramOffset)) {
		switch (BinaryDictEncoderUtils.getByteSize(bigramOffset)) {
		case 1:
		bigramFlags \|= FormatSpec.FLAG_ATTRIBUTE_ADDRESS_TYPE_ONEBYTE;
		break;
		@@ -463,18 +463,18 @@ public final class BinaryDictIOUtils {
		*/
		static int computeGroupSize(final CharGroupInfo info, final FormatOptions formatOptions) {
		int size = FormatSpec.GROUP_FLAGS_SIZE + FormatSpec.PARENT_ADDRESS_SIZE
		+ BinaryDictEncoder.getGroupCharactersSize(info.mCharacters)
		+ BinaryDictEncoderUtils.getGroupCharactersSize(info.mCharacters)
		+ getChildrenAddressSize(info.mFlags, formatOptions);
		if ((info.mFlags & FormatSpec.FLAG_IS_TERMINAL) != 0) {
		size += FormatSpec.GROUP_FREQUENCY_SIZE;
		}
		if (info.mShortcutTargets != null && !info.mShortcutTargets.isEmpty()) {
		size += BinaryDictEncoder.getShortcutListSize(info.mShortcutTargets);
		size += BinaryDictEncoderUtils.getShortcutListSize(info.mShortcutTargets);
		}
		if (info.mBigrams != null) {
		for (final PendingAttribute attr : info.mBigrams) {
		size += FormatSpec.GROUP_FLAGS_SIZE;
		size += BinaryDictEncoder.getByteSize(attr.mAddress);
		size += BinaryDictEncoderUtils.getByteSize(attr.mAddress);
		}
		}
		return size;

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

+7 −7

Original line number	Diff line number	Diff line
		@@ -314,7 +314,7 @@ public final class DynamicBinaryDictIOUtils {
		* abc - d - ef
		*/
		final int newNodeAddress = dictBuffer.limit();
		final int flags = BinaryDictEncoder.makeCharGroupFlags(p > 1,
		final int flags = BinaryDictEncoderUtils.makeCharGroupFlags(p > 1,
		isTerminal, 0, hasShortcuts, hasBigrams, false /* isNotAWord */,
		false /* isBlackListEntry */, fileHeader.mFormatOptions);
		int written = moveGroup(newNodeAddress, currentInfo.mCharacters, p, flags,
		@@ -353,7 +353,7 @@ public final class DynamicBinaryDictIOUtils {
		final int childrenAddress = currentInfo.mChildrenAddress;

		// move prefix
		final int prefixFlags = BinaryDictEncoder.makeCharGroupFlags(p > 1,
		final int prefixFlags = BinaryDictEncoderUtils.makeCharGroupFlags(p > 1,
		false /* isTerminal /, 0 / childrenAddressSize*/,
		false /* hasShortcut /, false / hasBigrams */,
		false /* isNotAWord /, false / isBlackListEntry */,
		@@ -369,7 +369,7 @@ public final class DynamicBinaryDictIOUtils {
		updateParentAddresses(dictBuffer, currentInfo.mChildrenAddress,
		newNodeAddress + written + 1, fileHeader.mFormatOptions);
		}
		final int suffixFlags = BinaryDictEncoder.makeCharGroupFlags(
		final int suffixFlags = BinaryDictEncoderUtils.makeCharGroupFlags(
		suffixCharacters.length > 1,
		(currentInfo.mFlags & FormatSpec.FLAG_IS_TERMINAL) != 0,
		0 /* childrenAddressSize */,
		@@ -387,7 +387,7 @@ public final class DynamicBinaryDictIOUtils {

		final int[] newCharacters = Arrays.copyOfRange(codePoints, wordPos + p,
		codePoints.length);
		final int flags = BinaryDictEncoder.makeCharGroupFlags(
		final int flags = BinaryDictEncoderUtils.makeCharGroupFlags(
		newCharacters.length > 1, isTerminal,
		0 /* childrenAddressSize */, hasShortcuts, hasBigrams,
		isNotAWord, isBlackListEntry, fileHeader.mFormatOptions);
		@@ -410,7 +410,7 @@ public final class DynamicBinaryDictIOUtils {
		// only update group.
		final int newNodeAddress = dictBuffer.limit();
		final boolean hasMultipleChars = currentInfo.mCharacters.length > 1;
		final int flags = BinaryDictEncoder.makeCharGroupFlags(hasMultipleChars,
		final int flags = BinaryDictEncoderUtils.makeCharGroupFlags(hasMultipleChars,
		isTerminal, 0 /* childrenAddressSize */, hasShortcuts, hasBigrams,
		isNotAWord, isBlackListEntry, fileHeader.mFormatOptions);
		final CharGroupInfo newInfo = new CharGroupInfo(newNodeAddress + 1,
		@@ -440,7 +440,7 @@ public final class DynamicBinaryDictIOUtils {
		fileHeader.mFormatOptions);
		final int newGroupAddress = newNodeAddress + 1;
		final boolean hasMultipleChars = (wordLen - wordPos) > 1;
		final int flags = BinaryDictEncoder.makeCharGroupFlags(hasMultipleChars,
		final int flags = BinaryDictEncoderUtils.makeCharGroupFlags(hasMultipleChars,
		isTerminal, 0 /* childrenAddressSize */, hasShortcuts, hasBigrams,
		isNotAWord, isBlackListEntry, fileHeader.mFormatOptions);
		final int[] characters = Arrays.copyOfRange(codePoints, wordPos, wordLen);
		@@ -485,7 +485,7 @@ public final class DynamicBinaryDictIOUtils {
		BinaryDictIOUtils.writeSInt24ToBuffer(dictBuffer, newNodeAddress);

		final int[] characters = Arrays.copyOfRange(codePoints, wordPos, wordLen);
		final int flags = BinaryDictEncoder.makeCharGroupFlags(characters.length > 1,
		final int flags = BinaryDictEncoderUtils.makeCharGroupFlags(characters.length > 1,
		isTerminal, 0 /* childrenAddressSize */, hasShortcuts, hasBigrams,
		isNotAWord, isBlackListEntry, fileHeader.mFormatOptions);
		final CharGroupInfo newInfo = new CharGroupInfo(newNodeAddress + 1,

java/src/com/android/inputmethod/latin/utils/UserHistoryDictIOUtils.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ package com.android.inputmethod.latin.utils;
		import android.util.Log;

		import com.android.inputmethod.annotations.UsedForTesting;
		import com.android.inputmethod.latin.makedict.BinaryDictEncoder;
		import com.android.inputmethod.latin.makedict.BinaryDictEncoderUtils;
		import com.android.inputmethod.latin.makedict.BinaryDictIOUtils;
		import com.android.inputmethod.latin.makedict.FormatSpec.FormatOptions;
		import com.android.inputmethod.latin.makedict.FusionDictionary;
		@@ -62,7 +62,7 @@ public final class UserHistoryDictIOUtils {
		final FormatOptions formatOptions) {
		final FusionDictionary fusionDict = constructFusionDictionary(dict, bigrams);
		try {
		BinaryDictEncoder.writeDictionaryBinary(destination, fusionDict, formatOptions);
		BinaryDictEncoderUtils.writeDictionaryBinary(destination, fusionDict, formatOptions);
		Log.d(TAG, "end writing");
		} catch (IOException e) {
		Log.e(TAG, "IO exception while writing file", e);