Clean up delete dir

JakubValtar · JakubValtar · commit 9ef5b47304e8 · 2015-09-29T19:29:48.000-04:00
diff --git a/app/src/processing/app/Util.java b/app/src/processing/app/Util.java
@@ -302,41 +302,22 @@ static public void copyDirNative(File sourceDir,
   /**
    * Remove all files in a directory and the directory itself.
    */
-  static public void removeDir(File dir) {
-    if (dir.exists()) {
-      removeDescendants(dir);
-      if (!dir.delete()) {
-        System.err.println("Could not delete " + dir);
-      }
-    }
-  }
-
-
-  /**
-   * Recursively remove all files within a directory,
-   * used with removeDir(), or when the contents of a dir
-   * should be removed, but not the directory itself.
-   * (i.e. when cleaning temp files from lib/build)
-   */
-  static public void removeDescendants(File dir) {
-    if (!dir.exists()) return;
-
-    String files[] = dir.list();
-    for (int i = 0; i < files.length; i++) {
-      if (files[i].equals(".") || files[i].equals("..")) continue;
-      File dead = new File(dir, files[i]);
-      if (!dead.isDirectory()) {
-        if (!Preferences.getBoolean("compiler.save_build_files")) {
-          if (!dead.delete()) {
-            // temporarily disabled
-            System.err.println("Could not delete " + dead);
-          }
+  static public boolean removeDir(File dir) {
+    if (!dir.exists()) return true;
+
+    boolean result = true;
+    File[] files = dir.listFiles();
+    if (files != null) {
+      for (File child : files) {
+        if (child.isFile()) {
+          result &= child.delete();
+        } else if (child.isDirectory()) {
+          result &= removeDir(child);
         }
-      } else {
-        removeDir(dead);
-        //dead.delete();
       }
     }
+    result &= dir.delete();
+    return result;
   }
 
 
