X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJvOptionPane.java;fp=src%2Fjalview%2Fgui%2FJvOptionPane.java;h=3c942ce966bdaf83053473f93246e3f9f1f72b6e;hb=b865b46f6f34e82f5d10fccfe646f00b8ae2e7a1;hp=0e0b13d847464fc8a9467f7867dc6ab9b32bff53;hpb=17b7d054cf7faa5ee57ad8c8c4c9daa495d8cb35;p=jalview.git

diff --git a/src/jalview/gui/JvOptionPane.java b/src/jalview/gui/JvOptionPane.java
index 0e0b13d..3c942ce 100644
--- a/src/jalview/gui/JvOptionPane.java
+++ b/src/jalview/gui/JvOptionPane.java
@@ -42,6 +42,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 import javax.swing.Icon;
@@ -57,6 +58,7 @@ import javax.swing.UIManager;
 import javax.swing.event.InternalFrameEvent;
 import javax.swing.event.InternalFrameListener;
 
+import jalview.bin.Console;
 import jalview.util.ChannelProperties;
 import jalview.util.Platform;
 import jalview.util.dialogrunner.DialogRunnerI;
@@ -72,6 +74,10 @@ public class JvOptionPane extends JOptionPane
 
   private Component parentComponent;
 
+  private ExecutorService executor = Executors.newCachedThreadPool();
+
+  private JDialog dialog = null;
+
   private Map<Object, Callable<Void>> callbacks = new HashMap<>();
 
   /*
@@ -878,7 +884,7 @@ public class JvOptionPane extends JOptionPane
               JOptionPane joptionpane = (JOptionPane) joptionpaneObject;
               joptionpane.setValue(buttonAction);
               if (action != null)
-                Executors.newSingleThreadExecutor().submit(action);
+                getExecutor().submit(action);
               joptionpane.transferFocusBackward();
               joptionpane.setVisible(false);
               // put focus and raise parent window if possible, unless cancel or
@@ -979,12 +985,13 @@ public class JvOptionPane extends JOptionPane
           jb.setText((String) o);
           jb.addActionListener(new ActionListener()
           {
+
             @Override
             public void actionPerformed(ActionEvent e)
             {
               joptionpane.setValue(buttonAction);
               if (action != null)
-                Executors.newSingleThreadExecutor().submit(action);
+                getExecutor().submit(action);
               // joptionpane.transferFocusBackward();
               joptionpane.transferFocusBackward();
               joptionpane.setVisible(false);
@@ -1036,6 +1043,7 @@ public class JvOptionPane extends JOptionPane
               : ModalityType.MODELESS);
       dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
       dialog.setVisible(true);
+      setDialog(dialog);
     }
   }
 
@@ -1145,6 +1153,28 @@ public class JvOptionPane extends JOptionPane
     return this;
   }
 
+  public ExecutorService getExecutor()
+  {
+    if (executor == null)
+      executor = Executors.newSingleThreadExecutor();
+    return executor;
+  }
+
+  public void setExecutor(ExecutorService es)
+  {
+    executor = es;
+  }
+
+  public void setDialog(JDialog d)
+  {
+    dialog = d;
+  }
+
+  public JDialog getDialog()
+  {
+    return dialog;
+  }
+
   /**
    * showDialogOnTop will create a dialog that (attempts to) come to top of OS
    * desktop windows
@@ -1152,6 +1182,14 @@ public class JvOptionPane extends JOptionPane
   public static int showDialogOnTop(String label, String actionString,
           int JOPTIONPANE_OPTION, int JOPTIONPANE_MESSAGETYPE)
   {
+    return showDialogOnTop(null, label, actionString, JOPTIONPANE_OPTION,
+            JOPTIONPANE_MESSAGETYPE);
+  }
+
+  public static int showDialogOnTop(Component dialogParentComponent,
+          String label, String actionString, int JOPTIONPANE_OPTION,
+          int JOPTIONPANE_MESSAGETYPE)
+  {
     if (!isInteractiveMode())
     {
       return (int) getMockResponse();
@@ -1166,14 +1204,23 @@ public class JvOptionPane extends JOptionPane
     // A better hack which works is to create a new JFrame parent with
     // setAlwaysOnTop(true)
     JFrame dialogParent = new JFrame();
-    dialogParent.setIconImages(ChannelProperties.getIconList());
-    dialogParent.setAlwaysOnTop(true);
+    if (dialogParentComponent == null)
+    {
+      dialogParent.setIconImages(ChannelProperties.getIconList());
+      dialogParent.setAlwaysOnTop(true);
+    }
 
-    int answer = JOptionPane.showConfirmDialog(dialogParent, label,
-            actionString, JOPTIONPANE_OPTION, JOPTIONPANE_MESSAGETYPE);
+    int answer = JOptionPane.showConfirmDialog(
+            dialogParentComponent == null ? dialogParent
+                    : dialogParentComponent,
+            label, actionString, JOPTIONPANE_OPTION,
+            JOPTIONPANE_MESSAGETYPE);
 
-    dialogParent.setAlwaysOnTop(false);
-    dialogParent.dispose();
+    if (dialogParentComponent == null)
+    {
+      dialogParent.setAlwaysOnTop(false);
+      dialogParent.dispose();
+    }
 
     return answer;
   }
@@ -1266,7 +1313,8 @@ public class JvOptionPane extends JOptionPane
     {
       try
       {
-        action.call();
+        getExecutor().submit(action).get();
+        // action.call();
       } catch (Exception e)
       {
         e.printStackTrace();
@@ -1362,7 +1410,7 @@ public class JvOptionPane extends JOptionPane
           {
             joptionpane.setValue(buttonAction);
             if (action != null)
-              Executors.newSingleThreadExecutor().submit(action);
+              getExecutor().submit(action);
             // joptionpane.transferFocusBackward();
             joptionpane.transferFocusBackward();
             joptionpane.setVisible(false);
@@ -1412,6 +1460,7 @@ public class JvOptionPane extends JOptionPane
     dialog.setModalityType(
             modal ? ModalityType.APPLICATION_MODAL : ModalityType.MODELESS);
     dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+    setDialog(dialog);
     return dialog;
   }
 
@@ -1499,4 +1548,53 @@ public class JvOptionPane extends JOptionPane
         parent.remove(f);
     }
   }
+
+  public static JvOptionPane frameDialog(String message, String title,
+          int messageType, String[] buttonsText, String defaultButton,
+          Callable<Void>[] handlers, boolean modal)
+  {
+    JFrame parent = new JFrame();
+    JvOptionPane jvop = JvOptionPane.newOptionDialog();
+    JButton[] buttons = new JButton[buttonsText.length];
+    for (int i = 0; i < buttonsText.length; i++)
+    {
+      buttons[i] = new JButton();
+      buttons[i].setText(buttonsText[i]);
+      Console.debug("DISABLING BUTTON " + buttons[i].getText());
+      buttons[i].setEnabled(false);
+      buttons[i].setVisible(false);
+    }
+
+    int dialogType = -1;
+    if (buttonsText.length == 1)
+    {
+      dialogType = JOptionPane.OK_OPTION;
+    }
+    else if (buttonsText.length == 2)
+    {
+      dialogType = JOptionPane.YES_NO_OPTION;
+    }
+    else
+    {
+      dialogType = JOptionPane.YES_NO_CANCEL_OPTION;
+    }
+    jvop.setResponseHandler(JOptionPane.YES_OPTION, handlers[0]);
+    if (dialogType == JOptionPane.YES_NO_OPTION
+            || dialogType == JOptionPane.YES_NO_CANCEL_OPTION)
+    {
+      jvop.setResponseHandler(JOptionPane.NO_OPTION, handlers[1]);
+    }
+    if (dialogType == JOptionPane.YES_NO_CANCEL_OPTION)
+    {
+      jvop.setResponseHandler(JOptionPane.CANCEL_OPTION, handlers[2]);
+    }
+
+    final int dt = dialogType;
+    jvop.getExecutor().execute(() -> {
+      jvop.showDialog(message, title, dt, messageType, null, buttonsText,
+              defaultButton, modal, buttons);
+    });
+
+    return jvop;
+  }
 }