JAL-3416 File Chooser iconified, JvOptionPanes iconified, other internal frames and...

[jalview.git] / src / jalview / io / JalviewFileChooser.java

diff --git a/src/jalview/io/JalviewFileChooser.java b/src/jalview/io/JalviewFileChooser.java
index 88a20e7..8cd5406 100755 (executable)
--- 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;
@@ -48,6 +42,7 @@ import java.util.Vector;
 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.JPanel;
@@ -56,6 +51,13 @@ import javax.swing.SpringLayout;
 import javax.swing.filechooser.FileFilter;
 import javax.swing.plaf.basic.BasicFileChooserUI;
 
+import jalview.bin.Cache;
+import jalview.gui.JvOptionPane;
+import jalview.gui.WindowIcons;
+import jalview.util.MessageManager;
+import jalview.util.Platform;
+import jalview.util.dialogrunner.DialogRunnerI;
+
 /**
  * Enhanced file chooser dialog box.
  *
@@ -65,13 +67,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<Object, Runnable> callbacks = new HashMap<>();
-  
+
   File selectedFile = null;
 
   /**
@@ -211,15 +213,15 @@ 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
@@ -284,7 +286,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)
@@ -314,8 +317,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);
 
@@ -524,11 +527,12 @@ public class JalviewFileChooser extends JFileChooser implements DialogRunnerI,
   class RecentlyOpened extends JPanel
   {
     private static final long serialVersionUID = 1L;
+
     JList<String> list;
 
     RecentlyOpened()
     {
-      setPreferredSize(new Dimension(300,100));
+      setPreferredSize(new Dimension(300, 100));
       String historyItems = Cache.getProperty("RECENT_FILE");
       StringTokenizer st;
       Vector<String> recent = new Vector<>();
@@ -544,7 +548,7 @@ public class JalviewFileChooser extends JFileChooser implements DialogRunnerI,
       }
 
       list = new JList<>(recent);
-  
+
       DefaultListCellRenderer dlcr = new DefaultListCellRenderer();
       dlcr.setHorizontalAlignment(DefaultListCellRenderer.RIGHT);
       list.setCellRenderer(dlcr);
@@ -597,16 +601,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;
@@ -619,9 +623,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
    */
@@ -634,9 +638,18 @@ public class JalviewFileChooser extends JFileChooser implements DialogRunnerI,
     /*
      * property name here matches that used in JFileChooser.js
      */
-    case "SelectedFile": 
+    case "SelectedFile":
       handleResponse(APPROVE_OPTION);
       break;
     }
   }
+
+  @Override
+  protected JDialog createDialog(Component parent) throws HeadlessException
+  {
+    JDialog dialog = super.createDialog(parent);
+    dialog.setIconImage(WindowIcons.logoIcon.getImage());
+    return dialog;
+  }
+
 }