aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuichiro Hanada <yhanada@google.com>2012-09-13 19:20:17 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-09-13 19:20:17 -0700
commita0fe76f6d542bce06af46e5750237fef51f2f8a6 (patch)
tree1a68a7d94b75fd836fc3fd777d2a1f62dab21fbc
parent635f9773cdf07153428c9f614f331428c5854f0f (diff)
parentcc958dd96eef65fddbc48185c2e88ab18504a377 (diff)
downloadlatinime-a0fe76f6d542bce06af46e5750237fef51f2f8a6.tar.gz
latinime-a0fe76f6d542bce06af46e5750237fef51f2f8a6.tar.xz
latinime-a0fe76f6d542bce06af46e5750237fef51f2f8a6.zip
am cc958dd9: Refactor BinaryDictInputOutput.
* commit 'cc958dd96eef65fddbc48185c2e88ab18504a377': Refactor BinaryDictInputOutput.
-rw-r--r--java/src/com/android/inputmethod/latin/makedict/BinaryDictInputOutput.java6
-rw-r--r--tools/dicttool/src/android/inputmethod/latin/dicttool/DictionaryMaker.java3
2 files changed, 2 insertions, 7 deletions
diff --git a/java/src/com/android/inputmethod/latin/makedict/BinaryDictInputOutput.java b/java/src/com/android/inputmethod/latin/makedict/BinaryDictInputOutput.java
index ef10f7270..6f508695e 100644
--- a/java/src/com/android/inputmethod/latin/makedict/BinaryDictInputOutput.java
+++ b/java/src/com/android/inputmethod/latin/makedict/BinaryDictInputOutput.java
@@ -1596,12 +1596,6 @@ public class BinaryDictInputOutput {
return newDict;
}
- // TODO: remove this method.
- public static FusionDictionary readDictionaryBinary(final ByteBuffer buffer,
- final FusionDictionary dict) throws IOException, UnsupportedFormatException {
- return readDictionaryBinary(new ByteBufferWrapper(buffer), dict);
- }
-
/**
* Basic test to find out whether the file is a binary dictionary or not.
*
diff --git a/tools/dicttool/src/android/inputmethod/latin/dicttool/DictionaryMaker.java b/tools/dicttool/src/android/inputmethod/latin/dicttool/DictionaryMaker.java
index a6137706e..4f8874985 100644
--- a/tools/dicttool/src/android/inputmethod/latin/dicttool/DictionaryMaker.java
+++ b/tools/dicttool/src/android/inputmethod/latin/dicttool/DictionaryMaker.java
@@ -244,7 +244,8 @@ public class DictionaryMaker {
inStream = new FileInputStream(file);
final ByteBuffer buffer = inStream.getChannel().map(
FileChannel.MapMode.READ_ONLY, 0, file.length());
- return BinaryDictInputOutput.readDictionaryBinary(buffer, null);
+ return BinaryDictInputOutput.readDictionaryBinary(
+ new BinaryDictInputOutput.ByteBufferWrapper(buffer), null);
} finally {
if (inStream != null) {
try {