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

Commit 94460eba authored by Yuichiro Hanada's avatar Yuichiro Hanada
Browse files

[Refactor] Divide BinaryDictInputOutput into BinaryDictEncoder and BinaryDictDecoder. 

Change-Id: I7c3269d77e3e3b567e459dcaa1bc029903941744
parent 0663bc04

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.BinaryDictInputOutput;

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

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 BinaryDictInputOutput.ByteBufferWrapper buffer =

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

            final BinaryDictDecoder.ByteBufferWrapper buffer =

                    new BinaryDictDecoder.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();

            BinaryDictInputOutput.populateOptions(buffer, headerSize, options);

            BinaryDictDecoder.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.BinaryDictInputOutput;

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

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 {

        BinaryDictInputOutput.writeDictionaryBinary(out, mFusionDictionary, FORMAT_OPTIONS);

        BinaryDictEncoder.writeDictionaryBinary(out, mFusionDictionary, FORMAT_OPTIONS);

    }



    @Override