working on platform classes, adding move to trash option

benfry · benfry · commit 6e0d4832ef98 · 2013-07-20T18:57:05.000-04:00
diff --git a/app/src/processing/app/Platform.java b/app/src/processing/app/Platform.java
@@ -24,6 +24,7 @@
 
 import java.awt.Desktop;
 import java.io.File;
+import java.io.IOException;
 import java.net.URI;
 
 import javax.swing.UIManager;
@@ -142,6 +143,23 @@ public void openFolder(File file) throws Exception {
     }
     */
   }
+  
+
+  /**
+   * Attempts to move to the Trash on OS X, or the Recycle Bin on Windows. 
+   * If not possible, just deletes the file or folder instead.  
+   * @param file the folder or file to be removed/deleted
+   * @return true if the folder was successfully removed
+   * @throws IOException 
+   */
+  public boolean deleteFile(File file) throws IOException {
+    if (file.isDirectory()) {
+      Base.removeDir(file);
+    } else {
+      return file.delete();
+    }
+    return true;
+  }
 
 
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
diff --git a/app/src/processing/app/macosx/Platform.java b/app/src/processing/app/macosx/Platform.java
@@ -24,6 +24,7 @@
 
 import java.io.File;
 import java.io.FileNotFoundException;
+import java.io.IOException;
 
 import com.apple.eio.FileManager;
 
@@ -79,8 +80,8 @@ public void init(Base base) {
     }
     */
   }
-
-
+  
+  
   public File getSettingsFolder() throws Exception {
     return new File(getLibraryFolder(), "Processing");
   }
@@ -101,6 +102,15 @@ public File getDefaultSketchbookFolder() throws Exception {
     }
     */
   }
+  
+
+  /** 
+   * Moves the specified File object (which might be a file or folder) 
+   * to the trash.
+   */
+  public boolean deleteFile(File file) throws IOException {
+    return FileManager.moveToTrash(file);
+  }
 
 
   /*
diff --git a/app/src/processing/app/windows/Registry.java b/app/src/processing/app/windows/Registry.java
@@ -21,15 +21,6 @@ public static enum REGISTRY_ROOT_KEY{CLASSES_ROOT, CURRENT_USER, LOCAL_MACHINE,
     rootKeyMap.put(REGISTRY_ROOT_KEY.USERS, WINREG.HKEY_USERS);
   }
 
-  /**
-   * Testing.
-   *
-   * @param args arguments
-   * @throws java.lang.Exception on error
-   */
-  public static void main(String[] args) throws Exception {
-  }
-
   /**
    * Gets one of the root keys.
    *

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`
`25`	`25`	`import java.io.File;`
`26`	`26`	`import java.io.FileNotFoundException;`
	`27`	`+import java.io.IOException;`
`27`	`28`
`28`	`29`	`import com.apple.eio.FileManager;`
`29`	`30`
`@@ -79,8 +80,8 @@ public void init(Base base) {`
`79`	`80`	`}`
`80`	`81`	`*/`
`81`	`82`	`}`
`82`		`-`
`83`		`-`
	`83`	`+`
	`84`	`+`
`84`	`85`	`public File getSettingsFolder() throws Exception {`
`85`	`86`	`return new File(getLibraryFolder(), "Processing");`
`86`	`87`	`}`
`@@ -101,6 +102,15 @@ public File getDefaultSketchbookFolder() throws Exception {`
`101`	`102`	`}`
`102`	`103`	`*/`
`103`	`104`	`}`
	`105`	`+`
	`106`	`+`
	`107`	`+ /**`
	`108`	`+ * Moves the specified File object (which might be a file or folder)`
	`109`	`+ * to the trash.`
	`110`	`+ */`
	`111`	`+ public boolean deleteFile(File file) throws IOException {`
	`112`	`+ return FileManager.moveToTrash(file);`
	`113`	`+ }`
`104`	`114`
`105`	`115`
`106`	`116`	`/*`