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
JAL-4001 Check --nousagestats before doing analytics in headless mode
[jalview.git]
/
src
/
jalview
/
io
/
JalviewFileChooser.java
diff --git
a/src/jalview/io/JalviewFileChooser.java
b/src/jalview/io/JalviewFileChooser.java
index
b046d36
..
cb47610
100755
(executable)
--- a/
src/jalview/io/JalviewFileChooser.java
+++ b/
src/jalview/io/JalviewFileChooser.java
@@
-21,12
+21,6
@@
//////////////////////////////////////////////////////////////////
package jalview.io;
//////////////////////////////////////////////////////////////////
package jalview.io;
-import jalview.bin.Cache;
-import jalview.gui.JvOptionPane;
-import jalview.util.MessageManager;
-import jalview.util.Platform;
-import jalview.util.dialogrunner.DialogRunnerI;
-
import java.awt.Component;
import java.awt.Dimension;
import java.awt.EventQueue;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.EventQueue;
@@
-44,7
+38,6
@@
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.BoxLayout;
import javax.swing.DefaultListCellRenderer;
@@
-61,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;
@@
-79,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;
@@
-627,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;
@@
-643,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();
@@
-682,7
+676,7
@@
public class JalviewFileChooser extends JFileChooser
protected JDialog createDialog(Component parent) throws HeadlessException
{
JDialog dialog = super.createDialog(parent);
protected JDialog createDialog(Component parent) throws HeadlessException
{
JDialog dialog = super.createDialog(parent);
- dialog.setIconImage(null);
+ dialog.setIconImages(ChannelProperties.getIconList());
return dialog;
}
return dialog;
}