From 77bce05e6f6e3a988253f9305ae22e51f56f5b1a Mon Sep 17 00:00:00 2001 From: Yuichiro Hanada Date: Mon, 19 Aug 2013 14:49:57 +0900 Subject: [Refactor] Rename BinaryDictReader and BinaryDictDecoder. BinaryDictReader -> BinaryDictDecoder. BinaryDictDecoder -> BianryDictDecoderUtils. Change-Id: Iadf2153b379b760538ecda488dda4f17225e5f37 --- .../android/inputmethod/latin/BinaryDictionaryGetter.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java') diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java b/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java index 7e497e9b9..f9f22ecb4 100644 --- a/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java +++ b/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java @@ -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 options = CollectionUtils.newHashMap(); - BinaryDictDecoder.populateOptions(buffer, headerSize, options); + BinaryDictDecoderUtils.populateOptions(dictBuffer, headerSize, options); final String version = options.get(VERSION_KEY); if (null == version) { -- cgit v1.2.3-83-g751a