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
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
*/\r
public class FileUtils {\r
\r
+ private static final Logger LOGGER = LoggerFactory.getLogger(FileUtils.class);\r
+\r
/**\r
* Create escaped filename\r
* \r
* <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
}\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
}\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
}\r
}\r
} finally {\r
- myLogger.debug("Filecompression done.");\r
- System.out.println("Filecompression done.");\r
+ LOGGER.debug("Filecompression done.");\r
}\r
}\r
\r
* @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
* @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
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