From ee6dc82d50705c002feb4e7bb13541a1480a9d93 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <rednoah@users.noreply.github.com>
Date: Tue, 25 Mar 2008 21:03:32 +0000
Subject: [PATCH] * improved utility classes * nested temporary folders

---
 .../net/sourceforge/filebot/FileBotUtil.java  | 19 ++++++++
 .../panel/analyze/FileTreeTransferPolicy.java | 24 ++--------
 .../sourceforge/tuned/TemporaryFolder.java    | 47 ++++++++++++++++++-
 3 files changed, 68 insertions(+), 22 deletions(-)

diff --git a/source/net/sourceforge/filebot/FileBotUtil.java b/source/net/sourceforge/filebot/FileBotUtil.java
index c203c0d4..4cb93d6c 100644
--- a/source/net/sourceforge/filebot/FileBotUtil.java
+++ b/source/net/sourceforge/filebot/FileBotUtil.java
@@ -6,6 +6,7 @@ import java.awt.Dimension;
 import java.awt.Point;
 import java.awt.Window;
 import java.io.File;
+import java.io.FileFilter;
 import java.util.List;
 import java.util.regex.Pattern;
 
@@ -112,4 +113,22 @@ public class FileBotUtil {
 		
 		return new Point(p.x + d.width / 4, p.y + d.height / 7);
 	}
+	
+	public static final FileFilter FOLDERS_ONLY = new FileFilter() {
+		
+		@Override
+		public boolean accept(File file) {
+			return file.isDirectory();
+		}
+		
+	};
+	
+	public static final FileFilter FILES_ONLY = new FileFilter() {
+		
+		@Override
+		public boolean accept(File file) {
+			return file.isFile();
+		}
+		
+	};
 }
diff --git a/source/net/sourceforge/filebot/ui/panel/analyze/FileTreeTransferPolicy.java b/source/net/sourceforge/filebot/ui/panel/analyze/FileTreeTransferPolicy.java
index 5765c281..f543ca60 100644
--- a/source/net/sourceforge/filebot/ui/panel/analyze/FileTreeTransferPolicy.java
+++ b/source/net/sourceforge/filebot/ui/panel/analyze/FileTreeTransferPolicy.java
@@ -3,11 +3,11 @@ package net.sourceforge.filebot.ui.panel.analyze;
 
 
 import java.io.File;
-import java.io.FileFilter;
 import java.util.List;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 
+import net.sourceforge.filebot.FileBotUtil;
 import net.sourceforge.filebot.ui.transferablepolicies.BackgroundFileTransferablePolicy;
 
 
@@ -56,12 +56,12 @@ class FileTreeTransferPolicy extends BackgroundFileTransferablePolicy<DefaultMut
 		
 		if (file.isDirectory() && !Thread.currentThread().isInterrupted()) {
 			// run through folders first
-			for (File f : file.listFiles(FOLDER_FILTER)) {
+			for (File f : file.listFiles(FileBotUtil.FOLDERS_ONLY)) {
 				node.add(getTree(f));
 			}
 			
 			// then files
-			for (File f : file.listFiles(FILE_FILTER)) {
+			for (File f : file.listFiles(FileBotUtil.FILES_ONLY)) {
 				node.add(getTree(f));
 			}
 		}
@@ -75,22 +75,4 @@ class FileTreeTransferPolicy extends BackgroundFileTransferablePolicy<DefaultMut
 		return "files and folders";
 	}
 	
-	private static final FileFilter FOLDER_FILTER = new FileFilter() {
-		
-		@Override
-		public boolean accept(File file) {
-			return file.isDirectory();
-		}
-		
-	};
-	
-	private static final FileFilter FILE_FILTER = new FileFilter() {
-		
-		@Override
-		public boolean accept(File file) {
-			return file.isFile();
-		}
-		
-	};
-	
 }
diff --git a/source/net/sourceforge/tuned/TemporaryFolder.java b/source/net/sourceforge/tuned/TemporaryFolder.java
index 27da10b7..7dc60511 100644
--- a/source/net/sourceforge/tuned/TemporaryFolder.java
+++ b/source/net/sourceforge/tuned/TemporaryFolder.java
@@ -4,7 +4,9 @@ package net.sourceforge.tuned;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 
@@ -56,8 +58,9 @@ public class TemporaryFolder {
 	
 
 	public File createFile(String name) throws IOException {
-		if (!root.exists())
+		if (!root.exists()) {
 			root.mkdir();
+		}
 		
 		File file = new File(root, name);
 		file.createNewFile();
@@ -75,6 +78,48 @@ public class TemporaryFolder {
 	}
 	
 
+	public File getFolder() {
+		return root;
+	}
+	
+
+	public TemporaryFolder createFolder(String name) {
+		if (!root.exists()) {
+			root.mkdir();
+		}
+		
+		TemporaryFolder folder = new TemporaryFolder(new File(root, name));
+		
+		folder.root.mkdir();
+		
+		return folder;
+	}
+	
+
+	public List<File> list(boolean recursive) {
+		List<File> list = new ArrayList<File>();
+		
+		list(root, list, recursive);
+		
+		return list;
+	}
+	
+
+	private void list(File file, List<File> list, boolean recursive) {
+		if (file.isDirectory()) {
+			for (File entry : file.listFiles()) {
+				if (entry.isDirectory()) {
+					if (recursive) {
+						list(entry, list, recursive);
+					}
+				} else {
+					list.add(entry);
+				}
+			}
+		}
+	}
+	
+
 	public void delete() {
 		delete(root);
 	}