X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fio%2FJalviewFileChooser.java;h=a9101a1119be93d52fd877e912405446bdba7bbb;hb=0980e87380e2922790d01bde3f616115f1916a43;hp=95f4c941bb1007014a6a44956f04fc14972fd2d0;hpb=3da878124135ff033f42d19d8733891b09e953cd;p=jalview.git diff --git a/src/jalview/io/JalviewFileChooser.java b/src/jalview/io/JalviewFileChooser.java index 95f4c94..a9101a1 100755 --- a/src/jalview/io/JalviewFileChooser.java +++ b/src/jalview/io/JalviewFileChooser.java @@ -65,13 +65,13 @@ import javax.swing.plaf.basic.BasicFileChooserUI; * @author AMW * */ -public class JalviewFileChooser extends JFileChooser implements DialogRunnerI, - PropertyChangeListener +public class JalviewFileChooser extends JFileChooser + implements DialogRunnerI, PropertyChangeListener { private static final long serialVersionUID = 1L; private Map callbacks = new HashMap<>(); - + File selectedFile = null; /** @@ -211,16 +211,21 @@ public class JalviewFileChooser extends JFileChooser implements DialogRunnerI, } /** - * Overridden for JalviewJS compatibility: only one thread in Javascript, - * so we can't wait for user choice in another thread and then perform the + * 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 = super.showOpenDialog(this); - + if (!Platform.isJS()) + /** + * Java only + * + * @j2sIgnore + */ { /* * code here is not run in JalviewJS, instead @@ -279,7 +284,8 @@ public class JalviewFileChooser extends JFileChooser implements DialogRunnerI, multi.setLayout(new BoxLayout(multi, BoxLayout.PAGE_AXIS)); if (backupfilesCheckBox == null) { - try { + try + { includeBackupFiles = Boolean.parseBoolean( Cache.getProperty(BackupFiles.NS + "_FC_INCLUDE")); } catch (Exception e) @@ -309,8 +315,8 @@ public class JalviewFileChooser extends JFileChooser implements DialogRunnerI, } // fake the OK button changing (to force it to upate) String s = jfc.getApproveButtonText(); - jfc.firePropertyChange( - APPROVE_BUTTON_TEXT_CHANGED_PROPERTY, null, s); + jfc.firePropertyChange(APPROVE_BUTTON_TEXT_CHANGED_PROPERTY, + null, s); // fake the file filter changing (its behaviour actually has) jfc.firePropertyChange(FILE_FILTER_CHANGED_PROPERTY, null, f); @@ -519,11 +525,12 @@ public class JalviewFileChooser extends JFileChooser implements DialogRunnerI, class RecentlyOpened extends JPanel { private static final long serialVersionUID = 1L; + JList list; RecentlyOpened() { - setPreferredSize(new Dimension(300,100)); + setPreferredSize(new Dimension(300, 100)); String historyItems = Cache.getProperty("RECENT_FILE"); StringTokenizer st; Vector recent = new Vector<>(); @@ -539,9 +546,9 @@ public class JalviewFileChooser extends JFileChooser implements DialogRunnerI, } list = new JList<>(recent); - + DefaultListCellRenderer dlcr = new DefaultListCellRenderer(); -// dlcr.setHorizontalAlignment(DefaultListCellRenderer.RIGHT); + dlcr.setHorizontalAlignment(DefaultListCellRenderer.RIGHT); list.setCellRenderer(dlcr); list.addMouseListener(new MouseAdapter() @@ -592,16 +599,16 @@ public class JalviewFileChooser extends JFileChooser implements DialogRunnerI, @Override public DialogRunnerI setResponseHandler(Object response, Runnable action) { - callbacks.put(response, action); - return this; + callbacks.put(response, action); + return this; } @Override public void handleResponse(Object response) { /* - * this test is for NaN in Chrome - */ + * this test is for NaN in Chrome + */ if (response != null && !response.equals(response)) { return; @@ -614,9 +621,9 @@ public class JalviewFileChooser extends JFileChooser implements DialogRunnerI, } /** - * 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. + * 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 */ @@ -629,7 +636,7 @@ public class JalviewFileChooser extends JFileChooser implements DialogRunnerI, /* * property name here matches that used in JFileChooser.js */ - case "SelectedFile": + case "SelectedFile": handleResponse(APPROVE_OPTION); break; }