diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2013-08-15 01:58:53 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-08-15 01:58:53 -0700 |
| commit | 8ad360228532643fbbbbce0b614db4f80753d9d9 (patch) | |
| tree | fd34fb4af1a3fe77ed1534179d85c5bf66a0ee2c /java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java | |
| parent | 20e3576f1429945a1b8aa6c9d19fc6b6404ff204 (diff) | |
| parent | dc83fe37baafe1afe5410499d58d80a29b7cb1da (diff) | |
| download | latinime-8ad360228532643fbbbbce0b614db4f80753d9d9.tar.gz latinime-8ad360228532643fbbbbce0b614db4f80753d9d9.tar.xz latinime-8ad360228532643fbbbbce0b614db4f80753d9d9.zip | |
am dc83fe37: Merge "Revert "[Refactor] Divide BinaryDictInputOutput into BinaryDictInputUtils and BinaryDictOutputUtils.""
* commit 'dc83fe37baafe1afe5410499d58d80a29b7cb1da':
Revert "[Refactor] Divide BinaryDictInputOutput into BinaryDictInputUtils and BinaryDictOutputUtils."
Diffstat (limited to 'java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java | 8 |
1 files changed, 4 insertions, 4 deletions
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<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) { |