X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.utils%2Fsrc%2Forg%2Fsimantics%2Futils%2FFileUtils.java;h=51449d57bf4814a03e788b66c20c9e7f66996a25;hp=aae9666ab4156d51c7afc4db3cee0bf10250f466;hb=4cf3ca93d6e26c7434259fcf38b4d9db3c681a6f;hpb=bcbe7aa23f42b82ff6fe4304943193c04858096c

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