mobeigi
/
filebot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[mas] do not load files if user clicks "Cancel" (NSOpenDialog)

This commit is contained in:
Reinhard Pointner 2014-11-08 09:48:16 +00:00
parent f1ddcb3e7e
commit 77915ca7af
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/net/filebot/UserFiles.java
View File

@ -215,7 +215,12 @@ public class UserFiles {
nsOpenPanel.setAllowedFileTypes(asList(filter.extensions())); nsOpenPanel.setAllowedFileTypes(asList(filter.extensions()));
} }
nsOpenPanel.setVisible(true); nsOpenPanel.setVisible(true);
if (!nsOpenPanel.isCancelled()) {
return asList(nsOpenPanel.getFiles()); return asList(nsOpenPanel.getFiles());
} else {
return emptyList();
}
} catch (Throwable e) { } catch (Throwable e) {
Logger.getLogger(UserFiles.class.getName()).log(Level.WARNING, e.toString()); Logger.getLogger(UserFiles.class.getName()).log(Level.WARNING, e.toString());
} }

32
source/net/filebot/mac/NativeFileDialog.java
View File

@ -7,6 +7,7 @@ import java.awt.FileDialog;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import ca.weblite.objc.NSObject; import ca.weblite.objc.NSObject;
import ca.weblite.objc.Proxy; import ca.weblite.objc.Proxy;
@ -423,7 +424,6 @@ public class NativeFileDialog extends NSObject {
* @return * @return
*/ */
public String getFile() { public String getFile() {
final String[] out = new String[1]; final String[] out = new String[1];
dispatch_sync(new Runnable() { dispatch_sync(new Runnable() {
@ -439,7 +439,6 @@ public class NativeFileDialog extends NSObject {
}); });
return out[0]; return out[0];
} }
/** /**
@ -467,9 +466,7 @@ public class NativeFileDialog extends NSObject {
} }
}); });
return out.toArray(new File[0]); return out.toArray(new File[0]);
} }
/** /**
@ -560,25 +557,24 @@ public class NativeFileDialog extends NSObject {
@Override @Override
public void run() { public void run() {
peer.send("runModal"); int result = peer.sendInt("runModal");
nsFileHandlingButton.set(result);
} }
}); });
} }
public static void main(String[] args) { public int getResult() {
NativeFileDialog dlg = new NativeFileDialog("Foo", FileDialog.LOAD); return nsFileHandlingButton.get();
// dlg.peer.send("runModal");
// System.out.println("Get title: "+dlg.getTitle());
// dlg.setCanCreateDirectories(true);
// dlg.setAllowedFileTypes(Arrays.asList("zip"));
dlg.setCanChooseDirectories(true);
dlg.setCanChooseFiles(true);
dlg.setVisible(true);
System.out.println(dlg.getFile());
System.out.println("done");
} }
public boolean isCancelled() {
return nsFileHandlingButton.get() == NSFileHandlingPanelCancelButton;
}
private final AtomicInteger nsFileHandlingButton = new AtomicInteger(NSFileHandlingPanelCancelButton);
public static final int NSFileHandlingPanelOKButton = 1;
public static final int NSFileHandlingPanelCancelButton = 0;
} }