X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FRestInputParamEditDialog.java;h=8ae5408bb86e32b5f4ba78a62d44e43f659198c3;hb=fa9da54fb97cb2eacb1af7859024d90166bddb8f;hp=497bbe2f23fe72dff986932b13341a4c16e93c36;hpb=b2f9a8d7bce642ff4011bc6d49e02bb0569fbb11;p=jalview.git
diff --git a/src/jalview/gui/RestInputParamEditDialog.java b/src/jalview/gui/RestInputParamEditDialog.java
index 497bbe2..8ae5408 100644
--- a/src/jalview/gui/RestInputParamEditDialog.java
+++ b/src/jalview/gui/RestInputParamEditDialog.java
@@ -1,23 +1,32 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1)
- * 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 .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
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;
@@ -27,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
{
@@ -48,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;
@@ -72,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;
}
};
@@ -101,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();
}
@@ -157,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();
}
@@ -184,8 +187,9 @@ public class RestInputParamEditDialog extends GRestInputParamEditDialog
try
{
JPanel inopts = new JPanel(new MigLayout());
- ArrayList opts = new ArrayList(), prms = new ArrayList();
- jtype = (InputType) (type.getConstructor().newInstance(null));
+ ArrayList opts = new ArrayList(),
+ prms = new ArrayList();
+ jtype = (InputType) (type.getConstructor().newInstance());
typeclass.put(jtype.getURLtokenPrefix(), type);
// and populate parameters from this type
OptsAndParamsPage opanp = new OptsAndParamsPage(this, true);
@@ -211,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();
}
}