X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FJalviewFileChooser.java;h=c275ef0d4d4e9c3f3c5547b4dd89cb4c6379b9e2;hb=6b62e4c0242d4f6d43fb0059f32268ff9e992e4f;hp=cf72ffb707e0e47a6468146b9768ed9884dd42d9;hpb=833b0e8d60b46c17dad52d31f4896363f29499bc;p=jalview.git diff --git a/src/jalview/io/JalviewFileChooser.java b/src/jalview/io/JalviewFileChooser.java index cf72ffb..c275ef0 100755 --- a/src/jalview/io/JalviewFileChooser.java +++ b/src/jalview/io/JalviewFileChooser.java @@ -26,8 +26,6 @@ import jalview.gui.JvOptionPane; import jalview.util.MessageManager; import jalview.util.Platform; import jalview.util.dialogrunner.DialogRunnerI; -import jalview.util.dialogrunner.Response; -import jalview.util.dialogrunner.RunResponse; import java.awt.Component; import java.awt.Dimension; @@ -39,7 +37,9 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.StringTokenizer; import java.util.Vector; @@ -60,11 +60,15 @@ import javax.swing.plaf.basic.BasicFileChooserUI; * @author AMW * */ -public class JalviewFileChooser extends JFileChooser - implements PropertyChangeListener, DialogRunnerI +public class JalviewFileChooser extends JFileChooser implements DialogRunnerI, + PropertyChangeListener { - jalview.util.dialogrunner.DialogRunner runner = new jalview.util.dialogrunner.DialogRunner<>( - this); + private static final long serialVersionUID = 1L; + + private Map callbacks = new HashMap<>(); + + File selectedFile = null; + /** * Factory method to return a file chooser that offers readable alignment file * formats @@ -145,7 +149,7 @@ public class JalviewFileChooser extends JFileChooser } JalviewFileChooser(String dir, String[] extensions, String[] descs, - String selected, boolean allFiles) + String selected, boolean acceptAny) { super(safePath(dir)); if (extensions.length == descs.length) @@ -155,7 +159,7 @@ public class JalviewFileChooser extends JFileChooser { formats.add(new String[] { extensions[i], descs[i] }); } - init(formats, selected, allFiles); + init(formats, selected, acceptAny); } else { @@ -164,18 +168,6 @@ public class JalviewFileChooser extends JFileChooser } } - @Override - public void propertyChange(PropertyChangeEvent evt) - { - // TODO other properties need runners... - switch (evt.getPropertyName()) - { - case "SelectedFile": - runner.run(APPROVE_OPTION); - break; - } - } - private static File safePath(String dir) { if (dir == null) @@ -191,10 +183,27 @@ public class JalviewFileChooser extends JFileChooser return f; } - public void openDialog(Component parent) + /** + * Overridden for JalviewJS compatibility: only one thread in Javascript, + * so we can't wait for user choice in another thread and then perform the + * desired action + */ + @Override + public int showOpenDialog(Component parent) { - int value = showOpenDialog(this); - runner.run(value); + int value = super.showOpenDialog(this); + + /* + * code below here is not reached in JalviewJS, instead + * propertyChange() is called for dialog action + */ + /** + * @j2sNative + */ + { + handleResponse(value); + } + return value; } /** @@ -202,17 +211,17 @@ public class JalviewFileChooser extends JFileChooser * @param formats * a list of {extensions, description} for each file format * @param selected - * @param allFiles + * @param acceptAny * if true, 'any format' option is included */ - void init(List formats, String selected, boolean allFiles) + void init(List formats, String selected, boolean acceptAny) { JalviewFileFilter chosen = null; // SelectAllFilter needs to be set first before adding further // file filters to fix bug on Mac OSX - setAcceptAllFileFilterUsed(allFiles); + setAcceptAllFileFilterUsed(acceptAny); for (String[] format : formats) { @@ -304,80 +313,94 @@ public class JalviewFileChooser extends JFileChooser return null; } - Component saveparent; - RunResponse overwriteCheck = new RunResponse( - JalviewFileChooser.APPROVE_OPTION) + @Override + public File getSelectedFile() { - @Override - public void run() + File f = super.getSelectedFile(); + return f == null ? selectedFile : f; + } + + @Override + public int showSaveDialog(Component parent) throws HeadlessException + { + this.setAccessory(null); + // Java 9,10,11 on OSX - clear selected file so name isn't auto populated + this.setSelectedFile(null); + + return super.showSaveDialog(parent); + } + + /** + * If doing a Save, and an existing file is chosen or entered, prompt for + * confirmation of overwrite. Proceed if Yes, else leave the file chooser + * open. + * + * @see https://stackoverflow.com/questions/8581215/jfilechooser-and-checking-for-overwrite + */ + @Override + public void approveSelection() + { + if (getDialogType() != SAVE_DIALOG) { - // JBP Note - this code was executed regardless of 'SAVE' being pressed - // need to see if there were side effects - if (getFileFilter() instanceof JalviewFileFilter) - { - JalviewFileFilter jvf = (JalviewFileFilter) getFileFilter(); + super.approveSelection(); + return; + } - if (!jvf.accept(getSelectedFile())) - { - String withExtension = getSelectedFile() + "." - + jvf.getAcceptableExtension(); - setSelectedFile(new File(withExtension)); - } - } - // All good, so we continue to save - returned = new Response(JalviewFileChooser.APPROVE_OPTION); + selectedFile = getSelectedFile(); - // TODO: ENSURE THAT FILES SAVED WITH A ':' IN THE NAME ARE REFUSED AND THE - // USER PROMPTED FOR A NEW FILENAME - /** - * @j2sNative - */ + if (selectedFile == null) + { + // Workaround for Java 9,10 on OSX - no selected file, but there is a + // filename typed in + try { - if (getSelectedFile().exists()) + String filename = ((BasicFileChooserUI) getUI()).getFileName(); + if (filename != null && filename.length() > 0) { - // TODO JAL-3048 - may not need to raise this for browser saves - - // yes/no cancel - int confirm = JvOptionPane.showConfirmDialog(saveparent, - MessageManager.getString("label.overwrite_existing_file"), - MessageManager.getString("label.file_already_exists"), - JvOptionPane.YES_NO_OPTION); - - if (confirm != JvOptionPane.YES_OPTION) - { - returned = new Response(JalviewFileChooser.CANCEL_OPTION); - } + selectedFile = new File(getCurrentDirectory(), filename); } + } catch (Throwable x) + { + System.err.println( + "Unexpected exception when trying to get filename."); + x.printStackTrace(); } - }; - }; - - @Override - public int showSaveDialog(Component parent) throws HeadlessException - { - this.setAccessory(null); + // TODO: ENSURE THAT FILES SAVED WITH A ':' IN THE NAME ARE REFUSED AND + // THE + // USER PROMPTED FOR A NEW FILENAME + } - /* - * Save dialog is opened until user picks a file format - */ - if (!runner.isRegistered(overwriteCheck)) + if (selectedFile == null) { - // first call for this instance - runner.firstResponse(overwriteCheck); + return; } - else + + if (getFileFilter() instanceof JalviewFileFilter) { - // reset response flags - runner.resetResponses(); + JalviewFileFilter jvf = (JalviewFileFilter) getFileFilter(); + + if (!jvf.accept(selectedFile)) + { + String withExtension = getSelectedFile().getName() + "." + + jvf.getAcceptableExtension(); + selectedFile = (new File(getCurrentDirectory(), withExtension)); + setSelectedFile(selectedFile); + } } - setDialogType(SAVE_DIALOG); - saveparent = parent; + if (selectedFile.exists()) + { + int confirm = JvOptionPane.showConfirmDialog(this, + MessageManager.getString("label.overwrite_existing_file"), + MessageManager.getString("label.file_already_exists"), + JvOptionPane.YES_NO_OPTION); + if (confirm != JvOptionPane.YES_OPTION) + { + return; + } + } - int value = showDialog(parent, MessageManager.getString("action.save")); - - runner.run(value); - return value; + super.approveSelection(); } void recentListSelectionChanged(Object selection) @@ -402,14 +425,15 @@ public class JalviewFileChooser extends JFileChooser class RecentlyOpened extends JPanel { - JList list; + private static final long serialVersionUID = 1L; + JList list; - public RecentlyOpened() + RecentlyOpened() { - - String historyItems = jalview.bin.Cache.getProperty("RECENT_FILE"); + setPreferredSize(new Dimension(300,100)); + String historyItems = Cache.getProperty("RECENT_FILE"); StringTokenizer st; - Vector recent = new Vector(); + Vector recent = new Vector<>(); if (historyItems != null) { @@ -417,14 +441,14 @@ public class JalviewFileChooser extends JFileChooser while (st.hasMoreTokens()) { - recent.addElement(st.nextElement()); + recent.addElement(st.nextToken()); } } - list = new JList(recent); - + list = new JList<>(recent); + DefaultListCellRenderer dlcr = new DefaultListCellRenderer(); - dlcr.setHorizontalAlignment(DefaultListCellRenderer.RIGHT); +// dlcr.setHorizontalAlignment(DefaultListCellRenderer.RIGHT); list.setCellRenderer(dlcr); list.addMouseListener(new MouseAdapter() @@ -447,13 +471,13 @@ public class JalviewFileChooser extends JFileChooser layout.putConstraint(SpringLayout.NORTH, scroller, 5, SpringLayout.NORTH, this); - if (new Platform().isAMac()) + if (Platform.isAMac()) { scroller.setPreferredSize(new Dimension(500, 100)); } else { - scroller.setPreferredSize(new Dimension(130, 200)); + scroller.setPreferredSize(new Dimension(530, 200)); } this.add(scroller); @@ -473,9 +497,48 @@ public class JalviewFileChooser extends JFileChooser } @Override - public JalviewFileChooser response(RunResponse action) + public DialogRunnerI setResponseHandler(Object response, Runnable action) { - return runner.response(action); + callbacks.put(response, action); + return this; } + @Override + public void handleResponse(Object response) + { + /* + * this test is for NaN in Chrome + */ + if (response != null && !response.equals(response)) + { + return; + } + Runnable action = callbacks.get(response); + if (action != null) + { + action.run(); + } + } + + /** + * JalviewJS signals file selection by a property change event + * for property "SelectedFile". This methods responds to that by + * running the response action for 'OK' in the dialog. + * + * @param evt + */ + @Override + public void propertyChange(PropertyChangeEvent evt) + { + // TODO other properties need runners... + switch (evt.getPropertyName()) + { + /* + * property name here matches that used in JFileChooser.js + */ + case "SelectedFile": + handleResponse(APPROVE_OPTION); + break; + } + } }