Jalview.isJS() --> Platform.isJS(), DBRefEntry[] --> List<DBRefEntry>

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

diff --git a/src/jalview/gui/JvOptionPane.java b/src/jalview/gui/JvOptionPane.java
index b3df2f7..5bbe75f 100644 (file)
--- a/src/jalview/gui/JvOptionPane.java
+++ b/src/jalview/gui/JvOptionPane.java
@@ -21,17 +21,17 @@
 
 package jalview.gui;
 
-import jalview.bin.Jalview;
-import jalview.util.dialogrunner.DialogRunner;
+import jalview.util.Platform;
 import jalview.util.dialogrunner.DialogRunnerI;
-import jalview.util.dialogrunner.RunResponse;
 
 import java.awt.Component;
 import java.awt.HeadlessException;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.swing.Icon;
 import javax.swing.JOptionPane;
@@ -48,7 +48,7 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI,
 
   private Component parentComponent;
 
-  private DialogRunnerI runner = new DialogRunner();
+  private Map<Object, Runnable> callbacks = new HashMap<>();
 
   /*
    * JalviewJS reports user choice in the dialog as the selected
@@ -58,7 +58,7 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI,
   
   public JvOptionPane(final Component parent)
   {
-    this.parentComponent = Jalview.isJS() ? this : parent;
+    this.parentComponent = Platform.isJS() ? this : parent;
   }
 
   public static int showConfirmDialog(Component parentComponent,
@@ -720,7 +720,7 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI,
     String prefix = ""; 
     
     // JavaScript only
-    if (Jalview.isJS())
+    if (Platform.isJS())
     {
       switch (messageType)
       {
@@ -763,7 +763,7 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI,
 
     if (!isInteractiveMode())
     {
-      runner.handleResponse(getMockResponse());
+      handleResponse(getMockResponse());
     }
     // two uses:
     //
@@ -789,9 +789,9 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI,
      * In Java, the response is returned to this thread and handled here;
      * (for Javascript, see propertyChange)
      */
-    if (!Jalview.isJS())
+    if (!Platform.isJS())
     {
-      runner.handleResponse(response);
+      handleResponse(response);
     }
   }
 
@@ -801,7 +801,7 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI,
   {
     if (!isInteractiveMode())
     {
-      runner.handleResponse(getMockResponse());
+      handleResponse(getMockResponse());
     }
     
     ourOptions = Arrays.asList(options);
@@ -818,16 +818,16 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI,
               yesNoCancelOption, questionMessage, icon, options,
               initresponse);
     }
-    if (!Jalview.isJS())
+    if (!Platform.isJS())
     {
-      runner.handleResponse(response);
+      handleResponse(response);
     }
   }
     
   @Override
-  public JvOptionPane addResponse(Object response, RunResponse action)
+  public JvOptionPane setResponseHandler(Object response, Runnable action)
   {
-    runner.addResponse(response, action);
+       callbacks.put(response,  action);
     return this;
   }
 
@@ -845,12 +845,29 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI,
        int ourOption = ourOptions.indexOf(newValue);
     if (ourOption >= 0)
     {
-      runner.handleResponse(ourOption);
+      handleResponse(ourOption);
     }
     else
     {
       // try our luck..
-      runner.handleResponse(newValue);
+      handleResponse(newValue);
+    }
+  }
+
+  @Override
+  public void handleResponse(Object response)
+  {
+    /*
+        * this test is for NaN in Chrome
+        */
+    if (response != null && !response.equals(response))
+    {
+      return;
+    }
+    Runnable action = callbacks.get(response);
+    if (action != null)
+    {
+      action.run();
     }
   }
 }