From d711426a87ed131c527beb8f7a9160daa14d1f94 Mon Sep 17 00:00:00 2001 From: Jatin Matani Date: Thu, 9 Jul 2015 11:50:10 -0700 Subject: [PATCH] Remove android.util.Log from FileUtils FileUtils is being used for other non android projects and hence breaks when built. Instead use the log statements at caller to record Log.e messages. Hence there is no side effect here. Bug:22042371 Change-Id: Ieb100006ff38e013bc30542637465f58bfc0f2f2 --- .../com/android/inputmethod/latin/common/FileUtils.java | 9 +-------- .../inputmethod/latin/BinaryDictionaryFileDumper.java | 5 ++++- .../inputmethod/latin/utils/DictionaryInfoUtils.java | 5 ++++- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/common/src/com/android/inputmethod/latin/common/FileUtils.java b/common/src/com/android/inputmethod/latin/common/FileUtils.java index 16732660c..e593c9932 100644 --- a/common/src/com/android/inputmethod/latin/common/FileUtils.java +++ b/common/src/com/android/inputmethod/latin/common/FileUtils.java @@ -16,8 +16,6 @@ package com.android.inputmethod.latin.common; -import android.util.Log; - import java.io.File; import java.io.FilenameFilter; @@ -58,11 +56,6 @@ public class FileUtils { public static boolean renameTo(final File fromFile, final File toFile) { toFile.delete(); - final boolean success = fromFile.renameTo(toFile); - if (!success) { - Log.e(TAG, String.format("Failed to rename from %s to %s.", - fromFile.getAbsoluteFile(), toFile.getAbsoluteFile())); - } - return success; + return fromFile.renameTo(toFile); } } diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java b/java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java index d25c1d373..1fe0a4cce 100644 --- a/java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java +++ b/java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java @@ -324,7 +324,10 @@ public final class BinaryDictionaryFileDumper { // move the output file to the final staging file. final File finalFile = new File(finalFileName); - FileUtils.renameTo(outputFile, finalFile); + if (!FileUtils.renameTo(outputFile, finalFile)) { + Log.e(TAG, String.format("Failed to rename from %s to %s.", + outputFile.getAbsoluteFile(), finalFile.getAbsoluteFile())); + } wordListUriBuilder.appendQueryParameter(QUERY_PARAMETER_DELETE_RESULT, QUERY_PARAMETER_SUCCESS); diff --git a/java/src/com/android/inputmethod/latin/utils/DictionaryInfoUtils.java b/java/src/com/android/inputmethod/latin/utils/DictionaryInfoUtils.java index 11cccd5fa..cea2e13b1 100644 --- a/java/src/com/android/inputmethod/latin/utils/DictionaryInfoUtils.java +++ b/java/src/com/android/inputmethod/latin/utils/DictionaryInfoUtils.java @@ -314,7 +314,10 @@ public class DictionaryInfoUtils { final String cacheFilename = cacheDirectoryForLocale + File.separator + fileId; final File cacheFile = new File(cacheFilename); // move the staging file to cache file. - FileUtils.renameTo(stagingFile, cacheFile); + if (!FileUtils.renameTo(stagingFile, cacheFile)) { + Log.e(TAG, String.format("Failed to rename from %s to %s.", + stagingFile.getAbsoluteFile(), cacheFile.getAbsoluteFile())); + } } } }