JAL-2326 updated references of JOptionPane to JvOptionPane

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

diff --git a/src/jalview/gui/RestInputParamEditDialog.java b/src/jalview/gui/RestInputParamEditDialog.java
index 6078377..19a9b51 100644 (file)
--- a/src/jalview/gui/RestInputParamEditDialog.java
+++ b/src/jalview/gui/RestInputParamEditDialog.java
@@ -20,6 +20,13 @@
  */
 package jalview.gui;
 
+import jalview.jbgui.GRestInputParamEditDialog;
+import jalview.ws.params.InvalidArgumentException;
+import jalview.ws.params.OptionI;
+import jalview.ws.params.ParameterI;
+import jalview.ws.rest.InputType;
+import jalview.ws.rest.RestServiceDescription;
+
 import java.util.ArrayList;
 import java.util.Hashtable;
 
@@ -29,13 +36,6 @@ import javax.swing.event.ListSelectionEvent;
 
 import net.miginfocom.swing.MigLayout;
 
-import jalview.jbgui.GRestInputParamEditDialog;
-import jalview.ws.params.InvalidArgumentException;
-import jalview.ws.params.OptionI;
-import jalview.ws.params.ParameterI;
-import jalview.ws.rest.InputType;
-import jalview.ws.rest.RestServiceDescription;
-
 public class RestInputParamEditDialog extends GRestInputParamEditDialog
         implements OptsParametersContainerI
 {
@@ -50,7 +50,7 @@ public class RestInputParamEditDialog extends GRestInputParamEditDialog
     try
     {
       return (InputType) (typeclass.get(name).getConstructor()
-              .newInstance(null));
+              .newInstance());
     } catch (Throwable x)
     {
       System.err
@@ -74,13 +74,13 @@ public class RestInputParamEditDialog extends GRestInputParamEditDialog
     @Override
     protected void okPressed()
     {
-      reply = JOptionPane.OK_OPTION;
+      reply = JvOptionPane.OK_OPTION;
     }
 
     @Override
     protected void cancelPressed()
     {
-      reply = JOptionPane.CANCEL_OPTION;
+      reply = JvOptionPane.CANCEL_OPTION;
 
     }
   };
@@ -107,14 +107,14 @@ public class RestInputParamEditDialog extends GRestInputParamEditDialog
             + currentservice.getName(), 600, 800);
 
     initTypeLists();
-    reply = JOptionPane.CANCEL_OPTION;
+    reply = JvOptionPane.CANCEL_OPTION;
     old = toedit;
     current = null;
     if (old != null)
     {
       setStateFor(old);
     }
-    updated = updated && reply == JOptionPane.OK_OPTION;
+    updated = updated && reply == JvOptionPane.OK_OPTION;
     frame.validate();
   }
 
@@ -187,7 +187,7 @@ public class RestInputParamEditDialog extends GRestInputParamEditDialog
       {
         JPanel inopts = new JPanel(new MigLayout());
         ArrayList<JPanel> opts = new ArrayList<JPanel>(), prms = new ArrayList<JPanel>();
-        jtype = (InputType) (type.getConstructor().newInstance(null));
+        jtype = (InputType) (type.getConstructor().newInstance());
         typeclass.put(jtype.getURLtokenPrefix(), type);
         // and populate parameters from this type
         OptsAndParamsPage opanp = new OptsAndParamsPage(this, true);