X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FRestInputParamEditDialog.java;h=34d456fda95912084602535c3e3856cce92ddb09;hb=48e68905336d8ee17ee6b3903d80b36bac8c56cf;hp=764f9c9ff2ce94d12a623506cf1b4ed3260a3191;hpb=865a855a4ca87eadb3e5ff284ed32ed307d9c34b;p=jalview.git

diff --git a/src/jalview/gui/RestInputParamEditDialog.java b/src/jalview/gui/RestInputParamEditDialog.java
index 764f9c9..34d456f 100644
--- a/src/jalview/gui/RestInputParamEditDialog.java
+++ b/src/jalview/gui/RestInputParamEditDialog.java
@@ -1,19 +1,21 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
- * 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.
  * 
  * Jalview is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
  *  
  * Jalview is distributed in the hope that it will be useful, but 
  * WITHOUT ANY WARRANTY; without even the implied warranty 
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
  * PURPOSE.  See the GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
  * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.gui;
@@ -21,18 +23,16 @@ package jalview.gui;
 import java.util.ArrayList;
 import java.util.Hashtable;
 
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 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;
+import net.miginfocom.swing.MigLayout;
 
 public class RestInputParamEditDialog extends GRestInputParamEditDialog
         implements OptsParametersContainerI
@@ -48,11 +48,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;
@@ -72,13 +72,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;
 
     }
   };
@@ -101,18 +101,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();
   }
 
@@ -157,14 +158,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();
         }
@@ -184,8 +185,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);
@@ -211,8 +213,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();
       }
     }