From 117f18e844f83036f3523aa2e721894bac16739d Mon Sep 17 00:00:00 2001 From: Ken Wakasa Date: Thu, 15 Aug 2013 08:54:29 +0000 Subject: Revert "[Refactor] Divide BinaryDictInputOutput into BinaryDictInputUtils and BinaryDictOutputUtils." This reverts commit 4c63d0614e7ed7aea4bcbab3a17090d841661d92. Change-Id: I1fa277d720bab4d895259df7d6d82eebfa5eb6c5 --- .../src/com/android/inputmethod/latin/BinaryDictionaryGetter.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 d1d829ad1..d0a4afd50 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.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 options = CollectionUtils.newHashMap(); - BinaryDictInputUtils.populateOptions(buffer, headerSize, options); + BinaryDictInputOutput.populateOptions(buffer, headerSize, options); final String version = options.get(VERSION_KEY); if (null == version) { -- cgit v1.2.3-83-g751a