Changeset 8836

Timestamp:

2004-12-17T09:08:19+13:00 (19 years ago)

Author:

mdewsnip

Message:

Tidied up delete function to print error messages when it can't delete files or folders. Hopefully this will help to track down the "could not delete index folder" problem.

File:

• trunk/gli/src/org/greenstone/gatherer/util/Utility.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/util/Utility.java

@@ -132 +132 @@
      * @return A <i>boolean</i> which is <i>true</i> if the file specified was successfully deleted, <i>false</i> otherwise.
      */
-    static public boolean delete(File file) {
-    boolean result = true;
-    // If file is a directory, delete the file's children.
-    if(file.isDirectory()) {
+    static public boolean delete(File file)
+    {
+    // If file is a directory, we have to recursively delete its contents first
+    if (file.isDirectory()) {
         File files[] = file.listFiles();
-        for(int i = 0; files != null && result && i < files.length; i++) {
-        result = delete(files[i]);
-        }
-    }
-    if(result) {
-        // Delete file.
-        return file.delete();
-    }
-    return result;
-    }
+        for (int i = 0; i < files.length; i++) {
+        if (delete(files[i]) == false) {
+            System.err.println("Error: Could not delete folder " + file);
+            return false;
+        }
+        }
+    }
+
+    // Delete file
+    if (file.delete() == false) {
+        System.err.println("Error: Could not delete file " + file);
+        return false;
+    }
+
+    return true;
+    }
+
 
     static public boolean delete(String filename) {