From 5f00fe09e9a611b647592188316e5999465df4d3 Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Mon, 20 Oct 2014 14:48:56 +0900 Subject: Fix some compiler warnings This CL fixes the following compiler warnings. - Indirect access to static member - Access to a non-accessible member of an enclosing type - Parameter assignment - Method can be static - Local variable declaration hides another field or variable - Value of local variable is not used - Unused import - Unused private member - Unnecessary 'else' statement - Unnecessary declaration of throw exception - Redundant type arguments - Missing '@Override' annotation - Unused '@SuppressWarning' annotations Bug: 18003991 Change-Id: Icfebe753e53a2cc621848f769d6a3d7ce501ebc7 --- .../makedict/BinaryDictDecoderEncoderTests.java | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'tests/src/com/android/inputmethod/latin/makedict/BinaryDictDecoderEncoderTests.java') diff --git a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictDecoderEncoderTests.java b/tests/src/com/android/inputmethod/latin/makedict/BinaryDictDecoderEncoderTests.java index 05616d888..d1cb14196 100644 --- a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictDecoderEncoderTests.java +++ b/tests/src/com/android/inputmethod/latin/makedict/BinaryDictDecoderEncoderTests.java @@ -117,7 +117,7 @@ public class BinaryDictDecoderEncoderTests extends AndroidTestCase { super.tearDown(); } - private void generateWords(final int number, final Random random) { + private static void generateWords(final int number, final Random random) { final int[] codePointSet = CodePointUtils.generateCodePointSet(DEFAULT_CODE_POINT_SET_SIZE, random); final Set wordSet = new HashSet<>(); @@ -138,7 +138,7 @@ public class BinaryDictDecoderEncoderTests extends AndroidTestCase { /** * Adds unigrams to the dictionary. */ - private void addUnigrams(final int number, final FusionDictionary dict, + private static void addUnigrams(final int number, final FusionDictionary dict, final List words, final HashMap> shortcutMap) { for (int i = 0; i < number; ++i) { final String word = words.get(i); @@ -154,7 +154,7 @@ public class BinaryDictDecoderEncoderTests extends AndroidTestCase { } } - private void addBigrams(final FusionDictionary dict, + private static void addBigrams(final FusionDictionary dict, final List words, final SparseArray> bigrams) { for (int i = 0; i < bigrams.size(); ++i) { @@ -173,7 +173,7 @@ public class BinaryDictDecoderEncoderTests extends AndroidTestCase { // new java.io.FileWriter(new File(filename)), dict); // } - private long timeWritingDictToFile(final File file, final FusionDictionary dict, + private static long timeWritingDictToFile(final File file, final FusionDictionary dict, final FormatSpec.FormatOptions formatOptions) { long now = -1, diff = -1; @@ -196,7 +196,7 @@ public class BinaryDictDecoderEncoderTests extends AndroidTestCase { return diff; } - private void checkDictionary(final FusionDictionary dict, final List words, + private static void checkDictionary(final FusionDictionary dict, final List words, final SparseArray> bigrams, final HashMap> shortcutMap) { assertNotNull(dict); @@ -231,16 +231,16 @@ public class BinaryDictDecoderEncoderTests extends AndroidTestCase { } } - private String outputOptions(final int bufferType, + private static String outputOptions(final int bufferType, final FormatSpec.FormatOptions formatOptions) { - String result = " : buffer type = " + final String result = " : buffer type = " + ((bufferType == BinaryDictUtils.USE_BYTE_BUFFER) ? "byte buffer" : "byte array"); return result + " : version = " + formatOptions.mVersion; } // Tests for readDictionaryBinary and writeDictionaryBinary - private long timeReadingAndCheckDict(final File file, final List words, + private static long timeReadingAndCheckDict(final File file, final List words, final SparseArray> bigrams, final HashMap> shortcutMap, final int bufferType) { long now, diff = -1; @@ -385,7 +385,7 @@ public class BinaryDictDecoderEncoderTests extends AndroidTestCase { // Tests for readUnigramsAndBigramsBinary - private void checkWordMap(final List expectedWords, + private static void checkWordMap(final List expectedWords, final SparseArray> expectedBigrams, final TreeMap resultWords, final TreeMap resultFrequencies, @@ -434,9 +434,9 @@ public class BinaryDictDecoderEncoderTests extends AndroidTestCase { assertEquals(actBigrams, expBigrams); } - private long timeAndCheckReadUnigramsAndBigramsBinary(final File file, final List words, - final SparseArray> bigrams, final int bufferType, - final boolean checkProbability) { + private static long timeAndCheckReadUnigramsAndBigramsBinary(final File file, + final List words, final SparseArray> bigrams, + final int bufferType, final boolean checkProbability) { final TreeMap resultWords = new TreeMap<>(); final TreeMap> resultBigrams = new TreeMap<>(); final TreeMap resultFreqs = new TreeMap<>(); @@ -519,7 +519,7 @@ public class BinaryDictDecoderEncoderTests extends AndroidTestCase { } // Tests for getTerminalPosition - private String getWordFromBinary(final DictDecoder dictDecoder, final int address) { + private static String getWordFromBinary(final DictDecoder dictDecoder, final int address) { if (dictDecoder.getPosition() != 0) dictDecoder.setPosition(0); DictionaryHeader fileHeader = null; @@ -535,7 +535,7 @@ public class BinaryDictDecoderEncoderTests extends AndroidTestCase { address).mWord; } - private long checkGetTerminalPosition(final DictDecoder dictDecoder, final String word, + private static long checkGetTerminalPosition(final DictDecoder dictDecoder, final String word, final boolean contained) { long diff = -1; int position = -1; -- cgit v1.2.3-83-g751a