JAL-629 Change all stdout and stderr output to use Console.outPrintln and Console...

[jalview.git] / src / jalview / gui / JvOptionPane.java

diff --git a/src/jalview/gui/JvOptionPane.java b/src/jalview/gui/JvOptionPane.java
index 3c942ce..b4c3256 100644 (file)
--- a/src/jalview/gui/JvOptionPane.java
+++ b/src/jalview/gui/JvOptionPane.java
@@ -41,7 +41,6 @@ import java.util.Arrays;
 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;
 
@@ -60,6 +59,7 @@ import javax.swing.event.InternalFrameListener;
 
 import jalview.bin.Console;
 import jalview.util.ChannelProperties;
+import jalview.util.MessageManager;
 import jalview.util.Platform;
 import jalview.util.dialogrunner.DialogRunnerI;
 
@@ -72,13 +72,16 @@ public class JvOptionPane extends JOptionPane
 
   private static boolean interactiveMode = true;
 
+  public static final Runnable NULLCALLABLE = () -> {
+  };
+
   private Component parentComponent;
 
   private ExecutorService executor = Executors.newCachedThreadPool();
 
   private JDialog dialog = null;
 
-  private Map<Object, Callable<Void>> callbacks = new HashMap<>();
+  private Map<Object, Runnable> callbacks = new HashMap<>();
 
   /*
    * JalviewJS reports user choice in the dialog as the selected option (text);
@@ -714,7 +717,7 @@ public class JvOptionPane extends JOptionPane
 
   private static void outputMessage(Object message)
   {
-    System.out.println(">>> JOption Message : " + message.toString());
+    jalview.bin.Console.outPrintln(">>> JOption Message : " + message.toString());
   }
 
   public static Object getMockResponse()
@@ -855,7 +858,7 @@ public class JvOptionPane extends JOptionPane
             initialValueButton = jb;
 
           int buttonAction = buttonActions[i];
-          Callable<Void> action = callbacks.get(buttonAction);
+          Runnable action = callbacks.get(buttonAction);
           jb.setText((String) o);
           jb.addActionListener(new ActionListener()
           {
@@ -884,7 +887,7 @@ public class JvOptionPane extends JOptionPane
               JOptionPane joptionpane = (JOptionPane) joptionpaneObject;
               joptionpane.setValue(buttonAction);
               if (action != null)
-                getExecutor().submit(action);
+                new Thread(action).start();
               joptionpane.transferFocusBackward();
               joptionpane.setVisible(false);
               // put focus and raise parent window if possible, unless cancel or
@@ -980,7 +983,7 @@ public class JvOptionPane extends JOptionPane
         {
           Object o = options[i];
           int buttonAction = buttonActions[i];
-          Callable<Void> action = callbacks.get(buttonAction);
+          Runnable action = callbacks.get(buttonAction);
           JButton jb = new JButton();
           jb.setText((String) o);
           jb.addActionListener(new ActionListener()
@@ -991,7 +994,7 @@ public class JvOptionPane extends JOptionPane
             {
               joptionpane.setValue(buttonAction);
               if (action != null)
-                getExecutor().submit(action);
+                new Thread(action).start();
               // joptionpane.transferFocusBackward();
               joptionpane.transferFocusBackward();
               joptionpane.setVisible(false);
@@ -1047,7 +1050,7 @@ public class JvOptionPane extends JOptionPane
     }
   }
 
-  public void showInternalDialog(JPanel mainPanel, String title,
+  public void showInternalDialog(Object mainPanel, String title,
           int yesNoCancelOption, int questionMessage, Icon icon,
           Object[] options, String initresponse)
   {
@@ -1065,10 +1068,12 @@ public class JvOptionPane extends JOptionPane
     this.setMessage(mainPanel);
 
     ourOptions = Arrays.asList(options);
-    int response;
-    if (parentComponent != this)
+    if (parentComponent != this
+            && !(parentComponent == null && Desktop.instance == null))
     {
-      JInternalFrame jif = this.createInternalFrame(parentComponent, title);
+      JInternalFrame jif = this.createInternalFrame(
+              parentComponent != null ? parentComponent : Desktop.instance,
+              title);
       jif.setFrameIcon(null);
       jif.addInternalFrameListener(new InternalFrameListener()
       {
@@ -1146,25 +1151,16 @@ public class JvOptionPane extends JOptionPane
    * }
    */
   @Override
-  public JvOptionPane setResponseHandler(Object response,
-          Callable<Void> action)
+  public JvOptionPane setResponseHandler(Object response, Runnable action)
   {
+    if (action == null)
+    {
+      action = NULLCALLABLE;
+    }
     callbacks.put(response, action);
     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;
@@ -1308,12 +1304,12 @@ public class JvOptionPane extends JOptionPane
     {
       return;
     }
-    Callable<Void> action = callbacks.get(response);
+    Runnable action = callbacks.get(response);
     if (action != null)
     {
       try
       {
-        getExecutor().submit(action).get();
+        new Thread(action).start();
         // action.call();
       } catch (Exception e)
       {
@@ -1392,7 +1388,7 @@ public class JvOptionPane extends JOptionPane
       {
         Object o = options[i];
         int buttonAction = buttonActions[i];
-        Callable<Void> action = callbacks.get(buttonAction);
+        Runnable action = callbacks.get(buttonAction);
         JButton jb;
         if (buttons != null && buttons.length > i && buttons[i] != null)
         {
@@ -1410,7 +1406,7 @@ public class JvOptionPane extends JOptionPane
           {
             joptionpane.setValue(buttonAction);
             if (action != null)
-              getExecutor().submit(action);
+              new Thread(action).start();
             // joptionpane.transferFocusBackward();
             joptionpane.transferFocusBackward();
             joptionpane.setVisible(false);
@@ -1549,12 +1545,25 @@ public class JvOptionPane extends JOptionPane
     }
   }
 
-  public static JvOptionPane frameDialog(String message, String title,
-          int messageType, String[] buttonsText, String defaultButton,
-          Callable<Void>[] handlers, boolean modal)
+  public static JvOptionPane frameDialog(Object message, String title,
+          int messageType, String[] buttonsTextS, String defaultButtonS,
+          List<Runnable> handlers, boolean modal)
   {
     JFrame parent = new JFrame();
     JvOptionPane jvop = JvOptionPane.newOptionDialog();
+    final String[] buttonsText;
+    final String defaultButton;
+    if (buttonsTextS == null)
+    {
+      String ok = MessageManager.getString("action.ok");
+      buttonsText = new String[] { ok };
+      defaultButton = ok;
+    }
+    else
+    {
+      buttonsText = buttonsTextS;
+      defaultButton = defaultButtonS;
+    }
     JButton[] buttons = new JButton[buttonsText.length];
     for (int i = 0; i < buttonsText.length; i++)
     {
@@ -1578,22 +1587,28 @@ public class JvOptionPane extends JOptionPane
     {
       dialogType = JOptionPane.YES_NO_CANCEL_OPTION;
     }
-    jvop.setResponseHandler(JOptionPane.YES_OPTION, handlers[0]);
+    jvop.setResponseHandler(JOptionPane.YES_OPTION,
+            (handlers != null && handlers.size() > 0) ? handlers.get(0)
+                    : NULLCALLABLE);
     if (dialogType == JOptionPane.YES_NO_OPTION
             || dialogType == JOptionPane.YES_NO_CANCEL_OPTION)
     {
-      jvop.setResponseHandler(JOptionPane.NO_OPTION, handlers[1]);
+      jvop.setResponseHandler(JOptionPane.NO_OPTION,
+              (handlers != null && handlers.size() > 1) ? handlers.get(1)
+                      : NULLCALLABLE);
     }
     if (dialogType == JOptionPane.YES_NO_CANCEL_OPTION)
     {
-      jvop.setResponseHandler(JOptionPane.CANCEL_OPTION, handlers[2]);
+      jvop.setResponseHandler(JOptionPane.CANCEL_OPTION,
+              (handlers != null && handlers.size() > 2) ? handlers.get(2)
+                      : NULLCALLABLE);
     }
 
     final int dt = dialogType;
-    jvop.getExecutor().execute(() -> {
+    new Thread(() -> {
       jvop.showDialog(message, title, dt, messageType, null, buttonsText,
               defaultButton, modal, buttons);
-    });
+    }).start();
 
     return jvop;
   }