[Fudaa-svn-commit] SF.net SVN: fudaa:[7161] trunk/framework/ctulu-common/src/main/java/org/ fudaa/ctulu

[<de...@us...>]

Revision: 7161
          http://fudaa.svn.sourceforge.net/fudaa/?rev=7161&view=rev
Author:   deniger
Date:     2012-05-07 12:20:41 +0000 (Mon, 07 May 2012)
Log Message:
-----------
ajout bilan sur suppression

Modified Paths:
--------------
    trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLibFile.java

Added Paths:
-----------
    trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/FileDeleteResult.java

Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLibFile.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLibFile.java	2012-05-07 07:17:55 UTC (rev 7160)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLibFile.java	2012-05-07 12:20:41 UTC (rev 7161)
@@ -319,6 +319,11 @@
   }
 
   public static boolean deleteDir(final File _f) {
+    return deleteDir(_f, null);
+
+  }
+
+  public static boolean deleteDir(final File _f, FileDeleteResult result) {
     if (_f == null) {
       return false;
     }
@@ -327,20 +332,30 @@
       for (int i = files.length - 1; i >= 0; i--) {
         if (files[i].isFile()) {
           try {
-            files[i].delete();
+            delete(files[i], result);
           } catch (final RuntimeException _evt) {
             FuLog.error(_evt);
 
           }
         } else {
-          deleteDir(files[i]);
+          deleteDir(files[i], result);
         }
       }
 
     }
-    return _f.delete();
+    return delete(_f, result);
   }
 
+  private static boolean delete(File fileOrDir, FileDeleteResult result) {
+    boolean res = fileOrDir.delete();
+    if (!res) {
+      if (result != null) {
+        result.addNotDeleted(fileOrDir);
+      }
+    }
+    return res;
+  }
+
   public static File createTempDir(final String _prefix) throws IOException {
     return createTempDir(_prefix, null);
   }
@@ -1391,4 +1406,4 @@
     return null;
 
   }
-}
\ No newline at end of file
+}

Added: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/FileDeleteResult.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/FileDeleteResult.java	                        (rev 0)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/FileDeleteResult.java	2012-05-07 12:20:41 UTC (rev 7161)
@@ -0,0 +1,26 @@
+package org.fudaa.ctulu;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Permet de savoir quel
+ * @author deniger ( genesis)
+ */
+public class FileDeleteResult {
+
+  private final List<File> filesNotDeleted = new ArrayList<File>();
+  private final List<File> dirNotDeleted = new ArrayList<File>();
+
+  public void addNotDeleted(File f) {
+    if (f == null) {
+      return;
+    }
+    if (f.isFile()) {
+      filesNotDeleted.add(f);
+    } else {
+      dirNotDeleted.add(f);
+    }
+  }
+}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.