Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3aa8977c authored by Yuichiro Hanada's avatar Yuichiro Hanada
Browse files

Remove some unused variables. 

Change-Id: Iaf1556fec194d17cb4318f2bdcc837f8d79449ef
parent 2dcb6337

java/src/com/android/inputmethod/latin/makedict/BinaryDictDecoderUtils.java

+0 −1
Original line number Diff line number Diff line
@@ -295,7 +295,6 @@ public final class BinaryDictDecoderUtils { 
                return address;

            }

        }

        int address;

        switch (optionFlags & FormatSpec.MASK_CHILDREN_ADDRESS_TYPE) {

            case FormatSpec.FLAG_CHILDREN_ADDRESS_TYPE_ONEBYTE:

                return dictBuffer.readUnsignedByte();

java/src/com/android/inputmethod/latin/makedict/BinaryDictEncoderUtils.java

+2 −6
Original line number Diff line number Diff line
@@ -278,7 +278,6 @@ public class BinaryDictEncoderUtils { 
        // For future reference, the code to remove duplicate is a simple : list.remove(node);

        list.add(ptNodeArray);

        final ArrayList<PtNode> branches = ptNodeArray.mData;

        final int nodeSize = branches.size();

        for (PtNode ptNode : branches) {

            if (null != ptNode.mChildren) flattenTreeInner(list, ptNode.mChildren);

        }
@@ -427,9 +426,6 @@ public class BinaryDictEncoderUtils { 
                        nodeCountSize + nodeArrayOffset + nodeffset;

                nodeffset += ptNode.mCachedSize;

            }

            final int nodeSize = nodeCountSize + nodeffset

                    + (formatOptions.mSupportsDynamicUpdate

                            ? FormatSpec.FORWARD_LINK_ADDRESS_SIZE : 0);

            nodeArrayOffset += nodeArray.mCachedSize;

        }

        return nodeArrayOffset;
@@ -653,8 +649,8 @@ public class BinaryDictEncoderUtils { 
        return flags;

    }



    /* package */ static byte makePtNodeFlags(final PtNode node, final int ptNodeAddress,

            final int childrenOffset, final FormatOptions formatOptions) {

    /* package */ static byte makePtNodeFlags(final PtNode node, final int childrenOffset,

            final FormatOptions formatOptions) {

        return (byte) makePtNodeFlags(node.mChars.length > 1, node.mFrequency >= 0,

                getByteSize(childrenOffset),

                node.mShortcutTargets != null && !node.mShortcutTargets.isEmpty(),

java/src/com/android/inputmethod/latin/makedict/DynamicBinaryDictIOUtils.java

+2 −3
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ public final class DynamicBinaryDictIOUtils { 
            throws IOException, UnsupportedFormatException {

        final DictBuffer dictBuffer = dictDecoder.getDictBuffer();

        dictBuffer.position(0);

        final FileHeader header = dictDecoder.readHeader();

        dictDecoder.readHeader();

        final int wordPosition = dictDecoder.getTerminalPosition(word);

        if (wordPosition == FormatSpec.NOT_VALID_WORD) return;
@@ -142,8 +142,7 @@ public final class DynamicBinaryDictIOUtils { 
        final int originalPosition = dictBuffer.position();

        dictBuffer.position(ptNodeOriginAddress);

        final int flags = dictBuffer.readUnsignedByte();

        final int parentAddress = BinaryDictDecoderUtils.readParentAddress(dictBuffer,

                formatOptions);

        BinaryDictDecoderUtils.readParentAddress(dictBuffer, formatOptions);

        BinaryDictIOUtils.skipString(dictBuffer, (flags & FormatSpec.FLAG_HAS_MULTIPLE_CHARS) != 0);

        if ((flags & FormatSpec.FLAG_IS_TERMINAL) != 0) dictBuffer.readUnsignedByte();

        final int childrenOffset = newChildrenAddress == FormatSpec.NO_CHILDREN_ADDRESS

java/src/com/android/inputmethod/latin/makedict/SparseTable.java

+0 −1
Original line number Diff line number Diff line
@@ -212,7 +212,6 @@ public class SparseTable { 
    @UsedForTesting

    public static SparseTable readFromFiles(final File lookupTableFile, final File[] contentFiles,

            final int blockSize) throws IOException {

        final byte[] lookupTable = readFileToByteArray(lookupTableFile);

        final ArrayList<ArrayList<Integer>> contentTables =

                new ArrayList<ArrayList<Integer>>(contentFiles.length);

        for (int i = 0; i < contentFiles.length; ++i) {

java/src/com/android/inputmethod/latin/makedict/Ver3DictEncoder.java

+3 −5
Original line number Diff line number Diff line
@@ -133,12 +133,10 @@ public class Ver3DictEncoder implements DictEncoder { 
                countSize);

    }



    private void writePtNodeFlags(final PtNode ptNode, final int parentAddress,

            final FormatOptions formatOptions) {

    private void writePtNodeFlags(final PtNode ptNode, final FormatOptions formatOptions) {

        final int childrenPos = BinaryDictEncoderUtils.getChildrenPosition(ptNode, formatOptions);

        mPosition = BinaryDictEncoderUtils.writeUIntToBuffer(mBuffer, mPosition,

                BinaryDictEncoderUtils.makePtNodeFlags(ptNode, mPosition, childrenPos,

                        formatOptions),

                BinaryDictEncoderUtils.makePtNodeFlags(ptNode, childrenPos, formatOptions),

                FormatSpec.PTNODE_FLAGS_SIZE);

    }
@@ -244,7 +242,7 @@ public class Ver3DictEncoder implements DictEncoder { 
    @Override

    public void writePtNode(final PtNode ptNode, final int parentPosition,

            final FormatOptions formatOptions, final FusionDictionary dict) {

        writePtNodeFlags(ptNode, parentPosition, formatOptions);

        writePtNodeFlags(ptNode, formatOptions);

        writeParentPosition(parentPosition, ptNode, formatOptions);

        writeCharacters(ptNode.mChars, ptNode.hasSeveralChars());

        writeFrequency(ptNode.mFrequency);