X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FRestInputParamEditDialog.java;h=8ae5408bb86e32b5f4ba78a62d44e43f659198c3;hb=fa9da54fb97cb2eacb1af7859024d90166bddb8f;hp=508c55c97d909bb137744867eff66d96ccf6fc2d;hpb=47168f025aefdaa044802bd5f8f510ffe43a4808;p=jalview.git

diff --git a/src/jalview/gui/RestInputParamEditDialog.java b/src/jalview/gui/RestInputParamEditDialog.java
index 508c55c..8ae5408 100644
--- a/src/jalview/gui/RestInputParamEditDialog.java
+++ b/src/jalview/gui/RestInputParamEditDialog.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -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,11 +50,11 @@ public class RestInputParamEditDialog extends GRestInputParamEditDialog
     try
     {
       return (InputType) (typeclass.get(name).getConstructor()
-              .newInstance(null));
+              .newInstance());
     } catch (Throwable x)
     {
-      System.err
-              .println("Unexpected exception when instantiating rest input type.");
+      System.err.println(
+              "Unexpected exception when instantiating rest input type.");
       x.printStackTrace();
     }
     return null;
@@ -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;
 
     }
   };
@@ -103,18 +103,19 @@ public class RestInputParamEditDialog extends GRestInputParamEditDialog
   {
     okcancel.add(frame.cancel);
     okcancel.add(frame.ok);
-    frame.initDialogFrame(dpane, true, true, "Edit parameter for service "
-            + currentservice.getName(), 600, 800);
+    frame.initDialogFrame(dpane, true, true,
+            "Edit parameter for service " + 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();
   }
 
@@ -159,14 +160,14 @@ public class RestInputParamEditDialog extends GRestInputParamEditDialog
         newType.token = tok.getText().trim();
         try
         {
-          newType.configureFromArgumentI(opanps.get(
-                  newType.getURLtokenPrefix()).getCurrentSettings());
+          newType.configureFromArgumentI(opanps
+                  .get(newType.getURLtokenPrefix()).getCurrentSettings());
           current = newType;
           updated = true;
         } catch (InvalidArgumentException ex)
         {
-          System.err
-                  .println("IMPLEMENTATION ERROR: Invalid argument for type : "
+          System.err.println(
+                  "IMPLEMENTATION ERROR: Invalid argument for type : "
                           + typeList.getSelectedValue() + "\n");
           ex.printStackTrace();
         }
@@ -186,8 +187,9 @@ public class RestInputParamEditDialog extends GRestInputParamEditDialog
       try
       {
         JPanel inopts = new JPanel(new MigLayout());
-        ArrayList<JPanel> opts = new ArrayList<JPanel>(), prms = new ArrayList<JPanel>();
-        jtype = (InputType) (type.getConstructor().newInstance(null));
+        ArrayList<JPanel> opts = new ArrayList<JPanel>(),
+                prms = new ArrayList<JPanel>();
+        jtype = (InputType) (type.getConstructor().newInstance());
         typeclass.put(jtype.getURLtokenPrefix(), type);
         // and populate parameters from this type
         OptsAndParamsPage opanp = new OptsAndParamsPage(this, true);
@@ -213,8 +215,8 @@ public class RestInputParamEditDialog extends GRestInputParamEditDialog
         types.add(jtype.getURLtokenPrefix());
       } catch (Throwable x)
       {
-        System.err
-                .println("Unexpected exception when instantiating rest input type.");
+        System.err.println(
+                "Unexpected exception when instantiating rest input type.");
         x.printStackTrace();
       }
     }