JAL-4186 Turn JvOptionPane Callable<Void> handlers back into Runnable for jalviewjs...

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

diff --git a/src/jalview/gui/JvOptionPane.java b/src/jalview/gui/JvOptionPane.java
index 9b0d098..c0efd4a 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;
 
@@ -73,8 +72,7 @@ public class JvOptionPane extends JOptionPane
 
   private static boolean interactiveMode = true;
 
-  public static final Callable<Void> NULLCALLABLE = () -> {
-    return null;
+  public static final Runnable NULLCALLABLE = () -> {
   };
 
   private Component parentComponent;
@@ -83,7 +81,7 @@ public class JvOptionPane extends JOptionPane
 
   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);
@@ -860,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()
           {
@@ -889,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
@@ -985,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()
@@ -996,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);
@@ -1153,8 +1151,7 @@ public class JvOptionPane extends JOptionPane
    * }
    */
   @Override
-  public JvOptionPane setResponseHandler(Object response,
-          Callable<Void> action)
+  public JvOptionPane setResponseHandler(Object response, Runnable action)
   {
     if (action == null)
     {
@@ -1164,18 +1161,6 @@ public class JvOptionPane extends JOptionPane
     return this;
   }
 
-  public ExecutorService getExecutor()
-  {
-    if (executor == null)
-      executor = Executors.newCachedThreadPool();
-    return executor;
-  }
-
-  public void setExecutor(ExecutorService es)
-  {
-    executor = es;
-  }
-
   public void setDialog(JDialog d)
   {
     dialog = d;
@@ -1319,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)
       {
@@ -1403,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)
         {
@@ -1421,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);
@@ -1562,7 +1547,7 @@ public class JvOptionPane extends JOptionPane
 
   public static JvOptionPane frameDialog(Object message, String title,
           int messageType, String[] buttonsTextS, String defaultButtonS,
-          List<Callable<Void>> handlers, boolean modal)
+          List<Runnable> handlers, boolean modal)
   {
     JFrame parent = new JFrame();
     JvOptionPane jvop = JvOptionPane.newOptionDialog();
@@ -1620,10 +1605,10 @@ public class JvOptionPane extends JOptionPane
     }
 
     final int dt = dialogType;
-    jvop.getExecutor().execute(() -> {
+    new Thread(() -> {
       jvop.showDialog(message, title, dt, messageType, null, buttonsText,
               defaultButton, modal, buttons);
-    });
+    }).start();
 
     return jvop;
   }