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

* support native FileDialog for mas sandbox

This commit is contained in:
Reinhard Pointner 2014-07-28 12:54:34 +00:00
parent 2ce7c6020b
commit f1d260c2a3
2 changed files with 58 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source/net/filebot/Settings.java
View File

@ -59,13 +59,11 @@ public final class Settings {
}
public static boolean useDonationReminder() {
String deployment = getApplicationDeployment();
for (String it : new String[] { "ppa", "appstore" }) {
if (it.equalsIgnoreCase(deployment)) {
return false;
}
}
return true;
return !("ppa".equals(getApplicationDeployment()) || "mas".equals(getApplicationDeployment()));
}
public static boolean isSandboxed() {
return "mas".equals(System.getProperty("application.deployment"));
}
public static int getPreferredThreadPoolSize() {
@ -77,14 +75,7 @@ public final class Settings {
}
public static String getApplicationDeployment() {
String deployment = System.getProperty("application.deployment");
if (deployment != null)
return deployment;
if (System.getProperty("javawebstart.version") != null)
return "webstart";
return null;
return System.getProperty("application.deployment");
}
public static File getApplicationFolder() {

70
source/net/filebot/ui/transfer/LoadAction.java
View File

@ -2,6 +2,8 @@ package net.filebot.ui.transfer;
import static net.filebot.ui.NotificationLogging.*;
import java.awt.FileDialog;
import java.awt.Frame;
import java.awt.event.ActionEvent;
import java.io.File;
import java.util.logging.Level;
@ -42,32 +44,64 @@ public class LoadAction extends AbstractAction {
return new File(lastLocation);
}
protected void setDefaultFolder(File folder) {
Settings.forPackage(LoadAction.class).put("load.location", folder.getPath());
}
public void actionPerformed(ActionEvent evt) {
// get transferable policy from action properties
TransferablePolicy transferablePolicy = (TransferablePolicy) getValue(TRANSFERABLE_POLICY);
if (transferablePolicy == null)
return;
JFileChooser chooser = new JFileChooser(getDefaultFolder());
chooser.setFileFilter(new TransferablePolicyFileFilter(transferablePolicy));
chooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
chooser.setMultiSelectionEnabled(true);
if (chooser.showOpenDialog(null) != JFileChooser.APPROVE_OPTION) {
return;
}
FileTransferable transferable = new FileTransferable(chooser.getSelectedFiles());
try {
// get transferable policy from action properties
TransferablePolicy transferablePolicy = (TransferablePolicy) getValue(TRANSFERABLE_POLICY);
if (transferablePolicy == null) {
return;
}
File[] files = showSelectFiles(new TransferablePolicyFileFilter(transferablePolicy));
if (files == null || files.length == 0) {
return;
}
FileTransferable transferable = new FileTransferable(files);
if (transferablePolicy.accept(transferable)) {
transferablePolicy.handleTransferable(transferable, getTransferAction(evt));
}
} catch (Exception e) {
UILogger.log(Level.WARNING, e.getMessage(), e);
}
// remember last location
Settings.forPackage(LoadAction.class).put("load.location", chooser.getCurrentDirectory().getPath());
}
public File[] showSelectFiles(TransferablePolicyFileFilter fileFilter) {
if (Settings.isSandboxed()) {
Frame[] frames = Frame.getFrames();
Frame mainFrame = frames.length > 0 ? frames[0] : null;
FileDialog fileDialog = new FileDialog(mainFrame, "", FileDialog.LOAD);
File currentFolder = getDefaultFolder();
if (currentFolder != null) {
fileDialog.setDirectory(currentFolder.getPath());
}
fileDialog.setMultipleMode(true);
fileDialog.setVisible(true);
File[] files = fileDialog.getFiles();
if (files.length > 0) {
setDefaultFolder(new File(fileDialog.getDirectory()));
}
return files;
}
// use normal Swing JFileChooser by default
JFileChooser chooser = new JFileChooser(getDefaultFolder());
chooser.setFileFilter(fileFilter);
chooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
chooser.setMultiSelectionEnabled(true);
if (chooser.showOpenDialog(null) != JFileChooser.APPROVE_OPTION) {
return null;
}
setDefaultFolder(chooser.getCurrentDirectory());
return chooser.getSelectedFiles();
}
}