moparisthebest
/
filebot
mirror of https://github.com/mitb-archive/filebot
1
0
Fork 0
Code Issues Releases Wiki Activity

* fix NPE issue 

@see http://www.filebot.net/forums/viewtopic.php?f=6&t=1199&p=7243#p7243
This commit is contained in:
Reinhard Pointner 2013-12-23 13:42:56 +00:00
parent f5910f837d
commit 0827fda189
1 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
source/net/sourceforge/filebot/ui/rename/FilesListTransferablePolicy.java
View File

@ -1,7 +1,5 @@
package net.sourceforge.filebot.ui.rename;
import static java.util.Arrays.*;
import static net.sourceforge.filebot.MediaTypes.*;
import static net.sourceforge.filebot.ui.transfer.FileTransferable.*;
@ -20,29 +18,24 @@ import net.sourceforge.filebot.media.MediaDetection;
import net.sourceforge.filebot.ui.transfer.FileTransferablePolicy;
import net.sourceforge.tuned.FastFile;
class FilesListTransferablePolicy extends FileTransferablePolicy {
private final List<File> model;
public FilesListTransferablePolicy(List<File> model) {
this.model = model;
}
@Override
protected boolean accept(List<File> files) {
return true;
}
@Override
protected void clear() {
model.clear();
}
@Override
public void handleTransferable(Transferable tr, TransferAction action) throws Exception {
if (action == TransferAction.LINK) {
@ -54,24 +47,22 @@ class FilesListTransferablePolicy extends FileTransferablePolicy {
super.handleTransferable(tr, action);
}
}
@Override
protected void load(List<File> files) {
load(files, true);
}
protected void load(List<File> files, boolean recursive) {
List<File> entries = new ArrayList<File>();
LinkedList<File> queue = new LinkedList<File>(files);
while (queue.size() > 0) {
File f = queue.removeFirst();
if (f.isHidden())
continue;
if (recursive && LIST_FILES.accept(f)) {
// don't use new Scanner(File) because of BUG 6368019 (http://bugs.sun.com/view_bug.do?bug_id=6368019)
try {
@ -87,7 +78,7 @@ class FilesListTransferablePolicy extends FileTransferablePolicy {
}
}
scanner.close();
if (paths.isEmpty()) {
entries.add(f); // treat as simple text file
} else {
@ -98,18 +89,20 @@ class FilesListTransferablePolicy extends FileTransferablePolicy {
}
} else if (!recursive || f.isFile() || MediaDetection.isDiskFolder(f)) {
entries.add(f);
} else {
queue.addAll(0, asList(f.listFiles()));
} else if (f.isDirectory()) {
File[] children = f.listFiles();
if (children != null) {
queue.addAll(0, asList(children));
}
}
}
model.addAll(FastFile.foreach(entries));
}
@Override
public String getFileFilterDescription() {
return "files and folders";
}
}