X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FJalviewFileChooser.java;h=cb476106ab6aa2807734189a14f36bc20f02cdf6;hb=d4271d32477e99e9fbbfa5db3e11f1b79324e60d;hp=077bffbb6d9c6e3fbda93ae939dd62edebc91fa9;hpb=952d6b6fecfb976c0c113f013ed2b8980af3d190;p=jalview.git

diff --git a/src/jalview/io/JalviewFileChooser.java b/src/jalview/io/JalviewFileChooser.java
index 077bffb..cb47610 100755
--- a/src/jalview/io/JalviewFileChooser.java
+++ b/src/jalview/io/JalviewFileChooser.java
@@ -21,12 +21,6 @@
 //////////////////////////////////////////////////////////////////
 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;
@@ -44,7 +38,6 @@ import java.util.List;
 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;
@@ -61,7 +54,7 @@ import javax.swing.plaf.basic.BasicFileChooserUI;
 
 import jalview.bin.Cache;
 import jalview.gui.JvOptionPane;
-import jalview.gui.WindowIcons;
+import jalview.util.ChannelProperties;
 import jalview.util.MessageManager;
 import jalview.util.Platform;
 import jalview.util.dialogrunner.DialogRunnerI;
@@ -80,7 +73,7 @@ public class JalviewFileChooser extends JFileChooser
 {
   private static final long serialVersionUID = 1L;
 
-  private Map<Object, Callable> callbacks = new HashMap<>();
+  private Map<Object, Runnable> callbacks = new HashMap<>();
 
   File selectedFile = null;
 
@@ -628,7 +621,7 @@ public class JalviewFileChooser extends JFileChooser
   */
 
   @Override
-  public DialogRunnerI setResponseHandler(Object response, Callable action)
+  public DialogRunnerI setResponseHandler(Object response, Runnable action)
   {
     callbacks.put(response, action);
     return this;
@@ -644,12 +637,12 @@ public class JalviewFileChooser extends JFileChooser
     {
       return;
     }
-    Callable action = callbacks.get(response);
+    Runnable action = callbacks.get(response);
     if (action != null)
     {
       try
       {
-        action.call();
+        action.run();
       } catch (Exception e)
       {
         e.printStackTrace();
@@ -683,7 +676,7 @@ public class JalviewFileChooser extends JFileChooser
   protected JDialog createDialog(Component parent) throws HeadlessException
   {
     JDialog dialog = super.createDialog(parent);
-    dialog.setIconImage(WindowIcons.logoIcon.getImage());
+    dialog.setIconImages(ChannelProperties.getIconList());
     return dialog;
   }