merged 1.1 branch into head

[mir.git] / source / mir / producer / FileDeletingProducerNode.java

diff --git a/source/mir/producer/FileDeletingProducerNode.java b/source/mir/producer/FileDeletingProducerNode.java
index 2adbc54..c6acdaa 100755 (executable)
--- a/source/mir/producer/FileDeletingProducerNode.java
+++ b/source/mir/producer/FileDeletingProducerNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
  *
  * This file is part of Mir.
  *
@@ -18,22 +18,23 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with  any library licensed under the Apache Software License, 
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library 
- * (or with modified versions of the above that use the same license as the above), 
- * and distribute linked combinations including the two.  You must obey the 
- * GNU General Public License in all respects for all of the code used other than 
- * the above mentioned libraries.  If you modify this file, you may extend this 
- * exception to your version of the file, but you are not obligated to do so.  
+ * the code of this program with  any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two.  You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries.  If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
  * If you do not wish to do so, delete this exception statement from your version.
  */
 package mir.producer;
 
+import mir.changetracker.ChangeTracker;
+import mir.changetracker.ChangeType;
+import mir.log.LoggerWrapper;
+import mircoders.global.MirGlobal;
+
 import java.io.File;
 import java.util.Map;
 
-import mir.log.LoggerWrapper;
-
 public class FileDeletingProducerNode extends FileOperationProducerNode {
 
   public FileDeletingProducerNode(String aFileIdentifier) {
@@ -41,11 +42,19 @@ public class FileDeletingProducerNode extends FileOperationProducerNode {
   }
 
   protected void perform(File aFile, Map aValueMap, String aVerb, LoggerWrapper aLogger) throws ProducerFailure {
-    if (!aFile.delete()) {
-      aLogger.error("Can't delete file " + aFile.getName());
+    try {
+      if (!aFile.delete()) {
+        throw new Exception("Unable to delete file " + aFile);
+      }
+
+      // Notify the change tracker that the file was deleted
+      ChangeTracker tracker = MirGlobal.getChangeEngine().getTracker();
+      tracker.addChange(aFile.getAbsolutePath(), ChangeType.DELETION);
+      
+      aLogger.debug("File " + aFile.getName() + " deleted");
     }
-    else {
-      aLogger.info("File " + aFile.getName() + " deleted");
+    catch (Throwable t) {
+      aLogger.warn("Can't delete file " + aFile.getAbsolutePath());
     }
   }
 }
\ No newline at end of file