Changing existing log4j logging to use slf4j

[simantics/platform.git] / bundles / org.simantics.utils / src / org / simantics / utils / FileUtils.java

diff --git a/bundles/org.simantics.utils/src/org/simantics/utils/FileUtils.java b/bundles/org.simantics.utils/src/org/simantics/utils/FileUtils.java
index aae9666ab4156d51c7afc4db3cee0bf10250f466..51449d57bf4814a03e788b66c20c9e7f66996a25 100644 (file)
--- a/bundles/org.simantics.utils/src/org/simantics/utils/FileUtils.java
+++ b/bundles/org.simantics.utils/src/org/simantics/utils/FileUtils.java
@@ -47,7 +47,6 @@ import java.util.zip.ZipException;
 import java.util.zip.ZipInputStream;\r
 import java.util.zip.ZipOutputStream;\r
 \r
-import org.apache.log4j.Logger;\r
 import org.simantics.databoard.Bindings;\r
 import org.simantics.databoard.adapter.AdaptException;\r
 import org.simantics.databoard.adapter.Adapter;\r
@@ -56,6 +55,8 @@ import org.simantics.databoard.binding.Binding;
 import org.simantics.databoard.type.Datatype;\r
 import org.simantics.utils.bytes.LEInt;\r
 import org.simantics.utils.strings.FileNameUtils;\r
+import org.slf4j.Logger;\r
+import org.slf4j.LoggerFactory;\r
 \r
 /**\r
  * Utilities for common file operations.\r
@@ -68,6 +69,8 @@ import org.simantics.utils.strings.FileNameUtils;
  */\r
 public class FileUtils {\r
 \r
+       private static final Logger LOGGER = LoggerFactory.getLogger(FileUtils.class);\r
+\r
        /**\r
         * Create escaped filename\r
         * \r
@@ -536,8 +539,8 @@ public class FileUtils {
      *          <code>false</code> if some or all failed to be deleted\r
      */\r
     public static boolean deleteDir(File dir) {\r
-        Logger myLogger = Logger.getLogger(FileUtils.class);\r
-        myLogger.debug("Deleting directory "+dir);\r
+        if (LOGGER.isDebugEnabled())\r
+            LOGGER.debug("Deleting directory "+dir);\r
         boolean result = true;\r
 \r
         if (!dir.isDirectory()) return false;\r
@@ -555,8 +558,8 @@ public class FileUtils {
     }\r
     \r
     public static String deleteDirs(File dir) {        \r
-        Logger myLogger = Logger.getLogger(FileUtils.class);\r
-        myLogger.debug("Deleting directory "+dir);\r
+        if (LOGGER.isDebugEnabled())\r
+            LOGGER.debug("Deleting directory "+dir);\r
         boolean result = true;\r
 \r
         if (!dir.isDirectory()) \r
@@ -795,10 +798,8 @@ public class FileUtils {
     }\r
     \r
     public static void compressZip(String sourcePath, String zipDir) throws IOException {\r
-       Logger myLogger = Logger.getLogger(FileUtils.class);\r
-       myLogger.debug("Compressing file " + sourcePath + " to zip " + zipDir + ".");\r
-\r
-       System.out.println("Compressing file " + sourcePath + " to zip " + zipDir + ".");\r
+        if (LOGGER.isDebugEnabled())\r
+            LOGGER.debug("Compressing file " + sourcePath + " to zip " + zipDir + ".");\r
 \r
        File filesource = new File(sourcePath);\r
        URI base = filesource.toURI();\r
@@ -821,8 +822,7 @@ public class FileUtils {
                        }\r
                }\r
        } finally {\r
-               myLogger.debug("Filecompression done.");\r
-               System.out.println("Filecompression done.");\r
+               LOGGER.debug("Filecompression done.");\r
        }\r
     }\r
 \r
@@ -840,8 +840,8 @@ public class FileUtils {
      * @throws IOException\r
      */\r
     public static void extractZip(File zipFile, File dst) throws IOException {\r
-        Logger myLogger = Logger.getLogger(FileUtils.class);\r
-        myLogger.debug("Extracting zip "+zipFile);\r
+        if (LOGGER.isDebugEnabled())\r
+               LOGGER.debug("Extracting zip "+zipFile);\r
         try (FileInputStream fis = new FileInputStream(zipFile)) {\r
             extractZip(fis, dst);\r
         }\r
@@ -855,7 +855,6 @@ public class FileUtils {
      * @throws IOException\r
      */\r
     public static void extractZip(InputStream zipInput, File dst) throws IOException {\r
-        Logger myLogger = Logger.getLogger(FileUtils.class);\r
         byte[] buf = new byte[8192];\r
         ZipInputStream zis = new ZipInputStream(zipInput);\r
         ZipEntry entry;\r
@@ -864,7 +863,8 @@ public class FileUtils {
         while (entry != null) {\r
             // for each entry to be extracted\r
             String name = entry.getName();\r
-            myLogger.debug("Extracting "+name);\r
+            if (LOGGER.isDebugEnabled())\r
+                LOGGER.debug("Extracting "+name);\r
             File file = new File(dst, name);\r
 \r
             if (entry.isDirectory())\r