X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FJalviewFileChooser.java;h=dba7ad1747c0293137d2080a99d78d268da6608e;hb=b364e1e6d199002069dab615d1007799b5bb71e1;hp=acd0e183f0048644813c069630e14bfce3b30aea;hpb=d9f0a24d9662a0b530fd79b51108dd074d03d6e0;p=jalview.git

diff --git a/src/jalview/io/JalviewFileChooser.java b/src/jalview/io/JalviewFileChooser.java
index acd0e18..dba7ad1 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,18 +38,26 @@ 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;
 import javax.swing.JCheckBox;
 import javax.swing.JFileChooser;
 import javax.swing.JList;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 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.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<>();
-  
+  private Map<Object, Callable> callbacks = new HashMap<>();
+
   File selectedFile = null;
 
   /**
@@ -211,20 +213,20 @@ 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
      * 
-     * @j2sNative
+     * @j2sIgnore
      */
     {
       /*
@@ -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);
 
@@ -487,10 +490,13 @@ public class JalviewFileChooser extends JFileChooser implements DialogRunnerI,
 
     if (selectedFile.exists())
     {
-      int confirm = JvOptionPane.showConfirmDialog(this,
-              MessageManager.getString("label.overwrite_existing_file"),
-              MessageManager.getString("label.file_already_exists"),
-              JvOptionPane.YES_NO_OPTION);
+      int confirm = Cache.getDefault("CONFIRM_OVERWRITE_FILE", true)
+              ? JvOptionPane.showConfirmDialog(this,
+                      MessageManager
+                              .getString("label.overwrite_existing_file"),
+                      MessageManager.getString("label.file_already_exists"),
+                      JvOptionPane.YES_NO_OPTION)
+              : JOptionPane.YES_OPTION;
 
       if (confirm != JvOptionPane.YES_OPTION)
       {
@@ -524,11 +530,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 +551,7 @@ public class JalviewFileChooser extends JFileChooser implements DialogRunnerI,
       }
 
       list = new JList<>(recent);
-  
+
       DefaultListCellRenderer dlcr = new DefaultListCellRenderer();
       dlcr.setHorizontalAlignment(DefaultListCellRenderer.RIGHT);
       list.setCellRenderer(dlcr);
@@ -594,34 +601,58 @@ public class JalviewFileChooser extends JFileChooser implements DialogRunnerI,
 
   }
 
+  /*
+  @Override
+  public JalviewFileChooser setResponseHandler(Object response,
+          Runnable action)
+  {
+    callbacks.put(response, new Callable<Void>()
+    {
+      @Override
+      public Void call()
+      {
+        action.run();
+        return null;
+      }
+    });
+    return this;
+  }
+  */
+
   @Override
-  public DialogRunnerI setResponseHandler(Object response, Runnable action)
+  public DialogRunnerI setResponseHandler(Object response, Callable 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;
     }
-    Runnable action = callbacks.get(response);
+    Callable action = callbacks.get(response);
     if (action != null)
     {
-      action.run();
+      try
+      {
+        action.call();
+      } catch (Exception e)
+      {
+        e.printStackTrace();
+      }
     }
   }
 
   /**
-   * 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,7 +665,7 @@ public class JalviewFileChooser extends JFileChooser implements DialogRunnerI,
     /*
      * property name here matches that used in JFileChooser.js
      */
-    case "SelectedFile": 
+    case "SelectedFile":
       handleResponse(APPROVE_OPTION);
       break;
     }