JAL-3141 Enabled the 'Include backpup files' checkbox for loading alignments from...

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

diff --git a/src/jalview/io/JalviewFileChooser.java b/src/jalview/io/JalviewFileChooser.java
index 8fc5ddd..8deaa33 100755 (executable)
--- a/src/jalview/io/JalviewFileChooser.java
+++ b/src/jalview/io/JalviewFileChooser.java
@@ -81,6 +81,12 @@ public class JalviewFileChooser extends JFileChooser
   public static JalviewFileChooser forRead(String directory,
           String selected)
   {
+    return JalviewFileChooser.forRead(directory, selected, false);
+  }
+
+  public static JalviewFileChooser forRead(String directory,
+          String selected, boolean allowBackupFiles)
+  {
     List<String> extensions = new ArrayList<>();
     List<String> descs = new ArrayList<>();
     for (FileFormatI format : FileFormats.getInstance().getFormats())
@@ -91,9 +97,11 @@ public class JalviewFileChooser extends JFileChooser
         descs.add(format.getName());
       }
     }
+
     return new JalviewFileChooser(directory,
             extensions.toArray(new String[extensions.size()]),
-            descs.toArray(new String[descs.size()]), selected, true);
+            descs.toArray(new String[descs.size()]), selected, true,
+            allowBackupFiles);
   }
 
   /**
@@ -259,62 +267,19 @@ public class JalviewFileChooser extends JFileChooser
             Cache.setProperty(BackupFiles.NS + "_FC_INCLUDE",
                     String.valueOf(includeBackupFiles));
 
-            if (Platform.isAMac())
+            FileFilter f = jfc.getFileFilter();
+            // deselect the selected file if it's no longer choosable
+            File selectedFile = jfc.getSelectedFile();
+            if (selectedFile != null && !f.accept(selectedFile))
             {
-              // This is a kludge. Cannot find out how to get the file list to
-              // refresh on its own! This works the best out of a number of
-              // different attempts!
-              FileFilter ff = jfc.getFileFilter();
-              jfc.setFileFilter(jfc.getAcceptAllFileFilter());
-              jfc.setFileFilter(ff);
-
-              /*
-              jfc.setFileHidingEnabled(!jfc.isFileHidingEnabled());
-              jfc.setFileHidingEnabled(!jfc.isFileHidingEnabled());
-              */
-
-              /*
-              jfc.getRootPane()
-                      .paintImmediately(jfc.getRootPane().getBounds());
-              jfc.paintImmediately(jfc.getBounds());
-              */
-
-              /*
-              Object o = jfc.getClientProperty(
-                      CHOOSABLE_FILE_FILTER_CHANGED_PROPERTY);
-              jfc.firePropertyChange(CHOOSABLE_FILE_FILTER_CHANGED_PROPERTY,
-                      o, o);
-              */
-
-              /*
-              File f = jfc.getSelectedFile();
               jfc.setSelectedFile(null);
-              if (f != null)
-              {
-                jfc.setSelectedFile(f);
-              }
-              */
-
-              /*
-              Graphics g = jfc.getGraphics();
-              jfc.update(g);
-              jfc.paintAll(g);
-              */
-
-              /*
-              jfc.setFileHidingEnabled(!jfc.isFileHidingEnabled());
-              jfc.setFileHidingEnabled(!jfc.isFileHidingEnabled());
-              */
-              /*
-              jfc.invalidate();
-              Component[] c = jfc.getComponents();
-              for (int i = 0; i < c.length; i++)
-              {
-                c[i].invalidate();
-                System.out.println("INVALIDATING " + c[i].getName());
-              }
-              */
             }
+            // fake the OK button changing (to force it to upate)
+            String s = jfc.getApproveButtonText();
+            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);
 
             jfc.rescanCurrentDirectory();
             jfc.revalidate();