Merge "Revert "[Refactor] Divide BinaryDictInputOutput into... (dc83fe37) · Commits · e / os / android_packages_inputmethods_LatinIME

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@ import android.content.SharedPreferences;
		import android.content.res.AssetFileDescriptor;
		import android.util.Log;

		import com.android.inputmethod.latin.makedict.BinaryDictInputUtils;
		import com.android.inputmethod.latin.makedict.BinaryDictInputOutput;
		import com.android.inputmethod.latin.makedict.FormatSpec;
		import com.android.inputmethod.latin.utils.CollectionUtils;
		import com.android.inputmethod.latin.utils.DictionaryInfoUtils;
		@@ -231,8 +231,8 @@ final public class BinaryDictionaryGetter {
		try {
		// Read the version of the file
		inStream = new FileInputStream(f);
		final BinaryDictInputUtils.ByteBufferWrapper buffer =
		new BinaryDictInputUtils.ByteBufferWrapper(inStream.getChannel().map(
		final BinaryDictInputOutput.ByteBufferWrapper buffer =
		new BinaryDictInputOutput.ByteBufferWrapper(inStream.getChannel().map(
		FileChannel.MapMode.READ_ONLY, 0, f.length()));
		final int magic = buffer.readInt();
		if (magic != FormatSpec.MAGIC_NUMBER) {
		@@ -241,7 +241,7 @@ final public class BinaryDictionaryGetter {
		final int formatVersion = buffer.readInt();
		final int headerSize = buffer.readInt();
		final HashMap<String, String> options = CollectionUtils.newHashMap();
		BinaryDictInputUtils.populateOptions(buffer, headerSize, options);
		BinaryDictInputOutput.populateOptions(buffer, headerSize, options);

		final String version = options.get(VERSION_KEY);
		if (null == version) {

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.BinaryDictOutputUtils;
		import com.android.inputmethod.latin.makedict.BinaryDictInputOutput;
		import com.android.inputmethod.latin.makedict.FormatSpec;
		import com.android.inputmethod.latin.makedict.FusionDictionary;
		import com.android.inputmethod.latin.makedict.FusionDictionary.Node;
		@@ -87,7 +87,7 @@ public class DictionaryWriter extends AbstractDictionaryWriter {
		@Override
		protected void writeBinaryDictionary(final FileOutputStream out)
		throws IOException, UnsupportedFormatException {
		BinaryDictOutputUtils.writeDictionaryBinary(out, mFusionDictionary, FORMAT_OPTIONS);
		BinaryDictInputOutput.writeDictionaryBinary(out, mFusionDictionary, FORMAT_OPTIONS);
		}

		@Override

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

+26 −42

Original line number	Diff line number	Diff line
		@@ -18,8 +18,8 @@ package com.android.inputmethod.latin.makedict;

		import com.android.inputmethod.annotations.UsedForTesting;
		import com.android.inputmethod.latin.Constants;
		import com.android.inputmethod.latin.makedict.BinaryDictInputUtils.CharEncoding;
		import com.android.inputmethod.latin.makedict.BinaryDictInputUtils.FusionDictionaryBufferInterface;
		import com.android.inputmethod.latin.makedict.BinaryDictInputOutput.CharEncoding;
		import com.android.inputmethod.latin.makedict.BinaryDictInputOutput.FusionDictionaryBufferInterface;
		import com.android.inputmethod.latin.makedict.FormatSpec.FileHeader;
		import com.android.inputmethod.latin.makedict.FormatSpec.FormatOptions;
		import com.android.inputmethod.latin.makedict.FusionDictionary.CharGroup;
		@@ -58,22 +58,6 @@ public final class BinaryDictIOUtils {
		}
		}

		static int getChildrenAddressSize(final int optionFlags,
		final FormatOptions formatOptions) {
		if (formatOptions.mSupportsDynamicUpdate) return FormatSpec.SIGNED_CHILDREN_ADDRESS_SIZE;
		switch (optionFlags & FormatSpec.MASK_GROUP_ADDRESS_TYPE) {
		case FormatSpec.FLAG_GROUP_ADDRESS_TYPE_ONEBYTE:
		return 1;
		case FormatSpec.FLAG_GROUP_ADDRESS_TYPE_TWOBYTES:
		return 2;
		case FormatSpec.FLAG_GROUP_ADDRESS_TYPE_THREEBYTES:
		return 3;
		case FormatSpec.FLAG_GROUP_ADDRESS_TYPE_NOADDRESS:
		default:
		return 0;
		}
		}

		/**
		* Tours all node without recursive call.
		*/
		@@ -102,7 +86,7 @@ public final class BinaryDictIOUtils {
		if (index != p.mLength) index = p.mLength;

		if (p.mNumOfCharGroup == Position.NOT_READ_GROUPCOUNT) {
		p.mNumOfCharGroup = BinaryDictInputUtils.readCharGroupCount(buffer);
		p.mNumOfCharGroup = BinaryDictInputOutput.readCharGroupCount(buffer);
		p.mAddress += getGroupCountSize(p.mNumOfCharGroup);
		p.mPosition = 0;
		}
		@@ -110,8 +94,8 @@ public final class BinaryDictIOUtils {
		stack.pop();
		continue;
		}
		CharGroupInfo info = BinaryDictInputUtils.readCharGroup(buffer, p.mAddress - headerSize,
		formatOptions);
		CharGroupInfo info = BinaryDictInputOutput.readCharGroup(buffer,
		p.mAddress - headerSize, formatOptions);
		for (int i = 0; i < info.mCharacters.length; ++i) {
		pushedChars[index++] = info.mCharacters[i];
		}
		@@ -169,7 +153,7 @@ public final class BinaryDictIOUtils {
		final Map<Integer, ArrayList<PendingAttribute>> bigrams) throws IOException,
		UnsupportedFormatException {
		// Read header
		final FileHeader header = BinaryDictInputUtils.readHeader(reader.getBuffer());
		final FileHeader header = BinaryDictInputOutput.readHeader(reader.getBuffer());
		readUnigramsAndBigramsBinaryInner(reader.getBuffer(), header.mHeaderSize, words,
		frequencies, bigrams, header.mFormatOptions);
		}
		@@ -190,18 +174,18 @@ public final class BinaryDictIOUtils {
		if (word == null) return FormatSpec.NOT_VALID_WORD;
		if (buffer.position() != 0) buffer.position(0);

		final FileHeader header = BinaryDictInputUtils.readHeader(buffer);
		final FileHeader header = BinaryDictInputOutput.readHeader(buffer);
		int wordPos = 0;
		final int wordLen = word.codePointCount(0, word.length());
		for (int depth = 0; depth < Constants.DICTIONARY_MAX_WORD_LENGTH; ++depth) {
		if (wordPos >= wordLen) return FormatSpec.NOT_VALID_WORD;

		do {
		final int charGroupCount = BinaryDictInputUtils.readCharGroupCount(buffer);
		final int charGroupCount = BinaryDictInputOutput.readCharGroupCount(buffer);
		boolean foundNextCharGroup = false;
		for (int i = 0; i < charGroupCount; ++i) {
		final int charGroupPos = buffer.position();
		final CharGroupInfo currentInfo = BinaryDictInputUtils.readCharGroup(buffer,
		final CharGroupInfo currentInfo = BinaryDictInputOutput.readCharGroup(buffer,
		buffer.position(), header.mFormatOptions);
		final boolean isMovedGroup = isMovedGroup(currentInfo.mFlags,
		header.mFormatOptions);
		@@ -287,7 +271,7 @@ public final class BinaryDictIOUtils {
		*/
		private static int writeVariableAddress(final OutputStream destination, final int value)
		throws IOException {
		switch (BinaryDictOutputUtils.getByteSize(value)) {
		switch (BinaryDictInputOutput.getByteSize(value)) {
		case 1:
		destination.write((byte)value);
		break;
		@@ -301,15 +285,15 @@ public final class BinaryDictIOUtils {
		destination.write((byte)(0xFF & value));
		break;
		}
		return BinaryDictOutputUtils.getByteSize(value);
		return BinaryDictInputOutput.getByteSize(value);
		}

		static void skipCharGroup(final FusionDictionaryBufferInterface buffer,
		final FormatOptions formatOptions) {
		final int flags = buffer.readUnsignedByte();
		BinaryDictInputUtils.readParentAddress(buffer, formatOptions);
		BinaryDictInputOutput.readParentAddress(buffer, formatOptions);
		skipString(buffer, (flags & FormatSpec.FLAG_HAS_MULTIPLE_CHARS) != 0);
		BinaryDictInputUtils.readChildrenAddress(buffer, flags, formatOptions);
		BinaryDictInputOutput.readChildrenAddress(buffer, flags, formatOptions);
		if ((flags & FormatSpec.FLAG_IS_TERMINAL) != 0) buffer.readUnsignedByte();
		if ((flags & FormatSpec.FLAG_HAS_SHORTCUT_TARGETS) != 0) {
		final int shortcutsSize = buffer.readUnsignedShort();
		@@ -427,14 +411,14 @@ public final class BinaryDictIOUtils {

		if (info.mShortcutTargets != null && info.mShortcutTargets.size() > 0) {
		final int shortcutListSize =
		BinaryDictOutputUtils.getShortcutListSize(info.mShortcutTargets);
		BinaryDictInputOutput.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)BinaryDictOutputUtils.makeShortcutFlags(
		destination.write((byte)BinaryDictInputOutput.makeShortcutFlags(
		shortcutIterator.hasNext(), target.mFrequency));
		size++;
		size += writeString(destination, target.mWord);
		@@ -443,7 +427,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 BinaryDictionaryOutput#computeActualNodeSize
		// in BinaryDictionaryInputOutput#computeActualNodeSize
		for (int i = 0; i < info.mBigrams.size(); ++i) {

		final int bigramFrequency = info.mBigrams.get(i).mFrequency;
		@@ -453,7 +437,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 (BinaryDictOutputUtils.getByteSize(bigramOffset)) {
		switch (BinaryDictInputOutput.getByteSize(bigramOffset)) {
		case 1:
		bigramFlags \|= FormatSpec.FLAG_ATTRIBUTE_ADDRESS_TYPE_ONEBYTE;
		break;
		@@ -477,18 +461,18 @@ public final class BinaryDictIOUtils {
		*/
		static int computeGroupSize(final CharGroupInfo info, final FormatOptions formatOptions) {
		int size = FormatSpec.GROUP_FLAGS_SIZE + FormatSpec.PARENT_ADDRESS_SIZE
		+ BinaryDictOutputUtils.getGroupCharactersSize(info.mCharacters)
		+ getChildrenAddressSize(info.mFlags, formatOptions);
		+ BinaryDictInputOutput.getGroupCharactersSize(info.mCharacters)
		+ BinaryDictInputOutput.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 += BinaryDictOutputUtils.getShortcutListSize(info.mShortcutTargets);
		size += BinaryDictInputOutput.getShortcutListSize(info.mShortcutTargets);
		}
		if (info.mBigrams != null) {
		for (final PendingAttribute attr : info.mBigrams) {
		size += FormatSpec.GROUP_FLAGS_SIZE;
		size += BinaryDictOutputUtils.getByteSize(attr.mAddress);
		size += BinaryDictInputOutput.getByteSize(attr.mAddress);
		}
		}
		return size;
		@@ -536,9 +520,9 @@ public final class BinaryDictIOUtils {
		int position = getTerminalPosition(buffer, word);
		if (position != FormatSpec.NOT_VALID_WORD) {
		buffer.position(0);
		final FileHeader header = BinaryDictInputUtils.readHeader(buffer);
		final FileHeader header = BinaryDictInputOutput.readHeader(buffer);
		buffer.position(position);
		return BinaryDictInputUtils.readCharGroup(buffer, position, header.mFormatOptions);
		return BinaryDictInputOutput.readCharGroup(buffer, position, header.mFormatOptions);
		}
		return null;
		}
		@@ -560,10 +544,10 @@ public final class BinaryDictIOUtils {
		final FileInputStream inStream = new FileInputStream(file);
		try {
		inStream.read(buffer);
		final BinaryDictInputUtils.ByteBufferWrapper wrapper =
		new BinaryDictInputUtils.ByteBufferWrapper(inStream.getChannel().map(
		final BinaryDictInputOutput.ByteBufferWrapper wrapper =
		new BinaryDictInputOutput.ByteBufferWrapper(inStream.getChannel().map(
		FileChannel.MapMode.READ_ONLY, offset, length));
		return BinaryDictInputUtils.readHeader(wrapper);
		return BinaryDictInputOutput.readHeader(wrapper);
		} finally {
		inStream.close();
		}

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

+805 −23

File changed and moved.

Preview size limit exceeded, changes collapsed.

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

deleted100644 → 0

+0 −811

File deleted.

Preview size limit exceeded, changes collapsed.