X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FWsJobParameters.java;h=42f2ddb5cf0440ab268522e94af8e55ae208e68d;hb=5f4f772b4ce40f2ea987cb03dd2c06ec1f48ba67;hp=89028ef14d191b314b88ef34536452605da96348;hpb=6bfff068aa9c55e54222855df1b1039722660037;p=jalview.git

diff --git a/src/jalview/gui/WsJobParameters.java b/src/jalview/gui/WsJobParameters.java
index 89028ef..42f2ddb 100644
--- a/src/jalview/gui/WsJobParameters.java
+++ b/src/jalview/gui/WsJobParameters.java
@@ -1,447 +1,575 @@
+/*
+ * 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.
+ *  
+ * 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/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.gui;
 
+import jalview.bin.Console;
+import jalview.gui.OptsAndParamsPage.OptionBox;
+import jalview.gui.OptsAndParamsPage.ParamBox;
+import jalview.util.MessageManager;
+import jalview.ws.api.UIinfo;
+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.HierarchyBoundsListener;
+import java.awt.event.HierarchyEvent;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-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.util.Hashtable;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import java.util.Vector;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
 
 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.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.ListSelectionModel;
-import javax.swing.SwingConstants;
-import javax.swing.SwingUtilities;
+import javax.swing.WindowConstants;
 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 compbio.metadata.Argument;
-import compbio.metadata.Option;
-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;
-
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+
+import net.miginfocom.swing.MigLayout;
+
+/**
+ * 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
+        ActionListener, DocumentListener, OptsParametersContainerI
 {
-  private static final int PARAM_WIDTH = 340, PARAM_HEIGHT = 150,PARAM_CLOSEDHEIGHT=80;
+  private static final int PREFERRED_WIDTH = 540;
 
-  private static final int OPTSET_HEIGHT = 30;
+  private static final int DEFAULT_HEIGHT = 640;
 
-  JPanel setDetails = new JPanel();
+  // the default parameter set shown to the user
+  private static final String SVC_DEF = "Defaults";
 
-  JPanel settingsPanel = new JPanel();
+  private int maxOptWidth = 200;
 
-  JPanel jobOptions = new JPanel();
+  // URL linkImageURL = getClass().getResource("/images/link.gif");
 
-  JScrollPane jobOptionsPane = new JScrollPane();
+  // TODO ABSRACT FROM JABAWS CLASSES
 
-  JPanel jobParameters = new JPanel();
+  // completion stage representing whether start was clicked
+  private final CompletableFuture<Boolean> completionStage = new CompletableFuture<>();
+  
+  /**
+   * manager for options and parameters.
+   */
+  OptsAndParamsPage opanp;
 
-  JPanel paramButtons = new JPanel();
+  /*
+   * panel containing job options
+   */
+  JPanel optionsPanel = new JPanel();
 
-  JPanel paramPanel = new JPanel();
+  /*
+   * panel containing job parameters
+   */
+  JPanel paramsPanel = new JPanel();
 
-  JLabel modified = new JLabel();
+  JPanel setNamePanel = new JPanel();
 
-  JButton startjob = new JButton();
+  JButton createpref = new JButton();
 
-  JButton canceljob = new JButton();
+  JButton deletepref = new JButton();
 
-  JButton exportParams = new JButton();
+  JButton revertpref = new JButton();
 
-  JButton importParams = new JButton();
+  JButton updatepref = new JButton();
 
-  JButton resetParams = new JButton();
+  JComboBox<String> setName = new JComboBox<>();
 
-  JButton addParam = new JButton();
+  JTextArea setDescr = new JTextArea();
 
-  JButton removeParam = new JButton();
+  JScrollPane paramPane = new JScrollPane();
+  
+  JButton startjob = JvSwingUtils.makeButton(
+          MessageManager.getString("action.start_job"),
+          MessageManager.getString("label.start_job_current_settings"),
+          this::startjob_actionPerformed);
+  JButton canceljob = JvSwingUtils.makeButton(
+          MessageManager.getString("action.cancel_job"),
+          MessageManager.getString("label.cancel_job_close_dialog"),
+          this::canceljob_actionPerformed);
 
-  JButton editParam = new JButton();
+  ParamDatastoreI paramStore;
 
-  JComboBox setName = new JComboBox();
+  // set true when 'Start Job' is clicked
+  boolean startJob = false;
 
-  JTextArea setDescr = new JTextArea();
+  JFrame frame = null;
 
-  JScrollPane paramPane = new JScrollPane();
+  UIinfo service;
 
-  // JList paramList = new JList();
-  JPanel paramList = new JPanel();
+  /*
+   * list of service presets in the gui
+   */
+  Hashtable<String, String> servicePresets = null;
 
-  RunnerConfig serviceOptions;
+  /*
+   * set if dialog is being set - so handlers will avoid spurious events
+   */
+  boolean settingDialog = false;
 
-  List<Parameter> availableParameters;
+  private Hashtable<Object, Object> modifiedElements = new Hashtable<>();
 
-  private BorderLayout jparamLayout;
+  String lastParmSet = null;
 
-  WsJobParameters(Jws2Instance service)
+  public WsJobParameters(ParamDatastoreI store, WsParamSetI preset,
+          List<ArgumentI> args)
   {
-    this(service, null);
-  }
+    super();
 
-  public WsJobParameters(Jws2Instance service, Preset p)
-  {
-    this(null, service, p, null);
+    // parameters dialog in 'compact' format (help as tooltips)
+    opanp = new OptsAndParamsPage(this, true);
+    jbInit();
+    this.paramStore = store;
+    this.service = null;
+    initForService(preset, args);
+    validate();
   }
 
   /**
+   * Constructor given a set of parameters and presets, a service to be invoked,
+   * and a list of (Jabaws client) arguments
    * 
-   * @param desktop
-   *          - if null, create new JFrame outside of desktop
+   * @param paramStorei
    * @param service
-   * @param p
+   * @param preset
+   * @param jobArgset
    */
-  public WsJobParameters(JFrame parent, Jws2Instance service, Preset p,
-          List<Argument> jobArgset)
+  public WsJobParameters(ParamDatastoreI paramStorei, UIinfo service,
+          WsParamSetI preset, List<ArgumentI> jobArgset)
   {
     super();
+    // parameters dialog in 'expanded' format (help text boxes)
+    opanp = new OptsAndParamsPage(this, false);
     jbInit();
-    argSetModified(false);
-    // populate parameter table
-    initForService(service, p, jobArgset);
-    // display in new JFrame attached to parent.
+    this.paramStore = paramStorei;
+    if (paramStore == null && service != null)
+    {
+      paramStore = service.getParamStore();
+    }
+    this.service = service;
+    initForService(preset, jobArgset);
     validate();
   }
 
-  int response = -1;
-
-  JDialog frame = null;
 
-  public boolean showRunDialog()
+  /**
+   * Shows a modal dialog containing the parameters and Start or Cancel options.
+   * Answers true if the job is started, false if cancelled.
+   * 
+   * @return
+   */
+  public CompletionStage<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));
+    // Should JFrame hahve a parent of getDesktop ?
+    frame = new JFrame();
+    frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
+    if (service != null)
+    {
+      frame.setTitle(MessageManager.formatMessage("label.edit_params_for",
+              new String[] { service.getActionText() }));
+    }
+    Rectangle deskr = Desktop.getInstance().getBounds();
+    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);
 
-    frame.setVisible(true);
+    // should perhaps recover defaults from user prefs.
 
-    if (response > 0)
+    frame.validate();
+    javax.swing.SwingUtilities.invokeLater(new Runnable()
     {
-      return true;
-    }
-    return false;
+      @Override
+      public void run()
+      {
+        // jobPanel.setDividerLocation(0.25);
+
+      }
+    });
+    
+    frame.setVisible(true);
+
+    return completionStage;
   }
 
   private void jbInit()
   {
-    modified.setText("*");
-    modified.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
-    modified.setForeground(Color.red);
-    modified.setHorizontalAlignment(SwingConstants.RIGHT);
-
-    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()
-    {
-      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()
+    this.addHierarchyBoundsListener(new HierarchyBoundsListener()
     {
-      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
+
       }
     });
-
-    setDetails.setBorder(new TitledBorder("Details"));
+    updatepref = JvSwingUtils.makeButton(
+            MessageManager.getString("action.update"),
+            MessageManager.getString("label.update_user_parameter_set"),
+            this::update_actionPerformed);
+    deletepref = JvSwingUtils.makeButton(
+            MessageManager.getString("action.delete"),
+            MessageManager.getString("label.delete_user_parameter_set"),
+            this::delete_actionPerformed);
+    createpref = JvSwingUtils.makeButton(
+            MessageManager.getString("action.create"),
+            MessageManager.getString("label.create_user_parameter_set"),
+            this::create_actionPerformed);
+    revertpref = JvSwingUtils.makeButton(
+            MessageManager.getString("action.revert"),
+            MessageManager
+                    .getString("label.revert_changes_user_parameter_set"),
+            this::revert_actionPerformed);
+
+
+    JPanel setDetails = new JPanel();
+    setDetails.setBorder(
+            new TitledBorder(MessageManager.getString("label.details")));
     setDetails.setLayout(new BorderLayout());
     setDescr.setColumns(40);
     setDescr.setWrapStyleWord(true);
     setDescr.setLineWrap(true);
     setDescr.setBackground(getBackground());
-    setDescr.setEditable(false);
+    setDescr.setEditable(true);
+    setDescr.getDocument().addDocumentListener(this);
+    setDescr.setToolTipText(
+            MessageManager.getString("label.edit_notes_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);
-    modified.setPreferredSize(new Dimension(15, 15));
-    JPanel SetNamePanel = new JPanel();
-    SetNamePanel.setLayout(new BorderLayout());
-    SetNamePanel.add(setName, BorderLayout.WEST);
-    SetNamePanel.add(modified, BorderLayout.EAST);
-    setDetails.add(SetNamePanel, BorderLayout.NORTH);
+    JPanel setNameInfo = new JPanel(new FlowLayout(FlowLayout.LEFT));
+    GridBagLayout gbl = new GridBagLayout();
+    setNamePanel.setLayout(gbl);
+
+    JLabel setNameLabel = new JLabel(
+            MessageManager.getString("label.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, 10, 0)); // GridLayout(1,2));
+    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);
-    // setDetails.setPreferredSize(new Dimension(360, 100));
-    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.setLayout(new BorderLayout());
-    // settingsPanel.add(modified, BorderLayout.NORTH);
-    JPanel jobOptionsPanel = new JPanel();
-    jobOptionsPanel.setBorder(new TitledBorder("Options"));
-    jobOptionsPane.getViewport().setView(jobOptions);
-    jobOptionsPanel.add(jobOptionsPane);
-    settingsPanel.add(jobOptionsPanel, BorderLayout.NORTH);
-    settingsPanel.add(jobParameters, BorderLayout.SOUTH);
 
+    // paramPane.setPreferredSize(new Dimension(360, 400));
+    // paramPane.setPreferredSize(null);
+    optionsPanel.setBorder(
+            new TitledBorder(MessageManager.getString("label.options")));
+    optionsPanel.setOpaque(true);
+    paramsPanel.setBorder(
+            new TitledBorder(MessageManager.getString("label.parameters")));
+    paramsPanel.setOpaque(true);
+    // optsAndparams.setScrollableWidth(ScrollableSizeHint.FIT);
+    // optsAndparams.setScrollableHeight(ScrollableSizeHint.NONE);
+    // optsAndparams.setLayout(new BorderLayout());
+    JPanel optsAndparams = new JPanel();
+    optsAndparams.setLayout(new BorderLayout());
+    optsAndparams.add(optionsPanel, BorderLayout.NORTH);
+    optsAndparams.add(paramsPanel, 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);
+    JPanel jobPanel = new JPanel();
+    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);
+    // JAL-1580: setMaximumSize() doesn't work, so just size for the worst case:
+    // check for null is for JUnit usage
+    final int windowHeight = Desktop.getInstance() == null ? DEFAULT_HEIGHT
+            : Desktop.getInstance().getHeight();
+    setPreferredSize(new Dimension(540, windowHeight));
     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);
+    updateWebServiceMenus();
   }
 
-  protected void startjob_actionPerformed(ActionEvent e)
+  protected void update_actionPerformed(ActionEvent e)
   {
-    response = 1;
-    if (frame != null)
+    if (isUserPreset)
     {
-      frame.setVisible(false);
+      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
+    updateWebServiceMenus();
   }
 
-  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;
+      reInitDialog(curname);
+      initArgSetModified();
+      updateWebServiceMenus();
+    }
+    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
-
+    startJob = false;
+    if (frame != null)
+    {
+      frame.setVisible(false);
+    }
+    completionStage.complete(false);
   }
 
-  protected void importParams_actionPerformed(ActionEvent e)
+  protected void startjob_actionPerformed(ActionEvent e)
   {
-    // TODO Auto-generated method stub
-
+    startJob = true;
+    if (frame != null)
+    {
+      frame.setVisible(false);
+    }
+    completionStage.complete(true);
   }
 
-  protected void exportParams_actionPerformed(ActionEvent e)
+  void initForService(WsParamSetI paramSet, List<ArgumentI> jobArgset)
   {
-    // TODO Auto-generated method stub
+    settingDialog = true;
 
-  }
+    init(paramSet, jobArgset);
 
-  Jws2Instance service;
+  }
 
-  void initForService(Jws2Instance service, Preset p,
-          List<Argument> jobArgset)
+  void init(WsParamSetI p, List<ArgumentI> jobArgset)
   {
-    this.service = service;
-    serviceOptions = service.getRunnerConfig();
-    // add any presets not already added.
-    String curname = (p == null ? "" : p.getName());
-    PresetManager prman = service.getPresets();
-    if (prman != null)
+    Hashtable<String, String> exnames = new Hashtable<>();
+    for (int i = 0, iSize = setName.getItemCount(); i < iSize; i++)
+    {
+      exnames.put(setName.getItemAt(i), setName.getItemAt(i));
+    }
+    servicePresets = new Hashtable<>();
+    // Add the default entry - if not present already.
+    if (!exnames.contains(SVC_DEF))
     {
-      List prList = service.getPresets().getPresets();
-      if (prList != null)
+      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())
       {
-        for (Object pr : prList)
-        {
-          if (p == null || !curname.equals(((Preset) pr).getName()))
-          {
-            setName.addItem(((Preset) pr).getName());
-          }
-        }
+        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);
       }
     }
-    updateTable(p, jobArgset);
+    settingDialog = false;
+
   }
 
-  @SuppressWarnings("unchecked")
-  private void updateTable(Preset p, List<Argument> jobArgset)
+  private void updateTable(WsParamSetI p, List<ArgumentI> jobArgset)
   {
-    availableParameters = new ArrayList<Parameter>();
-    List<Parameter> setargs = new ArrayList<Parameter>();
+    boolean setDefaultParams = false;
+    if (lastParmSet == null)
+    {
+      isUserPreset = false;
+      // First call - so provide Service default settings
+      setName.setSelectedItem(lastSetName = SVC_DEF);
+    }
+    if (p == null && SVC_DEF.equals("" + setName.getSelectedItem()))
+    {
+      // indicate that service defaults should be set if available
+      setDefaultParams = true;
+    }
     // populate table from default parameter set.
-    List<Argument> args = serviceOptions.getArguments();
+    List<ArgumentI> args = paramStore.getServiceParameters();
 
     // split to params and required arguments
     {
-      for (Argument arg : args)
+      int cw = 0;
+      boolean optset = false;
+      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(setDefaultParams);
+            if (maxOptWidth < ob.getPreferredSize().width)
             {
-              selectOption(opt, opt.getDefaultValue());
+              maxOptWidth = 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());
           }
         }
       }
@@ -449,708 +577,636 @@ public class WsJobParameters extends JPanel implements ItemListener,
     }
     if (p != null)
     {
-      if (lastParmSet == null)
-      {
-        // initialise setname
-        setName.addItem(p.getName());
-      }
-      setDescr.setText(p.getDescription());
+      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
-    {
-      if (lastParmSet == null)
-      {
-        // first call - so create a dummy name
-        setName.addItem("Defaults *");
-      }
     }
+
     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.setPreferredSize(new Dimension(PARAM_WIDTH, optSet.size()
-            * OPTSET_HEIGHT));
-    jobOptions.setLayout(new GridLayout(optSet.size(), 1));
     refreshParamLayout();
-    // paramPanel.setLayout(new GridLayout(paramSet.size(), 1));
-    // paramList.va
-    // paramPane.getViewport().validate();
-    paramPane.validate();
-    validate();
+    revalidate();
   }
 
   private boolean isModified()
   {
-    return modified.isVisible();
+    return modifiedElements.size() > 0;
   }
 
-  private void argSetModified(boolean b)
+
+  /**
+   * reset gui and modification state settings
+   */
+  private void initArgSetModified()
   {
-    modified.setVisible(b);
-    /*
-     * String setn = (String)setName.getSelectedItem(); if (setn==null) return;
-     * int p = setName.getSelectedIndex(); if (b) { if (setn.length()<2 ||
-     * setn.lastIndexOf(" *")!=setn.length()-2) { setn = setn+" *"; } } else {
-     * if (setn.lastIndexOf(" *")==setn.length()-2) { setn =
-     * setn.substring(0,setn.length()-2); } } // edit the list
-     * 
-     * Object[] objects = new Object[setName.getItemCount()]; for (int
-     * i=0;i<objects.length; i++) { objects[i] = setName.getItemAt(i); }
-     * objects[p] = setn; setName.removeAllItems(); for (int
-     * i=0;i<objects.length; i++) { setName.addItem(objects[i]); }
-     * setName.setSelectedIndex(p);
-     */
-    validate();
+    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)
     {
-      pb = new ParamBox(this, parm);
-      paramSet.put(parm.getName(), pb);
-      paramList.add(pb);
+      // 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
+    {
+      // 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)
+  @Override
+  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))
+      if (b && modifiedElement == setName
+              && modifiedElements.contains(modifiedElement))
       {
-        cb.val.setSelectedItem(string);
+        // HACK! prevents iteration on makeSetNameValid
+        b = false;
       }
-      else
-      {
-        throw new Error("Invalid value " + string + " for option " + opt);
-      }
-
+      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<String, ParamBox> paramSet = new Hashtable<String, ParamBox>();
-
-  public class ParamBox extends JPanel implements ChangeListener,
-          ActionListener
+  private boolean isServicePreset(String selectedItem)
   {
-    JCheckBox showDesc = new JCheckBox();
-
-    JTextArea string = new JTextArea();
-    JScrollPane descPanel = new JScrollPane();
-
-    JSlider slider = null;
-
-    JTextField valueField = null;
-
-    ValueConstrain validator = null;
-    JPanel settingPanel = new JPanel();
-    boolean integ = false;
-
-    boolean choice = false;
+    return selectedItem.equals(SVC_DEF)
+            || servicePresets.containsKey(selectedItem);
+  }
 
-    public ParamBox(final WsJobParameters pmlayout, 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))
     {
-      setLayout(new FlowLayout(FlowLayout.LEFT));
-      setBorder(new TitledBorder(parm.getName()));
-      setPreferredSize(new Dimension(PARAM_WIDTH, PARAM_CLOSEDHEIGHT));
-      string.setFont(new Font("Verdana", Font.PLAIN, 11));
-      string.setBackground(getBackground());
-      // string.setSize(new Dimension(PARAM_WIDTH, 80));
-      string.setEditable(false);
-      showDesc.setText("Show Description");
-      showDesc.setSelected(false);
-      showDesc.setToolTipText(parm.getDescription());
-      //showDesc.setLocation(2,2);
-      descPanel.setPreferredSize(new Dimension(PARAM_WIDTH-20, 90));
-      descPanel.getViewport().setView(string);
-      //descPanel.setLocation(2,17);
-      descPanel.setVisible(false);
-      // string.setMinimumSize(new Dimension(140,80));
-      // string.setMaximumSize(new Dimension(280,80));
-      final ParamBox me=this;
-      showDesc.addActionListener(new ActionListener() {
-
-        @Override
-        public void actionPerformed(ActionEvent e)
-        {
-          boolean show = showDesc.isSelected();
-          descPanel.setVisible(show);
-          me.setPreferredSize(new Dimension(PARAM_WIDTH, (show) ? PARAM_HEIGHT : PARAM_CLOSEDHEIGHT));
-          me.validate();
-          pmlayout.refreshParamLayout();
-        }
-      });
-      string.setWrapStyleWord(true);
-      string.setLineWrap(true);
-      string.setColumns(32);
-      string.setText(parm.getDescription());
-      // name.setToolTipText(parm.getDescription());
-      add(showDesc);
-      validator = parm.getValidValue();
-      parameter = parm;
-      if (validator != null)
+      nm = "User " + nm;
+      renamed = true;
+    }
+    String tnm = nm;
+    if (newuserset)
+    {
+      int i = 0;
+      while (paramStore.getPreset(tnm) != null)
       {
-        integ = validator.getType() == Type.Integer;
+        tnm = nm + " (" + (++i) + ")";
+        renamed = true;
       }
-      else
+      if (i > 0)
       {
-        if (parameter.getPossibleValues() != null)
-        {
-          choice = true;
-        }
+        nm = tnm;
       }
-      updateControls(parm);
-      add(descPanel); // , BorderLayout.NORTH);
-      validate();
     }
 
-
-    boolean adjusting = false;
-
-    Parameter parameter;
-
-    JComboBox choicebox;
-    public int getBoxHeight()
+    boolean makeupdate = false;
+    // sync the gui with the preset database
+    for (int i = 0, iS = setName.getItemCount(); i < iS; i++)
     {
-      return (showDesc.isSelected() ? PARAM_HEIGHT : PARAM_CLOSEDHEIGHT);
+      String snm = setName.getItemAt(i);
+      if (snm.equals(nm))
+      {
+        makeupdate = true;
+        // setName.setSelectedIndex(i);
+      }
     }
-    public void updateControls(Parameter parm)
+    if (!makeupdate)
     {
-      adjusting = true;
-      boolean init = valueField == null;
-      float fVal = 0f;
-      int iVal = 0;
-      if (init)
-      {
-        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();
+      setName.addItem(curSetName = nm);
+      setName.setSelectedItem(curSetName);
+    }
+    if (renamed)
+    {
+      settingDialog = false; // we need this name change to be registered.
+      argSetModified(setName, renamed);
+    }
+    settingDialog = stn;
+  }
 
-        }
-      }
+  /**
+   * Rebuilds the Options and Parameters panels
+   */
+  @Override
+  public void refreshParamLayout()
+  {
+    final int rightMargin = 40;
+    final int availableWidth = paramPane.getViewport().getSize().width
+            - rightMargin
+            - optionsPanel.getBorder().getBorderInsets(optionsPanel).left
+            + optionsPanel.getBorder().getBorderInsets(optionsPanel).right;
 
-      if (parm != null)
+    if (opanp.getOptSet().size() > 0)
+    {
+      int hgap = 5;
+      int currentWidth = hgap;
+
+      /*
+       * layout constraint 'nogrid' prevents vertical column alignment,
+       * allowing controls to flow without extra space inserted to align
+       */
+      optionsPanel.setLayout(new MigLayout("nogrid", "", ""));
+      optionsPanel.removeAll();
+      JPanel lastAdded = null;
+
+      /*
+       * add each control in turn; if adding would overflow the right margin,
+       * remove and re-add the previous parameter with "wrap" (after) 
+       * in order to start a new row
+       */
+      for (OptionBox pbox : opanp.getOptSet().values())
       {
-        if (choice)
+        pbox.validate();
+        int boxWidth = pbox.getSize().width;
+        currentWidth += boxWidth + hgap;
+        boolean wrapAfterLast = currentWidth > availableWidth
+                && lastAdded != null;
+        // System.out.println(String.format(
+        // "%s width=%d, paneWidth=%d, currentWidth=%d, wrapAfterLast=%s",
+        // pbox.toString(), boxWidth, panewidth, currentWidth,
+        // wrapAfterLast));
+        if (wrapAfterLast)
         {
-          List vals = parm.getPossibleValues();
-          for (Object val : vals)
-          {
-            choicebox.addItem(val);
-          }
-          if (parm.getDefaultValue() != null)
-          {
-            choicebox.setSelectedItem(parm.getDefaultValue());
-          }
-        }
-        else
-        {
-          valueField.setText(parm.getDefaultValue());
+          optionsPanel.remove(lastAdded);
+          optionsPanel.add(lastAdded, "wrap");
+          currentWidth = hgap + boxWidth;
         }
+        optionsPanel.add(pbox);
+        lastAdded = pbox;
       }
-      updateSliderFromValueField();
-      adjusting = false;
+      optionsPanel.revalidate();
+    }
+    else
+    {
+      optionsPanel.setVisible(false);
     }
 
-    public Parameter getParameter()
+    if (opanp.getParamSet().size() > 0)
     {
-      try
+      paramsPanel.removeAll();
+      paramsPanel.setLayout(new MigLayout("", "", ""));
+      int hgap = 5;
+      int currentWidth = hgap;
+
+      JPanel lastAdded = null;
+      for (ParamBox pbox : opanp.getParamSet().values())
       {
-        if (choice)
-        {
-          parameter.setDefaultValue((String) choicebox.getSelectedItem());
-        }
-        else
+        pbox.validate();
+        int boxWidth = pbox.getSize().width;
+        currentWidth += boxWidth + hgap;
+        boolean wrapAfterLast = currentWidth > availableWidth
+                && lastAdded != null;
+        if (wrapAfterLast)
         {
-          parameter.setDefaultValue(valueField.getText());
+          paramsPanel.remove(lastAdded);
+          paramsPanel.add(lastAdded, "wrap");
+          currentWidth = pbox.getSize().width + hgap;
         }
-      } catch (WrongParameterException e)
-      {
-        e.printStackTrace();
-        return null;
+        paramsPanel.add(pbox);
+        lastAdded = pbox;
       }
-      return parameter;
+
+      /*
+       * 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;
+       */
+      paramsPanel.revalidate();
     }
+    else
+    {
+      paramsPanel.setVisible(false);
+    }
+    // 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();
+  }
 
-    public Object updateSliderFromValueField()
+
+  public boolean isServiceDefaults()
+  {
+    return (!isModified()
+            && (lastParmSet != null && lastParmSet.equals(SVC_DEF)));
+  }
+
+  public List<ArgumentI> getJobParams()
+  {
+    return opanp.getCurrentSettings();
+  }
+
+
+  /*
+   * Hashtable<String, Object[]> editedParams = new Hashtable<String,
+   * Object[]>();
+   * 
+   * store the given parameters in the user parameter set database.
+   * 
+   * @param storeSetName - lastParmSet
+   * 
+   * @param descr - setDescr.getText()
+   * 
+   * @param jobParams - getJobParams()
+   * 
+   * private void _storeUserPreset(String storeSetName, String descr,
+   * List<ArgumentI> jobParams) { // this is a simple hash store. Object[] pset;
+   * editedParams.put(storeSetName, pset = new Object[3]); pset[0] =
+   * storeSetName; pset[1] = descr; pset[2] = jobParams; // writeParam("Saving "
+   * + storeSetName + ": ", jobParams); }
+   * 
+   * private void writeParam(String nm, List<ArgumentI> params) { for (ArgumentI
+   * p : params) { System.out.println(nm + ":" + System.identityHashCode(p) +
+   * " Name: " + p.getName() + " Value: " + p.getDefaultValue()); } }
+   * 
+   * private Object[] _getUserPreset(String setName) { Object[] pset =
+   * editedParams.get(setName); // if (pset != null) // writeParam("Retrieving "
+   * + setName + ": ", (List<Argument>) pset[2]); return pset; }
+   * 
+   * * remove the given user preset from the preset stash
+   * 
+   * @param setName
+   * 
+   * private void _deleteUserPreset(String setName) {
+   * editedParams.remove(setName); }
+   */
+
+  private void syncSetNamesWithStore()
+  {
+    int n = 0;
+    // remove any set names in the drop down menu that aren't either a reserved
+    // setting, or a user defined or service preset.
+    Vector<String> items = new Vector<>();
+    while (n < setName.getItemCount())
     {
-      int iVal;
-      float fVal;
-      if (validator != null)
+      String item = setName.getItemAt(n);
+      if (!item.equals(SVC_DEF) && !paramStore.presetExists(item))
       {
-        if (integ)
-        {
-          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 };
-        }
-        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 };
-        }
+        setName.removeItemAt(n);
       }
       else
       {
-        if (!choice)
-        {
-          slider.setVisible(false);
-          return new String[]
-          { valueField.getText().trim() };
-        }
-        else
-        {
-          return new String[]
-          { (String) choicebox.getSelectedItem() };
-        }
+        items.addElement(item);
+        n++;
       }
-
     }
-
-    @Override
-    public void stateChanged(ChangeEvent e)
+    if (!items.contains(SVC_DEF))
     {
-      if (!adjusting)
-      {
-        valueField.setText(""
-                + ((integ) ? ("" + (int) slider.getValue())
-                        : ("" + (float) (slider.getValue() / 1000f))));
-      }
+      setName.addItem(SVC_DEF);
     }
-
-    @Override
-    public void actionPerformed(ActionEvent e)
+    for (WsParamSetI upn : paramStore.getPresets())
     {
-      if (choice)
+      if (!items.contains(upn.getName()))
       {
+        setName.addItem(upn.getName());
       }
-      else if (!adjusting)
-      {
-        updateSliderFromValueField();
-      }
-      argSetModified(true);
     }
-
   }
 
-  Map<String, OptionBox> optSet = new Hashtable<String, OptionBox>();
+  /**
+   * true if lastParmSet is a user preset
+   */
+  boolean isUserPreset = false;
 
-  public class OptionBox extends JPanel implements ActionListener
+  private void reInitDialog(String nextPreset)
   {
-    JComboBox val = new JComboBox();
-
-    JCheckBox enabled = new JCheckBox();
-
-    Option option;
-
-    public OptionBox(Option opt)
+    settingDialog = true;
+    // updateTable(null,null); // first reset to defaults
+    WsParamSetI pset = null;
+    if (nextPreset != null && nextPreset.length() > 0)
     {
-      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())
-        {
-          val.addItem((String) str);
-        }
-        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.
+      pset = paramStore.getPreset(nextPreset);
     }
-
-    public Option getOptionIfEnabled()
+    if (pset != null)
     {
-      if (!enabled.isSelected())
+      if (pset.isModifiable())
       {
-        return null;
+        isUserPreset = true;
+        setDescr.setText(pset.getDescription());
+        updateTable(null, pset.getArguments());
+        lastParmSet = nextPreset;
       }
-      try
-      {
-        if (val.getSelectedItem() != null)
-        {
-          option.setDefaultValue((String) val.getSelectedItem());
-        }
-      } catch (WrongParameterException e)
+      else
       {
-        e.printStackTrace();
-        return null;
+        isUserPreset = false;
+        setDescr.setText("");
+        // must be a default preset from service
+        updateTable(pset, null);
+        lastParmSet = nextPreset;
       }
-      return option;
-    }
-
-    @Override
-    public void actionPerformed(ActionEvent e)
-    {
-      argSetModified(true);
-      enabled.setSelected(true);
     }
-  }
-
-  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);
+      isUserPreset = false;
+      // Service defaults
+      setDescr.setText("");
+      updateTable(null, null);
+      lastParmSet = SVC_DEF;
     }
-    return cb;
-  }
 
-  protected void refreshParamLayout()
-  {
-    int s=100;
-    for (ParamBox pbox : paramSet.values()){
-      s+=pbox.getBoxHeight();
-    }
-    paramList.setPreferredSize(new Dimension(PARAM_WIDTH, s));
-    paramList.setLayout(new FlowLayout());
+    initArgSetModified();
+    syncSetNamesWithStore();
+    setName.setSelectedItem(lastParmSet);
+    setNamePanel.validate();
     validate();
+    settingDialog = false;
   }
 
   /**
-   * testing method - grab a service and parameter set and show the window
-   * 
-   * @param args
+   * Rebuild the AlignFrame web service menus (after add/delete of a preset
+   * option).
    */
-  public static void main(String[] args)
+  protected void updateWebServiceMenus()
   {
-    jalview.ws.jws2.Jws2Discoverer disc = jalview.ws.jws2.Jws2Discoverer
-            .getDiscoverer();
-    int p = 0;
-    if (args.length > 3)
+    if (Desktop.getInstance() == null)
     {
-      Vector<String> services = new Vector<String>();
-      services.addElement(args[p++]);
-      Jws2Discoverer.setServiceUrls(services);
+      return;
     }
-    try
+    for (AlignFrame alignFrame : Desktop.getAlignFrames())
     {
-      disc.run();
-    } catch (Exception e)
-    {
-      System.err.println("Aborting. Problem discovering services.");
-      e.printStackTrace();
-      return;
+      alignFrame.buildWebServicesMenu();
     }
-    Jws2Discoverer.Jws2Instance lastserv = null;
-    for (Jws2Discoverer.Jws2Instance service : disc.getServices())
+  }
+
+  String curSetName = null;
+
+  @Override
+  public void itemStateChanged(ItemEvent e)
+  {
+    if (e.getSource() == setName
+            && e.getStateChange() == ItemEvent.SELECTED)
     {
-      lastserv = service;
-      if (p < args.length && service.serviceType.equalsIgnoreCase(args[p]))
+      final String setname = (String) setName.getSelectedItem();
+      if (Console.isDebugEnabled())
       {
-        break;
+        Console.debug("Item state changed for " + setname + " (handling ? "
+                + !settingDialog + ")");
       }
-    }
-    if (lastserv != null)
-    {
-      List<Preset> prl = null;
-      Preset pr = null;
-      if (++p < args.length)
+      if (settingDialog)
       {
-        PresetManager prman = lastserv.getPresets();
-        if (prman != null)
-        {
-          pr = prman.getPresetByName(args[p]);
-          if (pr == null)
-          {
-            // just grab the last preset.
-            prl = prman.getPresets();
-          }
-        }
+        // ignore event
+        return;
       }
-      Iterator<Preset> en = (prl == null) ? null : prl.iterator();
-      while (true)
+      if (setname == null)
       {
-        if (en != null)
-        {
-          if (!en.hasNext())
-          {
-            en = prl.iterator();
-          }
-          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)
-          {
-            // TODO Auto-generated method stub
-
-          }
-
-          @Override
-          public void windowClosed(WindowEvent e)
-          {
-          }
-
-          @Override
-          public void windowClosing(WindowEvent e)
-          {
-            thr.interrupt();
-
-          }
-
-          @Override
-          public void windowDeactivated(WindowEvent e)
-          {
-            // TODO Auto-generated method stub
-
-          }
-
-          @Override
-          public void windowDeiconified(WindowEvent e)
-          {
-            // TODO Auto-generated method stub
-
-          }
-
-          @Override
-          public void windowIconified(WindowEvent e)
-          {
-            // TODO Auto-generated method stub
-
-          }
-
-          @Override
-          public void windowOpened(WindowEvent e)
-          {
-            // TODO Auto-generated method stub
-
-          }
-
-        });
-        jf.setVisible(true);
-        boolean inter = false;
-        while (!inter)
+        return;
+      }
+      javax.swing.SwingUtilities.invokeLater(new Runnable()
+      {
+        @Override
+        public void run()
         {
-          try
-          {
-            Thread.sleep(10000);
-          } catch (Exception e)
-          {
-            inter = true;
-          }
-          ;
+          doPreferenceComboStateChange(setname);
         }
-        jf.dispose();
-      }
+      });
     }
   }
 
-  public List<Argument> getJobParams()
+  private void doPreferenceComboStateChange(String setname)
   {
-    List<Argument> argSet = new ArrayList<Argument>();
-    // recover options and parameters from GUI
-    for (OptionBox opts : optSet.values())
+    // user has selected a different item from combo-box
+    if (isModified())
     {
-      Option opt = opts.getOptionIfEnabled();
-      if (opt != null)
+      String lsetname = (curSetName != null) ? curSetName : lastParmSet;
+      if (lsetname.equals(setname))
       {
-        argSet.add(opt);
+        // setname was just edited - so ignore this event.
+        return;
       }
-    }
-    for (ParamBox parambox : paramSet.values())
-    {
-      Parameter parm = parambox.getParameter();
-      if (parm != null)
+      settingDialog = true;
+      System.out.println("Prompting to save " + lsetname);
+      if (JvOptionPane.showConfirmDialog(this, "Parameter set '" + lsetname
+              + "' is modifed, and your changes will be lost.\nReally change preset ?",
+              "Warning: Unsaved Changes",
+              JvOptionPane.OK_CANCEL_OPTION) != JvOptionPane.OK_OPTION)
       {
-        argSet.add(parm);
+        // revert the combobox to the current item
+        settingDialog = true;
+        setName.setSelectedItem(lsetname);
+        settingDialog = false;
+        // and leave.
+        return;
+        // System.out.println("Saving for " + lsetname);
+        // _storeCurrentPreset(lsetname);
+
       }
     }
+    settingDialog = true;
+    reInitDialog(setname);
+    settingDialog = false;
 
-    return argSet;
   }
 
-  String lastParmSet = null;
+  /**
+   * store current settings as given name. You should then reset gui.
+   * 
+   * @param curSetName2
+   */
+  private void _storeCurrentPreset(String curSetName2)
+  {
+    paramStore.storePreset(curSetName2, setDescr.getText(), getJobParams());
+  }
+
+  private void _updatePreset(String lastParmSet2, String curname)
+  {
+    paramStore.updatePreset(lastParmSet2, curname, setDescr.getText(),
+            getJobParams());
+
+  }
 
-  Hashtable<String, Object[]> editedParams = new Hashtable<String, Object[]>();
+  /**
+   * last saved name for this user preset
+   */
+  String lastSetName = null;
+
+  /**
+   * last saved value of the description text for this user preset
+   */
+  String lastDescrText = null;
 
   @Override
-  public void itemStateChanged(ItemEvent e)
+  public void actionPerformed(ActionEvent e)
   {
-    if (e.getSource() == setName)
+    if (e.getSource() instanceof Component)
     {
-      String setname = (String) setName.getSelectedItem();
-      if (setname == null)
-      {
-        return;
-      }
-      // if modified - warn user - or at least save current edited set.
-      if (lastParmSet != null)
+      Component src = (Component) e.getSource();
+      if (src.getParent() == setName)
       {
-        // save current state
-        Object[] pset;
-        editedParams.put(lastParmSet, pset = new Object[3]);
-        pset[0] = lastParmSet;
-        pset[1] = setDescr.getText();
-        pset[2] = getJobParams();
-      }
-      Object[] pset = editedParams.get(setname);
-      if (pset != null)
-      {
-        setDescr.setText((String) pset[1]);
-        updateTable(null, (List<Argument>) pset[2]);
-        lastParmSet = setname;
-        validate();
-      }
-      else
-      {
-        // must be a default preset from service
-        Preset p = null;
-        try
+        // rename any existing records we know about for this set.
+        String newname = e.getActionCommand().trim();
+        String msg = null;
+        if (isServicePreset(newname))
         {
-          p = service.getPresets().getPresetByName(setname);
-        } catch (Exception ex)
+          final String oldname = curSetName != null ? curSetName
+                  : lastParmSet;
+          final Component ourframe = this;
+          settingDialog = true;
+          setName.getEditor().setItem(oldname);
+          settingDialog = false;
+          javax.swing.SwingUtilities.invokeLater(new Runnable()
+          {
+            @Override
+            public void run()
+            {
+              JvOptionPane.showMessageDialog(ourframe,
+                      MessageManager.getString(
+                              "label.invalid_name_preset_exists"),
+                      MessageManager.getString("label.invalid_name"),
+                      JvOptionPane.WARNING_MESSAGE);
+            }
+          });
+
+          return;
+        }
+        curSetName = newname;
+        System.err.println("New name for user setting " + curSetName
+                + " (was " + setName.getSelectedItem() + ")");
+        if (curSetName.equals(setName.getSelectedItem()))
         {
-          ex.printStackTrace();
+          curSetName = null;
         }
-        if (p != null)
+        if (curSetName != null)
         {
-          updateTable(p, null);
-          validate();
-          lastParmSet = setname;
+          argSetModified(setName, true);
+          return;
         }
+
       }
+    }
+  }
+
+  private void checkDescrModified()
+  {
+    if (!settingDialog)
+    {
+
+      argSetModified(setDescr,
+              (lastDescrText == null
+                      ? setDescr.getText().trim().length() > 0
+                      : !setDescr.getText().equals(lastDescrText)));
 
     }
   }
 
   @Override
-  public void actionPerformed(ActionEvent e)
+  public void insertUpdate(DocumentEvent e)
+  {
+    checkDescrModified();
+  }
+
+  @Override
+  public void removeUpdate(DocumentEvent e)
   {
-    if (e.getSource() == setName)
+    checkDescrModified();
+  }
+
+  @Override
+  public void changedUpdate(DocumentEvent e)
+  {
+    checkDescrModified();
+  }
+
+  /**
+   * 
+   * @return null or the service preset selected by the user
+   */
+  public WsParamSetI getPreset()
+  {
+    if (isUserPreset || isModified()
+            || (lastParmSet != null && lastParmSet.equals(SVC_DEF)))
+    {
+      return null;
+    }
+    else
     {
-      // rename any existing records we know about for this set.
-      String newname = (String) setName.getSelectedItem();
-      System.err.println("Command " + newname + " : "
-              + e.getActionCommand());
+      return paramStore.getPreset(lastParmSet);
     }
   }
 }