git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into releases/Release_2_11_3_Branch
[jalview.git]
/
src
/
jalview
/
io
/
JalviewFileChooser.java
diff --git
a/src/jalview/io/JalviewFileChooser.java
b/src/jalview/io/JalviewFileChooser.java
index
dba7ad1
..
cb47610
100755
(executable)
--- a/
src/jalview/io/JalviewFileChooser.java
+++ b/
src/jalview/io/JalviewFileChooser.java
@@
-38,11
+38,11
@@
import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
import java.util.Vector;
import java.util.Map;
import java.util.StringTokenizer;
import java.util.Vector;
-import java.util.concurrent.Callable;
import javax.swing.BoxLayout;
import javax.swing.DefaultListCellRenderer;
import javax.swing.JCheckBox;
import javax.swing.BoxLayout;
import javax.swing.DefaultListCellRenderer;
import javax.swing.JCheckBox;
+import javax.swing.JDialog;
import javax.swing.JFileChooser;
import javax.swing.JList;
import javax.swing.JOptionPane;
import javax.swing.JFileChooser;
import javax.swing.JList;
import javax.swing.JOptionPane;
@@
-54,6
+54,7
@@
import javax.swing.plaf.basic.BasicFileChooserUI;
import jalview.bin.Cache;
import jalview.gui.JvOptionPane;
import jalview.bin.Cache;
import jalview.gui.JvOptionPane;
+import jalview.util.ChannelProperties;
import jalview.util.MessageManager;
import jalview.util.Platform;
import jalview.util.dialogrunner.DialogRunnerI;
import jalview.util.MessageManager;
import jalview.util.Platform;
import jalview.util.dialogrunner.DialogRunnerI;
@@
-72,7
+73,7
@@
public class JalviewFileChooser extends JFileChooser
{
private static final long serialVersionUID = 1L;
{
private static final long serialVersionUID = 1L;
- private Map<Object, Callable> callbacks = new HashMap<>();
+ private Map<Object, Runnable> callbacks = new HashMap<>();
File selectedFile = null;
File selectedFile = null;
@@
-620,7
+621,7
@@
public class JalviewFileChooser extends JFileChooser
*/
@Override
*/
@Override
- public DialogRunnerI setResponseHandler(Object response, Callable action)
+ public DialogRunnerI setResponseHandler(Object response, Runnable action)
{
callbacks.put(response, action);
return this;
{
callbacks.put(response, action);
return this;
@@
-636,12
+637,12
@@
public class JalviewFileChooser extends JFileChooser
{
return;
}
{
return;
}
- Callable action = callbacks.get(response);
+ Runnable action = callbacks.get(response);
if (action != null)
{
try
{
if (action != null)
{
try
{
- action.call();
+ action.run();
} catch (Exception e)
{
e.printStackTrace();
} catch (Exception e)
{
e.printStackTrace();
@@
-670,4
+671,13
@@
public class JalviewFileChooser extends JFileChooser
break;
}
}
break;
}
}
+
+ @Override
+ protected JDialog createDialog(Component parent) throws HeadlessException
+ {
+ JDialog dialog = super.createDialog(parent);
+ dialog.setIconImages(ChannelProperties.getIconList());
+ return dialog;
+ }
+
}
}