From 0374df23b5d3572098dce49b6976c5cf091791d9 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Sun, 26 Aug 2007 20:53:31 +0000
Subject: [PATCH] add: new ISimpleLogger that is based on log4j change: remove
log4j dependency from FileUtilities
SVN: 1492
---
.../datamover/CleansingPathHandlerDecorator.java | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/CleansingPathHandlerDecorator.java b/datamover/source/java/ch/systemsx/cisd/datamover/CleansingPathHandlerDecorator.java
index 3d7eb1077fc..5188ba598e7 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/CleansingPathHandlerDecorator.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/CleansingPathHandlerDecorator.java
@@ -19,6 +19,12 @@ package ch.systemsx.cisd.datamover;
import java.io.File;
import java.io.FileFilter;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import ch.systemsx.cisd.common.logging.ISimpleLogger;
+import ch.systemsx.cisd.common.logging.Log4jSimpleLogger;
+import ch.systemsx.cisd.common.logging.LogCategory;
+import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.common.utilities.FileUtilities;
import ch.systemsx.cisd.common.utilities.DirectoryScanningTimerTask.IPathHandler;
@@ -33,6 +39,9 @@ import ch.systemsx.cisd.common.utilities.DirectoryScanningTimerTask.IPathHandler
public class CleansingPathHandlerDecorator implements IPathHandler
{
+ private final Logger operationLog =
+ LogFactory.getLogger(LogCategory.OPERATION, CleansingPathHandlerDecorator.class);
+
private final FileFilter filter;
private final IPathHandler decoratedHandler;
@@ -50,7 +59,9 @@ public class CleansingPathHandlerDecorator implements IPathHandler
{
assert path != null;
- final boolean pathDeleted = FileUtilities.deleteRecursively(path, filter);
+ final ISimpleLogger logger =
+ operationLog.isDebugEnabled() ? new Log4jSimpleLogger(Level.DEBUG, operationLog) : null;
+ final boolean pathDeleted = FileUtilities.deleteRecursively(path, filter, logger);
if (pathDeleted == false)
{
return decoratedHandler.handle(path);
@@ -59,5 +70,4 @@ public class CleansingPathHandlerDecorator implements IPathHandler
return true;
}
}
-
}
--
GitLab