From 1c5b2a41ecf118a2d0103bba7747c35329b2e0ee Mon Sep 17 00:00:00 2001 From: Jean Chalard Date: Mon, 11 Feb 2013 21:14:56 -0800 Subject: [PATCH] Cleanups Follow-up to Idc6f419a Change-Id: I4aae8f4e19f27a0a309879dc19af6e40906d58c5 --- .../keyboard/internal/KeyboardBuilder.java | 4 ++-- .../latin/BinaryDictionaryGetter.java | 2 +- .../latin/ExpandableBinaryDictionary.java | 4 ++-- .../latin/UserHistoryDictIOUtils.java | 10 ++++---- .../AndroidWordLevelSpellCheckerSession.java | 2 +- .../latin/UserHistoryDictIOUtilsTests.java | 8 +++---- .../latin/makedict/BinaryDictIOTests.java | 24 +++++++++---------- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java index e087a4565..ab851bd64 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java @@ -164,10 +164,10 @@ public class KeyboardBuilder { try { parseKeyboard(parser); } catch (XmlPullParserException e) { - Log.w(BUILDER_TAG, "keyboard XML parse error: " + e); + Log.w(BUILDER_TAG, "keyboard XML parse error", e); throw new IllegalArgumentException(e); } catch (IOException e) { - Log.w(BUILDER_TAG, "keyboard XML parse error: " + e); + Log.w(BUILDER_TAG, "keyboard XML parse error", e); throw new RuntimeException(e); } finally { parser.close(); diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java b/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java index 1cdc3b564..a96738b3e 100644 --- a/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java +++ b/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java @@ -210,7 +210,7 @@ final class BinaryDictionaryGetter { } } } catch (java.io.IOException e) { - Log.e(TAG, "IOException trying to cleanup files : " + e); + Log.e(TAG, "IOException trying to cleanup files", e); } } diff --git a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java index 28ed88a73..97dc6a8ac 100644 --- a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java +++ b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java @@ -321,9 +321,9 @@ abstract public class ExpandableBinaryDictionary extends Dictionary { tempFile.renameTo(file); clearFusionDictionary(); } catch (IOException e) { - Log.e(TAG, "IO exception while writing file: " + e); + Log.e(TAG, "IO exception while writing file", e); } catch (UnsupportedFormatException e) { - Log.e(TAG, "Unsupported format: " + e); + Log.e(TAG, "Unsupported format", e); } finally { if (out != null) { try { diff --git a/java/src/com/android/inputmethod/latin/UserHistoryDictIOUtils.java b/java/src/com/android/inputmethod/latin/UserHistoryDictIOUtils.java index eb5c387a8..62f2a9750 100644 --- a/java/src/com/android/inputmethod/latin/UserHistoryDictIOUtils.java +++ b/java/src/com/android/inputmethod/latin/UserHistoryDictIOUtils.java @@ -122,9 +122,9 @@ public final class UserHistoryDictIOUtils { BinaryDictInputOutput.writeDictionaryBinary(destination, fusionDict, formatOptions); Log.d(TAG, "end writing"); } catch (IOException e) { - Log.e(TAG, "IO exception while writing file: " + e); + Log.e(TAG, "IO exception while writing file", e); } catch (UnsupportedFormatException e) { - Log.e(TAG, "Unsupported fomat: " + e); + Log.e(TAG, "Unsupported format", e); } } @@ -184,11 +184,11 @@ public final class UserHistoryDictIOUtils { BinaryDictIOUtils.readUnigramsAndBigramsBinary(buffer, unigrams, frequencies, bigrams); } catch (IOException e) { - Log.e(TAG, "IO exception while reading file: " + e); + Log.e(TAG, "IO exception while reading file", e); } catch (UnsupportedFormatException e) { - Log.e(TAG, "Unsupported format: " + e); + Log.e(TAG, "Unsupported format", e); } catch (ArrayIndexOutOfBoundsException e) { - Log.e(TAG, "ArrayIndexOutOfBoundsException while reading file: " + e); + Log.e(TAG, "ArrayIndexOutOfBoundsException while reading file", e); } addWordsFromWordMap(unigrams, frequencies, bigrams, dict); } diff --git a/java/src/com/android/inputmethod/latin/spellcheck/AndroidWordLevelSpellCheckerSession.java b/java/src/com/android/inputmethod/latin/spellcheck/AndroidWordLevelSpellCheckerSession.java index b0e471643..cd3f9e442 100644 --- a/java/src/com/android/inputmethod/latin/spellcheck/AndroidWordLevelSpellCheckerSession.java +++ b/java/src/com/android/inputmethod/latin/spellcheck/AndroidWordLevelSpellCheckerSession.java @@ -352,7 +352,7 @@ public abstract class AndroidWordLevelSpellCheckerSession extends Session { if (DBG) { throw e; } else { - Log.e(TAG, "Exception while spellcheking: " + e); + Log.e(TAG, "Exception while spellcheking", e); return AndroidSpellCheckerService.getNotInDictEmptySuggestions(); } } diff --git a/tests/src/com/android/inputmethod/latin/UserHistoryDictIOUtilsTests.java b/tests/src/com/android/inputmethod/latin/UserHistoryDictIOUtilsTests.java index dd28fabf6..211d012d2 100644 --- a/tests/src/com/android/inputmethod/latin/UserHistoryDictIOUtilsTests.java +++ b/tests/src/com/android/inputmethod/latin/UserHistoryDictIOUtilsTests.java @@ -140,7 +140,7 @@ public class UserHistoryDictIOUtilsTests extends AndroidTestCase out.flush(); out.close(); } catch (IOException e) { - Log.e(TAG, "IO exception while writing file: " + e); + Log.e(TAG, "IO exception while writing file", e); } } @@ -155,9 +155,9 @@ public class UserHistoryDictIOUtilsTests extends AndroidTestCase UserHistoryDictIOUtils.readDictionaryBinary( new UserHistoryDictIOUtils.ByteArrayWrapper(buffer), listener); } catch (FileNotFoundException e) { - Log.e(TAG, "file not found: " + e); + Log.e(TAG, "file not found", e); } catch (IOException e) { - Log.e(TAG, "IOException: " + e); + Log.e(TAG, "IOException", e); } finally { if (inStream != null) { try { @@ -191,7 +191,7 @@ public class UserHistoryDictIOUtilsTests extends AndroidTestCase try { file = File.createTempFile("testReadAndWrite", ".dict", getContext().getCacheDir()); } catch (IOException e) { - Log.d(TAG, "IOException while creating a temporary file: " + e); + Log.d(TAG, "IOException while creating a temporary file", e); } assertNotNull(file); diff --git a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictIOTests.java b/tests/src/com/android/inputmethod/latin/makedict/BinaryDictIOTests.java index f3694eada..ade010981 100644 --- a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictIOTests.java +++ b/tests/src/com/android/inputmethod/latin/makedict/BinaryDictIOTests.java @@ -116,13 +116,13 @@ public class BinaryDictIOTests extends AndroidTestCase { return new BinaryDictInputOutput.ByteBufferWrapper(buffer); } } catch (IOException e) { - Log.e(TAG, "IOException while making buffer: " + e); + Log.e(TAG, "IOException while making buffer", e); } finally { if (inStream != null) { try { inStream.close(); } catch (IOException e) { - Log.e(TAG, "IOException while closing stream: " + e); + Log.e(TAG, "IOException while closing stream", e); } } } @@ -195,9 +195,9 @@ public class BinaryDictIOTests extends AndroidTestCase { out.flush(); out.close(); } catch (IOException e) { - Log.e(TAG, "IO exception while writing file: " + e); + Log.e(TAG, "IO exception while writing file", e); } catch (UnsupportedFormatException e) { - Log.e(TAG, "UnsupportedFormatException: " + e); + Log.e(TAG, "UnsupportedFormatException", e); } return diff; @@ -257,9 +257,9 @@ public class BinaryDictIOTests extends AndroidTestCase { dict = BinaryDictInputOutput.readDictionaryBinary(buffer, null); diff = System.currentTimeMillis() - now; } catch (IOException e) { - Log.e(TAG, "IOException while reading dictionary: " + e); + Log.e(TAG, "IOException while reading dictionary", e); } catch (UnsupportedFormatException e) { - Log.e(TAG, "Unsupported format: " + e); + Log.e(TAG, "Unsupported format", e); } checkDictionary(dict, words, bigrams, shortcutMap); @@ -275,7 +275,7 @@ public class BinaryDictIOTests extends AndroidTestCase { try { file = File.createTempFile("runReadAndWrite", ".dict", getContext().getCacheDir()); } catch (IOException e) { - Log.e(TAG, "IOException: " + e); + Log.e(TAG, "IOException", e); } assertNotNull(file); @@ -392,9 +392,9 @@ public class BinaryDictIOTests extends AndroidTestCase { resultBigrams); diff = System.currentTimeMillis() - now; } catch (IOException e) { - Log.e(TAG, "IOException " + e); + Log.e(TAG, "IOException", e); } catch (UnsupportedFormatException e) { - Log.e(TAG, "UnsupportedFormatException: " + e); + Log.e(TAG, "UnsupportedFormatException", e); } finally { if (inStream != null) { try { @@ -416,7 +416,7 @@ public class BinaryDictIOTests extends AndroidTestCase { try { file = File.createTempFile("runReadUnigrams", ".dict", getContext().getCacheDir()); } catch (IOException e) { - Log.e(TAG, "IOException: " + e); + Log.e(TAG, "IOException", e); } assertNotNull(file); @@ -499,9 +499,9 @@ public class BinaryDictIOTests extends AndroidTestCase { position = BinaryDictIOUtils.getTerminalPosition(buffer, word); diff = System.nanoTime() - now; } catch (IOException e) { - Log.e(TAG, "IOException while getTerminalPosition: " + e); + Log.e(TAG, "IOException while getTerminalPosition", e); } catch (UnsupportedFormatException e) { - Log.e(TAG, "UnsupportedFormatException while getTermianlPosition: " + e); + Log.e(TAG, "UnsupportedFormatException while getTerminalPosition", e); } assertEquals(FormatSpec.NOT_VALID_WORD != position, contained);