X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fgui%2FWsJobParameters.java;h=8abbcee1a6b95c40e10d9d97d5014a40cd18d5f3;hb=d83db1c05bf39e076ce0cd53635bedf7e89afed1;hp=36266d1296bb7908347c0db123f3636caf363ae4;hpb=90a1b20c1297ec0d7fc596f89f6323a4b1bc7083;p=jalview.git
diff --git a/src/jalview/gui/WsJobParameters.java b/src/jalview/gui/WsJobParameters.java
index 36266d1..8abbcee 100644
--- a/src/jalview/gui/WsJobParameters.java
+++ b/src/jalview/gui/WsJobParameters.java
@@ -1,57 +1,72 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
+ * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ *
+ * 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.
+ *
+ * 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 .
+ */
package jalview.gui;
+import jalview.gui.OptsAndParamsPage.OptionBox;
+import jalview.gui.OptsAndParamsPage.ParamBox;
+import jalview.ws.jws2.JabaParamStore;
+import jalview.ws.jws2.JabaPreset;
+import jalview.ws.jws2.Jws2Discoverer;
+import jalview.ws.jws2.jabaws2.Jws2Instance;
+import jalview.ws.params.ArgumentI;
+import jalview.ws.params.OptionI;
+import jalview.ws.params.ParamDatastoreI;
+import jalview.ws.params.ParameterI;
+import jalview.ws.params.WsParamSetI;
+
import java.awt.BorderLayout;
-import java.awt.Color;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Font;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
import java.awt.GridLayout;
import java.awt.Rectangle;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.awt.event.ComponentEvent;
-import java.awt.event.ComponentListener;
-import java.awt.event.ContainerEvent;
-import java.awt.event.ContainerListener;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
+import java.awt.event.HierarchyBoundsListener;
+import java.awt.event.HierarchyEvent;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
import java.awt.event.WindowEvent;
import java.awt.event.WindowListener;
-import java.awt.event.WindowStateListener;
-import java.util.ArrayList;
-import java.util.EventObject;
-import java.util.HashSet;
+import java.net.URL;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import java.util.Vector;
import javax.swing.JButton;
-import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JDialog;
import javax.swing.JFrame;
import javax.swing.JLabel;
-import javax.swing.JList;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
-import javax.swing.JSlider;
-import javax.swing.JTable;
+import javax.swing.JSplitPane;
import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.ListSelectionModel;
-import javax.swing.SwingConstants;
-import javax.swing.SwingUtilities;
import javax.swing.border.TitledBorder;
-import javax.swing.event.CellEditorListener;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import javax.swing.table.*;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+
+import net.miginfocom.swing.MigLayout;
import compbio.metadata.Argument;
import compbio.metadata.Option;
@@ -59,67 +74,91 @@ import compbio.metadata.Parameter;
import compbio.metadata.Preset;
import compbio.metadata.PresetManager;
import compbio.metadata.RunnerConfig;
-import compbio.metadata.ValueConstrain;
-import compbio.metadata.WrongParameterException;
-import compbio.metadata.ValueConstrain.Type;
-
-import jalview.ws.jws2.Jws2Discoverer;
-import jalview.ws.jws2.Jws2Discoverer.Jws2Instance;
-public class WsJobParameters extends JPanel
+/**
+ * job parameter editing/browsing dialog box. User can browse existing settings
+ * (user + presets + Defaults), and any changes to parameters creates a modified
+ * user parameter set. LOGIC: If the parameter set is modified, and its name is
+ * a valid, non-existant user parameter set, then a save button is shown. If the
+ * parameter set is modified and its name is a valid, extant user parameter set,
+ * then an update button is shown. If user parameter set's name is edited, and
+ * old name exists as a writable user parameter set, then rename button is
+ * shown. If current parameter set is associated with a user defined parameter
+ * set, then : if set is modifed, a 'revert' button is shown. if set is not
+ * modified, a 'delete' button is shown.
+ *
+ * @author JimP
+ *
+ */
+public class WsJobParameters extends JPanel implements ItemListener,
+ ActionListener, DocumentListener, OptsParametersContainerI
{
- private static final int PARAM_WIDTH = 340, PARAM_HEIGHT = 120;
+ URL linkImageURL = getClass().getResource("/images/link.gif");
- JPanel setDetails = new JPanel();
+ private static final String SVC_DEF = "Defaults"; // this is the null
+ // parameter set as shown to
+ // user
- JPanel settingsPanel = new JPanel();
+ /**
+ * manager for options and parameters.
+ */
+ OptsAndParamsPage opanp = new OptsAndParamsPage(this);
+ /**
+ * panel containing job options
+ */
JPanel jobOptions = new JPanel();
- JPanel jobParameters = new JPanel();
+ /**
+ * panel containing job parameters
+ */
+ JPanel paramList = new JPanel();
- JPanel paramButtons = new JPanel();
+ JPanel SetNamePanel = new JPanel();
- JPanel paramPanel = new JPanel();
- JLabel modified = new JLabel();
- JButton startjob = new JButton();
- JButton canceljob = new JButton();
+ JPanel setDetails = new JPanel();
+
+ JSplitPane settingsPanel = new JSplitPane();
- JButton exportParams = new JButton();
+ JPanel jobPanel = new JPanel();
- JButton importParams = new JButton();
+ JScrollPane jobOptionsPane = new JScrollPane();
- JButton resetParams = new JButton();
+ JButton createpref = new JButton();
- JButton addParam = new JButton();
+ JButton deletepref = new JButton();
- JButton removeParam = new JButton();
+ JButton revertpref = new JButton();
- JButton editParam = new JButton();
+ JButton updatepref = new JButton();
- JLabel setName = new JLabel();
+ JButton startjob = new JButton();
+
+ JButton canceljob = new JButton();
+
+ JComboBox setName = new JComboBox();
JTextArea setDescr = new JTextArea();
JScrollPane paramPane = new JScrollPane();
- // JList paramList = new JList();
- JPanel paramList = new JPanel();
+ // ScrollablePanel optsAndparams = new ScrollablePanel();
+ JPanel optsAndparams = new JPanel();
RunnerConfig serviceOptions;
- List availableParameters;
+ ParamDatastoreI paramStore;
- private BorderLayout jparamLayout;
+ private int MAX_OPTWIDTH = 200;
WsJobParameters(Jws2Instance service)
{
this(service, null);
}
- public WsJobParameters(Jws2Instance service, Preset p)
+ public WsJobParameters(Jws2Instance service, WsParamSetI preset)
{
- this(null, service, p, null);
+ this(null, service, preset, null);
}
/**
@@ -127,670 +166,754 @@ public class WsJobParameters extends JPanel
* @param desktop
* - if null, create new JFrame outside of desktop
* @param service
- * @param p
+ * @param preset
+ */
+ public WsJobParameters(JFrame parent, Jws2Instance service,
+ WsParamSetI preset, List jobArgset)
+ {
+ this(parent, null, service, preset, jobArgset);
+ }
+
+ /**
+ *
+ * @param parent
+ * @param paramStorei
+ * @param service
+ * @param preset
+ * @param jobArgset
*/
- public WsJobParameters(JFrame parent, Jws2Instance service, Preset p,
- List jobArgset)
+ public WsJobParameters(JFrame parent, ParamDatastoreI paramStorei,
+ Jws2Instance service, WsParamSetI preset, List jobArgset)
{
super();
jbInit();
- argSetModified(false);
+ this.paramStore = paramStorei;
+ if (paramStore == null)
+ {
+ paramStore = service.getParamStore();
+ }
+ this.service = service;
+ // argSetModified(false);
// populate parameter table
- initForService(service, p, jobArgset);
+ initForService(service, preset, jobArgset);
// display in new JFrame attached to parent.
validate();
}
- int response=-1;
- JDialog frame=null;
- public boolean showRunDialog() {
-
- frame = new JDialog(
- Desktop.instance, true);
-
- frame.setTitle("Edit parameters for "+service.getActionText());
+
+ int response = -1;
+
+ JDialog frame = null;
+
+ /**
+ * shows a modal dialog containing the parameters.
+ *
+ * @return
+ */
+ public boolean showRunDialog()
+ {
+
+ frame = new JDialog(Desktop.instance, true);
+
+ frame.setTitle("Edit parameters for " + service.getActionText());
Rectangle deskr = Desktop.instance.getBounds();
- frame.setBounds(new Rectangle((int) (deskr.getCenterX() - 240),
- (int) (deskr.getCenterY() - 92), 380, 385));
+ Dimension pref = this.getPreferredSize();
+ frame.setBounds(new Rectangle(
+ (int) (deskr.getCenterX() - pref.width / 2), (int) (deskr
+ .getCenterY() - pref.height / 2), pref.width,
+ pref.height));
frame.setContentPane(this);
+ // should perhaps recover defaults from user prefs.
+
+ frame.validate();
+ javax.swing.SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ // jobPanel.setDividerLocation(0.25);
+
+ }
+ });
frame.setVisible(true);
-
- if (response>0)
+
+ if (response > 0)
{
return true;
}
return false;
}
-
+
private void jbInit()
{
- modified.setText("Job Options Modified");
- modified.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
- modified.setForeground(Color.red);
- modified.setHorizontalAlignment(SwingConstants.CENTER);
-
- exportParams.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
- exportParams.setText("Export");
- exportParams.setToolTipText("Export parameters to a file");
- exportParams.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent e)
- {
- exportParams_actionPerformed(e);
- }
- });
- importParams.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
- importParams.setText("Import");
- importParams.setToolTipText("Import parameters from a file");
- importParams.addActionListener(new ActionListener()
+ this.addHierarchyBoundsListener(new HierarchyBoundsListener()
{
- public void actionPerformed(ActionEvent e)
- {
- importParams_actionPerformed(e);
- }
- });
- resetParams.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
- resetParams.setText("Defaults");
- resetParams.setToolTipText("Reset to defaults");
- resetParams.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent e)
- {
- resetParams_actionPerformed(e);
- }
- });
- addParam.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
- addParam.setText("Add");
- addParam.setToolTipText("Add new parameter");
- addParam.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent e)
- {
- addParam_actionPerformed(e);
- }
- });
- removeParam.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
- removeParam.setText("Remove");
- removeParam.setToolTipText("Remove selected parameter");
- removeParam.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent e)
- {
- removeParam_actionPerformed(e);
- }
- });
- editParam.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
- editParam.setText("Edit");
- editParam.setToolTipText("Edit selected parameter");
- editParam.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent e)
- {
- editParam_actionPerformed(e);
- }
- });
- startjob.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
- startjob.setText("Start");
- startjob.setToolTipText("Start Job");
- startjob.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent e)
+
+ @Override
+ public void ancestorResized(HierarchyEvent arg0)
{
- startjob_actionPerformed(e);
+ refreshParamLayout();
}
- });
- canceljob.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
- canceljob.setText("Cancel");
- canceljob.setToolTipText("Cancel Job");
- canceljob.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent e)
+
+ @Override
+ public void ancestorMoved(HierarchyEvent arg0)
{
- canceljob_actionPerformed(e);
+ // TODO Auto-generated method stub
+
}
});
+ updatepref = JvSwingUtils.makeButton("Update",
+ "Update this existing user parameter set.",
+ new ActionListener()
+ {
+
+ public void actionPerformed(ActionEvent e)
+ {
+ update_actionPerformed(e);
+ }
+ });
+ deletepref = JvSwingUtils.makeButton("Delete",
+ "Delete the currently selected user parameter set.",
+ new ActionListener()
+ {
+
+ public void actionPerformed(ActionEvent e)
+ {
+ delete_actionPerformed(e);
+ }
+ });
+ createpref = JvSwingUtils.makeButton("Create",
+ "Create a new parameter set with the current settings.",
+ new ActionListener()
+ {
+
+ public void actionPerformed(ActionEvent e)
+ {
+ create_actionPerformed(e);
+ }
+ });
+ revertpref = JvSwingUtils.makeButton("Revert",
+ "Undo all changes to the current parameter set",
+ new ActionListener()
+ {
+
+ public void actionPerformed(ActionEvent e)
+ {
+ revert_actionPerformed(e);
+ }
+ });
+ startjob = JvSwingUtils.makeButton("Start Job",
+ "Start Job with current settings.", new ActionListener()
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ startjob_actionPerformed(e);
+ }
+ });
+ canceljob = JvSwingUtils.makeButton("Cancel Job",
+ "Close this dialog and cancel job.", new ActionListener()
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ canceljob_actionPerformed(e);
+ }
+ });
setDetails.setBorder(new TitledBorder("Details"));
- setDetails.setLayout(new GridLayout(2, 1));
+ setDetails.setLayout(new BorderLayout());
setDescr.setColumns(40);
setDescr.setWrapStyleWord(true);
setDescr.setLineWrap(true);
- setDescr.setPreferredSize(new Dimension(350, 90));
setDescr.setBackground(getBackground());
- setDescr.setEditable(false);
- setDetails.add(setName);
- setDetails.add(setDescr);
- setDetails.setPreferredSize(new Dimension(360, 100));
- settingsPanel.setLayout(new BorderLayout());
+ setDescr.setEditable(true);
+ setDescr.getDocument().addDocumentListener(this);
+ setDescr.setToolTipText("Click to edit the notes for this parameter set.");
+ JScrollPane setDescrView = new JScrollPane();
+ // setDescrView.setPreferredSize(new Dimension(350, 200));
+ setDescrView.getViewport().setView(setDescr);
+ setName.setEditable(true);
+ setName.addItemListener(this);
+ setName.getEditor().addActionListener(this);
+ JPanel setNameInfo = new JPanel(new FlowLayout(FlowLayout.LEFT));
+ GridBagLayout gbl = new GridBagLayout();
+ SetNamePanel.setLayout(gbl);
+
+ JLabel setNameLabel = new JLabel("Current parameter set name :");
+ setNameLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
+
+ setNameInfo.add(setNameLabel);
+ setNameInfo.add(setName);
+
+ // initial button visibility
+ updatepref.setVisible(false);
+ deletepref.setVisible(false);
+ revertpref.setVisible(false);
+ createpref.setVisible(false);
+ JPanel setsavebuts = new JPanel();
+ setsavebuts.setLayout(new FlowLayout(FlowLayout.LEFT)); // GridLayout(1,2));
+ ((FlowLayout) setsavebuts.getLayout()).setHgap(10);
+ ((FlowLayout) setsavebuts.getLayout()).setVgap(0);
+ JPanel spacer = new JPanel();
+ spacer.setPreferredSize(new Dimension(2, 30));
+ setsavebuts.add(spacer);
+ setsavebuts.add(deletepref);
+ setsavebuts.add(revertpref);
+ setsavebuts.add(createpref);
+ setsavebuts.add(updatepref);
+ // setsavebuts.setSize(new Dimension(150, 30));
+ JPanel buttonArea = new JPanel(new GridLayout(1, 1));
+ buttonArea.add(setsavebuts);
+ SetNamePanel.add(setNameInfo);
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.gridheight = 2;
+ gbl.setConstraints(setNameInfo, gbc);
+ SetNamePanel.add(buttonArea);
+ gbc = new GridBagConstraints();
+ gbc.gridx = 0;
+ gbc.gridy = 2;
+ gbc.gridheight = 1;
+ gbl.setConstraints(buttonArea, gbc);
+ setDetails.add(setDescrView, BorderLayout.CENTER);
+
+ // paramPane.setPreferredSize(new Dimension(360, 400));
+ // paramPane.setPreferredSize(null);
jobOptions.setBorder(new TitledBorder("Options"));
- jobParameters.setBorder(new TitledBorder("Parameters"));
- jobParameters.setLayout(jparamLayout = new BorderLayout());
- paramPane.setPreferredSize(new Dimension(360, 300));
- paramPane.getVerticalScrollBar().setUnitIncrement(20);
- // paramPanel.setPreferredSize(new Dimension(360, 300));
- paramButtons.setLayout(new GridLayout(2, 3));
- paramButtons.add(addParam);
- paramButtons.add(editParam);
- paramButtons.add(removeParam);
- // TODO: relayout buttons nicely
- paramButtons.add(exportParams);
- paramButtons.add(importParams);
- paramButtons.add(resetParams);
- paramPane.getViewport().setView(paramList);
- jobParameters.add(paramPane, BorderLayout.NORTH);
- //jobParameters.add(paramButtons, BorderLayout.SOUTH);
- settingsPanel.add(modified, BorderLayout.NORTH);
- settingsPanel.add(jobOptions, BorderLayout.CENTER);
- settingsPanel.add(jobParameters, BorderLayout.SOUTH);
-
+ jobOptions.setOpaque(true);
+ paramList.setBorder(new TitledBorder("Parameters"));
+ paramList.setOpaque(true);
+ JPanel bjo = new JPanel(new BorderLayout()), bjp = new JPanel(
+ new BorderLayout());
+ bjo.add(jobOptions, BorderLayout.CENTER);
+ bjp.add(paramList, BorderLayout.CENTER);
+ bjp.setOpaque(true);
+ bjo.setOpaque(true);
+ // optsAndparams.setScrollableWidth(ScrollableSizeHint.FIT);
+ // optsAndparams.setScrollableHeight(ScrollableSizeHint.NONE);
+ // optsAndparams.setLayout(new BorderLayout());
+ optsAndparams.setLayout(new BorderLayout());
+ optsAndparams.add(jobOptions, BorderLayout.NORTH);
+ optsAndparams.add(paramList, BorderLayout.CENTER);
+ JPanel jp = new JPanel(new BorderLayout());
+ jp.add(optsAndparams, BorderLayout.CENTER);
+ paramPane.getViewport().setView(jp);
+ paramPane.setBorder(null);
setLayout(new BorderLayout());
- // setPreferredSize(new Dimension(400, 600));
- // setSize(new Dimension(400, 600));
- add(setDetails, BorderLayout.NORTH);
- add(settingsPanel, BorderLayout.CENTER);
+ jobPanel.setPreferredSize(null);
+ jobPanel.setLayout(new BorderLayout());
+ jobPanel.add(setDetails, BorderLayout.NORTH);
+ jobPanel.add(paramPane, BorderLayout.CENTER);
+ // jobPanel.setOrientation(JSplitPane.VERTICAL_SPLIT);
+
+ add(SetNamePanel, BorderLayout.NORTH);
+ add(jobPanel, BorderLayout.CENTER);
+
JPanel dialogpanel = new JPanel();
dialogpanel.add(startjob);
dialogpanel.add(canceljob);
add(dialogpanel, BorderLayout.SOUTH);
+ validate();
}
- protected void canceljob_actionPerformed(ActionEvent e)
+ protected void revert_actionPerformed(ActionEvent e)
{
- response=0;
- if (frame!=null) {
- frame.setVisible(false);
- }
+ reInitDialog(lastParmSet);
+
}
- protected void startjob_actionPerformed(ActionEvent e)
+ protected void update_actionPerformed(ActionEvent e)
{
- response=1;
- if (frame!=null) {
- frame.setVisible(false);
+ if (isUserPreset)
+ {
+ String curname = ((String) setName.getSelectedItem()).trim();
+ _updatePreset(lastParmSet, curname);
+ lastParmSet = curname;
+ isUserPreset = true;
+ initArgSetModified();
+ syncSetNamesWithStore();
}
}
- protected void editParam_actionPerformed(ActionEvent e)
+ private void _deleteUserPreset(String lastParmSet2)
{
- // TODO Auto-generated method stub
-
+ paramStore.deletePreset(lastParmSet2);
}
- protected void removeParam_actionPerformed(ActionEvent e)
+ protected void delete_actionPerformed(ActionEvent e)
{
- // TODO Auto-generated method stub
-
+ if (isUserPreset)
+ {
+ // delete current preset's saved entry
+ _deleteUserPreset(lastParmSet);
+ }
+ reInitDialog(null); // service default
}
- protected void addParam_actionPerformed(ActionEvent e)
+ protected void create_actionPerformed(ActionEvent e)
{
- // TODO Auto-generated method stub
-
+ String curname = ((String) setName.getSelectedItem()).trim();
+ if (curname.length() > 0)
+ {
+ _storeCurrentPreset(curname);
+ lastParmSet = curname;
+ isUserPreset = true;
+ initArgSetModified();
+ }
+ else
+ {
+ // TODO: show warning
+ System.err.println("Invalid name. Not saved.");
+ }
}
- protected void resetParams_actionPerformed(ActionEvent e)
+ protected void canceljob_actionPerformed(ActionEvent e)
{
- // TODO Auto-generated method stub
-
+ response = 0;
+ if (frame != null)
+ {
+ frame.setVisible(false);
+ }
}
- protected void importParams_actionPerformed(ActionEvent e)
+ protected void startjob_actionPerformed(ActionEvent e)
{
- // TODO Auto-generated method stub
-
+ response = 1;
+ if (frame != null)
+ {
+ frame.setVisible(false);
+ }
}
- protected void exportParams_actionPerformed(ActionEvent e)
- {
- // TODO Auto-generated method stub
+ Jws2Instance service;
- }
+ /**
+ * list of service presets in the gui
+ */
+ Hashtable servicePresets = null;
- Jws2Instance service;
- void initForService(Jws2Instance service, Preset p,
- List jobArgset)
+ /**
+ * set if dialog is being set - so handlers will avoid spurious events
+ */
+ boolean settingDialog = false;
+
+ void initForService(Jws2Instance service, WsParamSetI jabap,
+ List jabajobArgset)
{
- this.service=service;
- serviceOptions = service.getRunnerConfig();
- updateTable(p, jobArgset);
+ WsParamSetI p = null;
+ List jobArgset = null;
+ settingDialog = true;
+ { // instantiate the abstract proxy for Jaba objects
+ jobArgset = jabajobArgset == null ? null : JabaParamStore
+ .getJwsArgsfromJaba(jabajobArgset);
+ p = jabap; // (jabap != null) ? paramStore.getPreset(jabap.getName()) :
+ // null;
+ }
+
+ Hashtable exnames = new Hashtable();
+ for (int i = 0, iSize = setName.getItemCount(); i < iSize; i++)
+ {
+ exnames.put((String) setName.getItemAt(i), setName.getItemAt(i));
+ }
+ servicePresets = new Hashtable();
+ // Add the default entry - if not present already.
+ if (!exnames.contains(SVC_DEF))
+ {
+ setName.addItem(SVC_DEF);
+ exnames.put(SVC_DEF, SVC_DEF);
+ servicePresets.put(SVC_DEF, SVC_DEF);
+ }
+ String curname = (p == null ? "" : p.getName());
+ for (WsParamSetI pr : paramStore.getPresets())
+ {
+ if (!pr.isModifiable())
+ {
+ servicePresets.put(pr.getName(), "preset");
+ }
+ else
+ {
+ }
+ if (!exnames.contains(pr.getName()))
+ {
+ setName.addItem(pr.getName());
+ }
+ }
+ // TODO: if initial jobArgset matches a given user setting or preset then
+ // should recover setting accordingly
+ // updateTable(p, jobArgset);
+ if (p != null)
+ {
+ reInitDialog(p.getName());
+ initArgSetModified();
+ }
+ else
+ {
+ if (jobArgset != null && jobArgset.size() > 0)
+ {
+ curSetName = "Supplied Settings";
+ isUserPreset = false;
+ updateTable(p, jobArgset);
+ setName.setSelectedItem(curSetName);
+ updateButtonDisplay();
+ }
+ else
+ {
+ curSetName = null;
+ reInitDialog(null);
+ }
+ }
+ settingDialog = false;
+
}
@SuppressWarnings("unchecked")
- private void updateTable(Preset p, List jobArgset)
+ private void updateTable(WsParamSetI p, List jobArgset)
{
- availableParameters = new ArrayList();
- List setargs = new ArrayList();
// populate table from default parameter set.
- List args = serviceOptions.getArguments();
+ List args = paramStore.getServiceParameters();
// split to params and required arguments
{
- for (Argument arg : args)
+ int cw = 0;
+ for (ArgumentI myarg : args)
{
- Argument myarg = (Argument) arg;
// Ideally, Argument would implement isRequired !
- if (myarg instanceof Parameter)
+ if (myarg instanceof ParameterI)
{
- Parameter parm = (Parameter) myarg;
- if (true) // parm.isRequired())
- {
- addParameter(parm);
- }
- else
- {
- availableParameters.add(parm);
- }
+ ParameterI parm = (ParameterI) myarg;
+ opanp.addParameter(parm).validate();
}
else
{
- if (myarg instanceof Option)
+ if (myarg instanceof OptionI)
{
- Option opt = (Option) myarg;
- addOption(opt);
- if (opt.isRequired())
+ OptionI opt = (OptionI) myarg;
+ OptionBox ob = opanp.addOption(opt);
+ ob.resetToDefault();
+ if (MAX_OPTWIDTH < ob.getPreferredSize().width)
{
- selectOption(opt, opt.getDefaultValue());
+ MAX_OPTWIDTH = ob.getPreferredSize().width;
}
+ ob.validate();
+ cw += ob.getPreferredSize().width + 5;
}
else
{
System.err.println("Ignoring unknown service argument type "
- + arg.getClass().getName());
+ + myarg.getClass().getName());
}
}
}
- args=null; // no more args to process.
+ args = null; // no more args to process.
}
if (p != null)
{
- setDescr.setText(p.getDescription());
- setName.setText(p.getName());
- setDetails.setVisible(true);
+ isUserPreset = false;
+ // initialise setname
+ setName.setSelectedItem(lastSetName = p.getName());
+ setDescr.setText(lastDescrText = p.getDescription());
// TODO - URL link
try
{
- args = p.getArguments(serviceOptions);
+ args = p.getArguments();
} catch (Exception e)
{
e.printStackTrace();
}
- // TODO: check if args should be unselected prior to resetting using the preset
- setargs.clear();
- } else {
- setDetails.setVisible(false);
+ // TODO: check if args should be unselected prior to resetting using the
+ // preset
}
+ else
+ {
+ if (lastParmSet == null)
+ {
+ isUserPreset = false;
+ // first call - so create a dummy name
+
+ setName.setSelectedItem(lastSetName = SVC_DEF);
+ }
+ }
+
if (jobArgset != null)
{
- argSetModified(true);
+ argSetModified(jobArgset, true);
args = jobArgset;
}
// get setargs from current object
if (args != null)
{
- for (Argument arg : args)
+ for (ArgumentI arg : args)
{
- if (arg instanceof Parameter)
+ if (arg instanceof ParameterI)
{
- setargs.add((Parameter) arg);
+ opanp.setParameter((ParameterI) arg);
}
else
{
- if (arg instanceof Option)
+ if (arg instanceof OptionI)
{
- selectOption((Option) arg, arg.getDefaultValue());
+ // System.out.println("Setting option "
+ // + System.identityHashCode(arg) + ":" + arg.getName()
+ // + " with " + arg.getDefaultValue());
+ opanp.selectOption((OptionI) arg, arg.getValue());
}
}
}
}
- // mdl.setData(setargs);
- // jobOptions.setLayout(new GridLayout(optSet.size() / 2 + 1, 2));
- jobOptions.setLayout(new GridLayout(optSet.size(), 1));
- // paramPanel.setLayout(new GridLayout(paramSet.size(), 1));
- // paramList.va
- // paramPane.getViewport().validate();
- paramList.setPreferredSize(new Dimension(350, paramSet.size()
- * PARAM_HEIGHT));
- paramList.setLayout(new GridLayout(paramSet.size(), 1));
- paramList.validate();
- paramPane.validate();
- validate();
+ refreshParamLayout();
+ revalidate();
}
- private void argSetModified(boolean b)
+ private boolean isModified()
{
-
- modified.setVisible(b);
- if (isVisible())
- {
- validate();
- }
-
+ return modifiedElements.size() > 0;
+ }
+
+ private Hashtable modifiedElements = new Hashtable();
+
+ /**
+ * reset gui and modification state settings
+ */
+ private void initArgSetModified()
+ {
+ curSetName = null;
+ modifiedElements.clear();
+ updateButtonDisplay();
}
- private void addParameter(Parameter parm)
+ private void updateButtonDisplay()
{
- ParamBox pb = paramSet.get(parm.getName());
- if (pb == null)
+ boolean _update = false, _create = false, _delete = false, _revert = false;
+ if (modifiedElements.size() > 0)
+ {
+ // set modified
+ _revert = true;
+ _update = isUserPreset; // can only update user presets
+ if (!isUserPreset || modifiedElements.containsKey(setName))
+ {
+ // name modified - can create new preset
+ _create = true;
+ }
+ }
+ else
{
- pb = new ParamBox(parm);
- paramSet.put(parm.getName(), pb);
- paramList.add(pb);
+ // set unmodified
}
+ // can still delete a user preset
+ _delete = isUserPreset;
+
+ createpref.setVisible(_create);
+ updatepref.setVisible(_update);
+ deletepref.setVisible(_delete);
+ revertpref.setVisible(_revert);
+ validate();
}
- private void selectOption(Option opt, String string)
+ public void argSetModified(Object modifiedElement, boolean b)
{
- OptionBox cb = optSet.get(opt.getName());
- if (cb == null)
+ if (settingDialog)
{
- cb = addOption(opt);
+ return;
}
- if (string == null)
+ if (!b)
{
- // no value specified.
- if (opt.isRequired())
- {
- // indicate option needs to be selected!
- }
- else
- {
- cb.enabled.setSelected(false);
- }
+ modifiedElements.remove(modifiedElement);
}
else
{
- cb.enabled.setSelected(true);
-
- if (opt.getPossibleValues().contains(string))
- {
- cb.val.setSelectedItem(string);
- }
- else
+ if (b && modifiedElement == setName
+ && modifiedElements.contains(modifiedElement))
{
- throw new Error("Invalid value " + string + " for option " + opt);
+ // HACK! prevents iteration on makeSetNameValid
+ b = false;
}
-
+ modifiedElements.put(modifiedElement, modifiedElement);
+ }
+ // set mod status based on presence of elements in table
+ if (b && modifiedElements.size() > 0)
+ {
+ makeSetNameValid(!isUserPreset);
+ SetNamePanel.revalidate();
}
+ updateButtonDisplay();
}
- Map paramSet = new Hashtable();
-
- public class ParamBox extends JPanel implements ChangeListener,
- ActionListener
+ private boolean isServicePreset(String selectedItem)
{
- JLabel name = new JLabel();
-
- JTextArea string = new JTextArea();
- JScrollPane descPanel = new JScrollPane();
- JSlider slider = null;
-
- JTextField valueField = null;
-
- ValueConstrain validator = null;
+ return selectedItem.equals(SVC_DEF)
+ || servicePresets.containsKey(selectedItem);
+ }
- boolean integ = false;
- boolean choice=false;
- public ParamBox(Parameter parm)
+ /**
+ * check if the current set name is a valid set name for saving, if not, then
+ * fix it.
+ */
+ private void makeSetNameValid(boolean newuserset)
+ {
+ boolean stn = settingDialog;
+ boolean renamed = false;
+ settingDialog = true;
+ String nm = (curSetName != null ? curSetName : (String) setName
+ .getSelectedItem());
+ // check if the name is reserved - if it is, rename it.
+ if (isServicePreset(nm))
+ {
+ nm = "User " + nm;
+ renamed = true;
+ }
+ String tnm = nm;
+ if (newuserset)
{
- setLayout(new FlowLayout());
- setBorder(new TitledBorder(parm.getName()));
- setPreferredSize(new Dimension(PARAM_WIDTH, PARAM_HEIGHT));
- string.setFont(new Font("Verdana", Font.PLAIN, 11));
- string.setBackground(getBackground());
- //string.setSize(new Dimension(PARAM_WIDTH, 80));
- string.setEditable(false);
- descPanel.setPreferredSize(new Dimension(PARAM_WIDTH, 70));
- descPanel.getViewport().setView(string);
- // string.setMinimumSize(new Dimension(140,80));
- // string.setMaximumSize(new Dimension(280,80));
- string.setWrapStyleWord(true);
- string.setLineWrap(true);
- string.setColumns(40);
- string.setText(parm.getDescription());
- descPanel.validate();
- // name.setToolTipText(parm.getDescription());
- add(descPanel); // , BorderLayout.NORTH);
- validator = parm.getValidValue();
- parameter=parm;
- if (validator != null)
+ int i = 0;
+ while (paramStore.getPreset(tnm) != null)
{
- integ = validator.getType() == Type.Integer;
- } else {
- if (parameter.getPossibleValues()!=null)
- {
- choice=true;
- }
+ tnm = nm + " (" + (++i) + ")";
+ renamed = true;
+ }
+ if (i > 0)
+ {
+ nm = tnm;
}
- updateControls(parm);
}
- boolean adjusting = false;
- Parameter parameter;
- JComboBox choicebox;
- public void updateControls(Parameter parm)
+ boolean makeupdate = false;
+ // sync the gui with the preset database
+ for (int i = 0, iS = setName.getItemCount(); i < iS; i++)
{
- adjusting = true;
- boolean init = valueField == null;
- float fVal = 0f;
- int iVal = 0;
- if (init)
+ String snm = (String) setName.getItemAt(i);
+ if (snm.equals(nm))
{
- if (choice)
- {
- choicebox = new JComboBox();
- choicebox.addActionListener(this);
- add(choicebox);
- } else {
- slider = new JSlider();
- slider.addChangeListener(this);
- valueField = new JTextField();
- valueField.addActionListener(this);
- valueField.setPreferredSize(new Dimension(80, 25));
- JPanel container = new JPanel();
- // container.setLayout(new FlowLayout());
- add(slider);// , BorderLayout.SOUTH);
- add(valueField);// ,BorderLayout.CENTER);
- // add(container, BorderLayout.EAST);
- // container.validate();
-
- }}
-
- if (parm != null)
- {
- if (choice) {
- List vals = parm.getPossibleValues();
- for (Object val: vals)
- {
- choicebox.addItem(val);
- }
- if (parm.getDefaultValue()!=null) {
- choicebox.setSelectedItem(parm.getDefaultValue());
- }
- } else {
- valueField.setText(parm.getDefaultValue());
- }
+ makeupdate = true;
+ // setName.setSelectedIndex(i);
}
- updateSliderFromValueField();
- adjusting = false;
}
- public Parameter getParameter() {
- try {
- if (choice)
- {
- parameter.setDefaultValue((String)choicebox.getSelectedItem());
- }
- else {
- parameter.setDefaultValue(valueField.getText());
- }
- } catch (WrongParameterException e)
- {
- e.printStackTrace();
- return null;
- }
- return parameter;
+ if (!makeupdate)
+ {
+ setName.addItem(curSetName = nm);
+ setName.setSelectedItem(curSetName);
+ }
+ if (renamed)
+ {
+ settingDialog = false; // we need this name change to be registered.
+ argSetModified(setName, renamed);
}
- public Object updateSliderFromValueField()
+ settingDialog = stn;
+ }
+
+ public void refreshParamLayout()
+ {
+ // optsAndparams.setPreferredSize(null);
+ FlowLayout fl = new FlowLayout(FlowLayout.LEFT);
+ int sep = fl.getVgap();
+ boolean fh = true;
+ int os = 0, s = jobOptions.getBorder().getBorderInsets(jobOptions).bottom
+ + jobOptions.getBorder().getBorderInsets(jobOptions).top
+ + 2
+ * sep;
+ /**
+ * final height for viewport
+ */
+ int finalh = s;
+ int panewidth = paramPane.getViewport().getSize().width - 120
+ - jobOptions.getBorder().getBorderInsets(jobOptions).left
+ + jobOptions.getBorder().getBorderInsets(jobOptions).right;
+
+ int w = 2
+ * fl.getHgap()
+ + (MAX_OPTWIDTH > OptsAndParamsPage.PARAM_WIDTH ? MAX_OPTWIDTH
+ : OptsAndParamsPage.PARAM_WIDTH);
+ int hgap = fl.getHgap(), cw = hgap;
+
+ if (opanp.getOptSet().size() > 0)
{
- int iVal;
- float fVal;
- if (validator != null)
+
+ jobOptions.setLayout(new MigLayout("", "", ""));
+ jobOptions.removeAll();
+
+ for (OptionBox pbox : opanp.getOptSet().values())
{
- if (integ)
+ pbox.validate();
+ cw += pbox.getSize().width + hgap;
+ if (cw + 120 > panewidth)
{
- iVal = 0;
- try
- {
- valueField.setText(valueField.getText().trim());
- iVal = Integer.valueOf(valueField.getText());
- } catch (Exception e)
- {
- }
- ;
- if (validator.getMin() != null && validator.getMax() != null)
- {
- slider.getModel().setRangeProperties(iVal, 1,
- validator.getMin().intValue(),
- validator.getMax().intValue(), true);
- }
- else
- {
- slider.setVisible(false);
- }
- return new int[]
- { iVal };
+ jobOptions.add(pbox, "wrap");
+ // System.out.println("Wrap on "+pbox.option.getName());
+ cw = hgap + pbox.getSize().width;
+ fh = true;
}
else
{
- fVal = 0f;
- try
- {
- fVal = Float.valueOf(valueField.getText());
- } catch (Exception e)
- {
- }
- ;
- if (validator.getMin() != null && validator.getMax() != null)
- {
- slider.getModel().setRangeProperties((int) fVal * 1000, 1,
- (int) validator.getMin().floatValue() * 1000,
- (int) validator.getMax().floatValue() * 1000, true);
- }
- else
- {
- slider.setVisible(false);
- }
- return new float[]
- { fVal };
+ jobOptions.add(pbox);
}
- }
- else
- {
- if (!choice) {
- slider.setVisible(false);
- return new String[]
- { valueField.getText().trim() };
- }
- else {
- return new String[] { (String) choicebox.getSelectedItem()};
+ if (fh)
+ {
+ finalh += pbox.getSize().height + fl.getVgap();
+ fh = false;
}
}
-
+ jobOptions.revalidate();
}
-
- @Override
- public void stateChanged(ChangeEvent e)
+ else
{
- if (!adjusting)
- {
- valueField.setText(""
- + ((integ) ? ("" + (int) slider.getValue())
- : ("" + (float) (slider.getValue() / 1000f))));
- }
+ jobOptions.setVisible(false);
}
- @Override
- public void actionPerformed(ActionEvent e)
+ // Now layout the parameters assuming they occupy one column - to calculate
+ // total height of options+parameters
+ fl = new FlowLayout(FlowLayout.LEFT);
+ // helpful hint from
+ // http://stackoverflow.com/questions/2743177/top-alignment-for-flowlayout
+ fl.setAlignOnBaseline(true);
+ if (opanp.getParamSet().size() > 0)
{
- if (choice)
+ paramList.removeAll();
+ paramList.setLayout(new MigLayout("", "", ""));
+ fh = true;
+ for (ParamBox pbox : opanp.getParamSet().values())
{
- } else if (!adjusting)
- {
- updateSliderFromValueField();
- }
- argSetModified(true);
- }
-
- }
-
- Map optSet = new Hashtable();
-
- public class OptionBox extends JPanel implements ActionListener
- {
- JComboBox val = new JComboBox();
-
- JCheckBox enabled = new JCheckBox();
- Option option;
- public OptionBox(Option opt)
- {
- option = opt;
- setLayout(new BorderLayout());
- enabled.setSelected(opt.isRequired());
- enabled.setFont(new Font("Verdana", Font.PLAIN, 11));
- enabled.setText(opt.getName());
- enabled.setToolTipText(opt.getDescription());
- add(enabled, BorderLayout.NORTH);
- if (opt.getPossibleValues().size() > 1)
- {
- setLayout(new GridLayout(1, 2));
- for (Object str : opt.getPossibleValues())
+ pbox.validate();
+ cw += pbox.getSize().width + hgap;
+ if (cw + 160 > panewidth)
{
- val.addItem((String) str);
+ paramList.add(pbox, "wrap");
+ cw = pbox.getSize().width + hgap;
+ fh = true;
}
- val.setSelectedItem((String) opt.getDefaultValue());
- val.addActionListener(this);
- add(val, BorderLayout.SOUTH);
- }
- // TODO: add actionListeners for popup (to open further info),
- // and to update list of parameters if an option is enabled
- // that takes a value.
- }
- public Option getOptionIfEnabled() {
- if (!enabled.isSelected())
- {
- return null;
- }
- try {
- if (val.getSelectedItem()!=null)
+ else
{
- option.setDefaultValue((String) val.getSelectedItem());
+ paramList.add(pbox);
}
- } catch (WrongParameterException e)
- {
- e.printStackTrace();
- return null;
+ if (fh)
+ {
+ finalh += pbox.getSize().height + fl.getVgap();
+ fh = false;
+ }
+
}
- return option;
- }
- @Override
- public void actionPerformed(ActionEvent e)
- {
- argSetModified(true);
- enabled.setSelected(true);
+ /*
+ * s = 2 * sep; for (ParamBox pbox : opanp.getParamSet().values()) {
+ * pbox.validate(); s += sep +
+ * pbox.getPreferredSize().height+pbox.getBorder
+ * ().getBorderInsets(pbox).bottom; }
+ *
+ * // paramList.setPreferredSize(new Dimension(w, s));
+ * os+=s+2*sep+paramList
+ * .getBorder().getBorderInsets(paramList).bottom+paramList
+ * .getBorder().getBorderInsets(paramList).top;
+ */
+ paramList.revalidate();
}
- }
-
- private OptionBox addOption(Option opt)
- {
- OptionBox cb = optSet.get(opt.getName());
- if (cb == null)
+ else
{
- cb = new OptionBox(opt);
- optSet.put(opt.getName(), cb);
- jobOptions.add(cb);
+ paramList.setVisible(false);
}
- return cb;
+ // TODO: waste some time trying to eliminate any unnecessary .validate calls
+ // here
+ // System.out.println("Size will be : "+w+","+os);
+ // optsAndparams.setPreferredSize(null);
+ // paramPane.getViewport().setView(optsAndparams);
+ paramPane.getViewport().setAutoscrolls(true);
+ paramPane.revalidate();
+ revalidate();
}
/**
@@ -803,7 +926,7 @@ public class WsJobParameters extends JPanel
jalview.ws.jws2.Jws2Discoverer disc = jalview.ws.jws2.Jws2Discoverer
.getDiscoverer();
int p = 0;
- if (args.length > 3)
+ if (args.length > 0)
{
Vector services = new Vector();
services.addElement(args[p++]);
@@ -818,140 +941,528 @@ public class WsJobParameters extends JPanel
e.printStackTrace();
return;
}
- Jws2Discoverer.Jws2Instance lastserv = null;
- for (Jws2Discoverer.Jws2Instance service : disc.getServices())
+ Jws2Instance lastserv = null;
+ for (Jws2Instance service : disc.getServices())
{
lastserv = service;
- if (p < args.length && service.serviceType.equalsIgnoreCase(args[p]))
+ if (p >= args.length || service.serviceType.equalsIgnoreCase(args[p]))
{
- break;
- }
- }
- if (lastserv != null)
- {
- List prl = null;
- Preset pr = null;
- if (++p < args.length)
- {
- PresetManager prman = lastserv.getPresets();
- if (prman != null)
+ if (lastserv != null)
{
- pr = prman.getPresetByName(args[p]);
- if (pr == null)
+ List prl = null;
+ Preset pr = null;
+ if (++p < args.length)
{
- // just grab the last preset.
- prl = prman.getPresets();
+ PresetManager prman = lastserv.getPresets();
+ if (prman != null)
+ {
+ pr = prman.getPresetByName(args[p]);
+ if (pr == null)
+ {
+ // just grab the last preset.
+ prl = prman.getPresets();
+ }
+ }
}
- }
- }
- Iterator en = (prl == null) ? null : prl.iterator();
- while (true)
- {
- if (en != null)
- {
- if (!en.hasNext())
+ else
{
- en = prl.iterator();
+ PresetManager prman = lastserv.getPresets();
+ if (prman != null)
+ {
+ prl = prman.getPresets();
+ }
}
- pr = en.next();
- }
- WsJobParameters pgui = new WsJobParameters(lastserv, pr);
- JFrame jf = new JFrame("Parameters for " + lastserv.getActionText());
- JPanel cont = new JPanel();
- jf.setPreferredSize(new Dimension(600, 800));
- cont.add(pgui);
- jf.add(cont);
- final Thread thr = Thread.currentThread();
- jf.addWindowListener(new WindowListener()
- {
-
- @Override
- public void windowActivated(WindowEvent e)
+ Iterator en = (prl == null) ? null : prl.iterator();
+ while (en != null && en.hasNext())
{
- // TODO Auto-generated method stub
+ if (en != null)
+ {
+ if (!en.hasNext())
+ {
+ en = prl.iterator();
+ }
+ pr = en.next();
+ }
+ {
+ System.out.println("Testing opts dupes for "
+ + lastserv.getUri() + " : "
+ + lastserv.getActionText() + ":" + pr.getName());
+ List