Merge branch 'releases/Release_2_11_3_Branch'

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

diff --git a/src/jalview/gui/EditNameDialog.java b/src/jalview/gui/EditNameDialog.java
index d61177c..6d5cb46 100644 (file)
--- a/src/jalview/gui/EditNameDialog.java
+++ b/src/jalview/gui/EditNameDialog.java
@@ -22,9 +22,6 @@ package jalview.gui;
 
 import java.awt.FlowLayout;
 import java.awt.Font;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.Callable;
 
 import javax.swing.BoxLayout;
 import javax.swing.JButton;
@@ -114,25 +111,24 @@ public class EditNameDialog
    * 
    * @param action
    */
-  public void showDialog(JComponent parent, String title,
-          Callable<Void> action)
+  public void showDialog(JComponent parent, String title, Runnable action)
   {
     String ok = MessageManager.getString("action.ok");
     String cancel = MessageManager.getString("action.cancel");
     String[] options = new String[] { ok, cancel };
 
-    /*
     JvOptionPane.newOptionDialog(parent)
             .setResponseHandler(JvOptionPane.OK_OPTION, action)
             .showInternalDialog(panel, title, JvOptionPane.OK_CANCEL_OPTION,
                     JvOptionPane.PLAIN_MESSAGE, null, options, ok);
-            */
 
-    List<Callable<Void>> actions = new ArrayList<>();
+    /*
+    List<Runnable> actions = new ArrayList<>();
     actions.add(action);
     actions.add(JvOptionPane.NULLCALLABLE);
-
+    
     JvOptionPane.frameDialog(panel, title, JvOptionPane.PLAIN_MESSAGE,
             options, ok, actions, false);
+    */
   }
 }