Refactor BinaryDictInputOutput.

Change-Id: Idb4b635fcac70cc988e0dd3ce3bf121fba12099c

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.
      *

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 {