Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77bce05e authored by Yuichiro Hanada's avatar Yuichiro Hanada Committed by Ken Wakasa
Browse files

[Refactor] Rename BinaryDictReader and BinaryDictDecoder. 

BinaryDictReader -> BinaryDictDecoder.
BinaryDictDecoder -> BianryDictDecoderUtils.

Change-Id: Iadf2153b379b760538ecda488dda4f17225e5f37
parent 63155dfa

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

+7 −7
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.BinaryDictDecoder;

import com.android.inputmethod.latin.makedict.BinaryDictDecoderUtils;

import com.android.inputmethod.latin.makedict.FormatSpec;

import com.android.inputmethod.latin.utils.CollectionUtils;

import com.android.inputmethod.latin.utils.DictionaryInfoUtils;
@@ -231,17 +231,17 @@ final public class BinaryDictionaryGetter { 
        try {

            // Read the version of the file

            inStream = new FileInputStream(f);

            final BinaryDictDecoder.ByteBufferWrapper buffer =

                    new BinaryDictDecoder.ByteBufferWrapper(inStream.getChannel().map(

            final BinaryDictDecoderUtils.ByteBufferDictBuffer dictBuffer =

                    new BinaryDictDecoderUtils.ByteBufferDictBuffer(inStream.getChannel().map(

                            FileChannel.MapMode.READ_ONLY, 0, f.length()));

            final int magic = buffer.readInt();

            final int magic = dictBuffer.readInt();

            if (magic != FormatSpec.MAGIC_NUMBER) {

                return false;

            }

            final int formatVersion = buffer.readInt();

            final int headerSize = buffer.readInt();

            final int formatVersion = dictBuffer.readInt();

            final int headerSize = dictBuffer.readInt();

            final HashMap<String, String> options = CollectionUtils.newHashMap();

            BinaryDictDecoder.populateOptions(buffer, headerSize, options);

            BinaryDictDecoderUtils.populateOptions(dictBuffer, headerSize, options);



            final String version = options.get(VERSION_KEY);

            if (null == version) {