X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FWsJobParameters.java;h=30e4fbe29768c2d777d091b5f34ad9c2487fcf3b;hb=a8f483d04205bb8273ee311c12968b7e86d205fa;hp=0e206b41ac2947950a68486e164c5df48690b563;hpb=439d5ad378494d0afa9668e2308ad605c51afcc0;p=jalview.git

diff --git a/src/jalview/gui/WsJobParameters.java b/src/jalview/gui/WsJobParameters.java
index 0e206b4..30e4fbe 100644
--- a/src/jalview/gui/WsJobParameters.java
+++ b/src/jalview/gui/WsJobParameters.java
@@ -1,62 +1,74 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Copyright (C) 2014 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.gui.OptsAndParamsPage.OptionBox;
+import jalview.gui.OptsAndParamsPage.ParamBox;
+import jalview.util.MessageManager;
+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.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.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.JSplitPane;
-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.border.TitledBorder;
-import javax.swing.event.CellEditorListener;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
-import javax.swing.table.*;
+
+import net.miginfocom.swing.MigLayout;
 
 import compbio.metadata.Argument;
 import compbio.metadata.Option;
@@ -64,12 +76,6 @@ 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;
 
 /**
  * job parameter editing/browsing dialog box. User can browse existing settings
@@ -87,16 +93,28 @@ import jalview.ws.jws2.Jws2Discoverer.Jws2Instance;
  * 
  */
 public class WsJobParameters extends JPanel implements ItemListener,
-        ActionListener, DocumentListener
+        ActionListener, DocumentListener, OptsParametersContainerI
 {
+  URL linkImageURL = getClass().getResource("/images/link.gif");
+
   private static final String SVC_DEF = "Defaults"; // this is the null
                                                     // parameter set as shown to
                                                     // user
 
-  private static final int PARAM_WIDTH = 340, PARAM_HEIGHT = 150,
-          PARAM_CLOSEDHEIGHT = 80;
+  /**
+   * manager for options and parameters.
+   */
+  OptsAndParamsPage opanp = new OptsAndParamsPage(this);
+
+  /**
+   * panel containing job options
+   */
+  JPanel jobOptions = new JPanel();
 
-  private static final int OPTSET_HEIGHT = 30;
+  /**
+   * panel containing job parameters
+   */
+  JPanel paramList = new JPanel();
 
   JPanel SetNamePanel = new JPanel();
 
@@ -104,21 +122,17 @@ public class WsJobParameters extends JPanel implements ItemListener,
 
   JSplitPane settingsPanel = new JSplitPane();
 
-  JSplitPane jobPanel = new JSplitPane();
-
-  JPanel jobOptions = new JPanel();
+  JPanel jobPanel = new JPanel();
 
   JScrollPane jobOptionsPane = new JScrollPane();
 
-  JPanel jobParameters = new JPanel();
-
-  JButton savmodified = new JButton();
+  JButton createpref = new JButton();
 
-  JButton renmodified = new JButton();
+  JButton deletepref = new JButton();
 
-  JButton deletesetting = new JButton();
+  JButton revertpref = new JButton();
 
-  JButton revertsetting = new JButton();
+  JButton updatepref = new JButton();
 
   JButton startjob = new JButton();
 
@@ -130,21 +144,23 @@ public class WsJobParameters extends JPanel implements ItemListener,
 
   JScrollPane paramPane = new JScrollPane();
 
-  // JList paramList = new JList();
-  JPanel paramList = new JPanel();
+  // ScrollablePanel optsAndparams = new ScrollablePanel();
+  JPanel optsAndparams = new JPanel();
 
   RunnerConfig serviceOptions;
 
-  private BorderLayout jparamLayout;
+  ParamDatastoreI paramStore;
+
+  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);
   }
 
   /**
@@ -152,16 +168,36 @@ public class WsJobParameters extends JPanel implements ItemListener,
    * @param desktop
    *          - if null, create new JFrame outside of desktop
    * @param service
-   * @param p
+   * @param preset
    */
-  public WsJobParameters(JFrame parent, Jws2Instance service, Preset p,
-          List<Argument> jobArgset)
+  public WsJobParameters(JFrame parent, Jws2Instance service,
+          WsParamSetI preset, List<Argument> jobArgset)
+  {
+    this(parent, null, service, preset, jobArgset);
+  }
+
+  /**
+   * 
+   * @param parent
+   * @param paramStorei
+   * @param service
+   * @param preset
+   * @param jobArgset
+   */
+  public WsJobParameters(JFrame parent, ParamDatastoreI paramStorei,
+          Jws2Instance service, WsParamSetI preset, List<Argument> jobArgset)
   {
     super();
     jbInit();
+    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();
   }
@@ -170,6 +206,11 @@ public class WsJobParameters extends JPanel implements ItemListener,
 
   JDialog frame = null;
 
+  /**
+   * shows a modal dialog containing the parameters.
+   * 
+   * @return
+   */
   public boolean showRunDialog()
   {
 
@@ -177,10 +218,24 @@ public class WsJobParameters extends JPanel implements ItemListener,
 
     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)
@@ -190,80 +245,82 @@ public class WsJobParameters extends JPanel implements ItemListener,
     return false;
   }
 
-  protected JButton makeButton(String label, String tooltip,
-          ActionListener action)
-  {
-    JButton button = new JButton();
-    button.setText(label);
-    button.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
-    button.setForeground(Color.black);
-    button.setHorizontalAlignment(SwingConstants.CENTER);
-    button.setToolTipText(tooltip);
-    button.addActionListener(action);
-    return button;
-  }
-
   private void jbInit()
   {
-    savmodified = makeButton("Save", "Not implemented yet :) ",
+    this.addHierarchyBoundsListener(new HierarchyBoundsListener()
+    {
+
+      @Override
+      public void ancestorResized(HierarchyEvent arg0)
+      {
+        refreshParamLayout();
+      }
+
+      @Override
+      public void ancestorMoved(HierarchyEvent arg0)
+      {
+        // TODO Auto-generated method stub
+
+      }
+    });
+    updatepref = JvSwingUtils.makeButton(MessageManager.getString("action.update"),
+            MessageManager.getString("label.update_user_parameter_set"),
             new ActionListener()
             {
 
               public void actionPerformed(ActionEvent e)
               {
-                savModified_actionPerformed(e);
+                update_actionPerformed(e);
               }
             });
-    renmodified = makeButton("Rename", "Not implemented yet :) ",
+    deletepref = JvSwingUtils.makeButton(MessageManager.getString("action.delete"),
+            MessageManager.getString("label.delete_user_parameter_set"),
             new ActionListener()
             {
 
               public void actionPerformed(ActionEvent e)
               {
-                renModified_actionPerformed(e);
+                delete_actionPerformed(e);
               }
             });
-    deletesetting = makeButton("Delete", "Not implemented yet :) ",
+    createpref = JvSwingUtils.makeButton(MessageManager.getString("action.create"),
+            MessageManager.getString("label.create_user_parameter_set"),
             new ActionListener()
             {
 
               public void actionPerformed(ActionEvent e)
               {
-                deleteSetting_actionPerformed(e);
+                create_actionPerformed(e);
               }
             });
-    revertsetting = makeButton("Revert", "Undo changes to parameters.",
+    revertpref = JvSwingUtils.makeButton(MessageManager.getString("action.revert"),
+            MessageManager.getString("label.revert_changes_user_parameter_set"),
             new ActionListener()
             {
 
               public void actionPerformed(ActionEvent e)
               {
-                revertSetting_actionPerformed(e);
+                revert_actionPerformed(e);
+              }
+            });
+    startjob = JvSwingUtils.makeButton(MessageManager.getString("action.start_job"),
+            MessageManager.getString("label.start_job_current_settings"), new ActionListener()
+            {
+              public void actionPerformed(ActionEvent e)
+              {
+                startjob_actionPerformed(e);
+              }
+            });
+    canceljob = JvSwingUtils.makeButton(MessageManager.getString("action.cancel_job"),
+            MessageManager.getString("label.cancel_job_close_dialog"), new ActionListener()
+            {
+              public void actionPerformed(ActionEvent e)
+              {
+                canceljob_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)
-      {
-        startjob_actionPerformed(e);
-      }
-    });
-    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)
-      {
-        canceljob_actionPerformed(e);
-      }
-    });
-
-    setDetails.setBorder(new TitledBorder("Details"));
+    setDetails.setBorder(new TitledBorder(MessageManager.getString("label.details")));
     setDetails.setLayout(new BorderLayout());
     setDescr.setColumns(40);
     setDescr.setWrapStyleWord(true);
@@ -271,105 +328,142 @@ public class WsJobParameters extends JPanel implements ItemListener,
     setDescr.setBackground(getBackground());
     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);
-    SetNamePanel.setLayout(new BorderLayout());
-    SetNamePanel.add(setName, BorderLayout.WEST);
+    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
-    deletesetting.setVisible(false);
-    revertsetting.setVisible(false);
-    renmodified.setVisible(false);
-    savmodified.setVisible(false);
+    updatepref.setVisible(false);
+    deletepref.setVisible(false);
+    revertpref.setVisible(false);
+    createpref.setVisible(false);
     JPanel setsavebuts = new JPanel();
-    setsavebuts.setLayout(new FlowLayout());
-    setsavebuts.add(revertsetting, BorderLayout.CENTER);
-    setsavebuts.add(renmodified, BorderLayout.CENTER);
-    setsavebuts.add(deletesetting, BorderLayout.CENTER);
-    setsavebuts.add(savmodified, BorderLayout.EAST);
-    SetNamePanel.add(setsavebuts,BorderLayout.EAST);
+    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);
-    // 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));
-    // TODO: relayout buttons nicely
-    paramPane.getViewport().setView(paramList);
-    jobParameters.add(paramPane, BorderLayout.CENTER);
-    JPanel jobOptionsPanel = new JPanel();
-    jobOptionsPanel.setLayout(new BorderLayout());
-    jobOptionsPanel.setBorder(new TitledBorder("Options"));
-    jobOptionsPane.getViewport().setView(jobOptions);
-    jobOptionsPanel.add(jobOptionsPane, BorderLayout.CENTER);
-    settingsPanel.setLeftComponent(jobOptionsPanel);
-    settingsPanel.setRightComponent(jobParameters);
-    settingsPanel.setOrientation(JSplitPane.VERTICAL_SPLIT);
-    settingsPanel.setDividerLocation(0.4);
 
+    // paramPane.setPreferredSize(new Dimension(360, 400));
+    // paramPane.setPreferredSize(null);
+    jobOptions.setBorder(new TitledBorder(MessageManager.getString("label.options")));
+    jobOptions.setOpaque(true);
+    paramList.setBorder(new TitledBorder(MessageManager.getString("label.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));
-    jobPanel.setLeftComponent(setDetails);
-    jobPanel.setRightComponent(settingsPanel);
-    jobPanel.setOrientation(JSplitPane.VERTICAL_SPLIT);
-    jobPanel.setDividerLocation(0.8);
+    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 revertSetting_actionPerformed(ActionEvent e)
+  protected void revert_actionPerformed(ActionEvent e)
   {
-    // TODO Auto-generated method stub
+    reInitDialog(lastParmSet);
 
   }
 
-  protected void deleteSetting_actionPerformed(ActionEvent e)
+  protected void update_actionPerformed(ActionEvent e)
   {
-    String setname = (String) setName.getSelectedItem();
-    int p=setName.getSelectedIndex();
-    if (_getUserPreset(setname)!=null)
+    if (isUserPreset)
     {
-      _deleteUserPreset(setname);
-      
+      String curname = ((String) setName.getSelectedItem()).trim();
+      _updatePreset(lastParmSet, curname);
+      lastParmSet = curname;
+      isUserPreset = true;
+      initArgSetModified();
+      syncSetNamesWithStore();
     }
-    if (p>0 && p+1==setName.getItemCount())
-    {
-      p--;
-    }
-    setName.setSelectedIndex(p);
-    
   }
 
-  protected void renModified_actionPerformed(ActionEvent e)
+  private void _deleteUserPreset(String lastParmSet2)
   {
-    if (curSetName==null || _getUserPreset(lastSetName)==null) {
-      System.err.println("can't rename - names unchanged or original name not a preset.");
-      return;
+    paramStore.deletePreset(lastParmSet2);
+  }
+
+  protected void delete_actionPerformed(ActionEvent e)
+  {
+    if (isUserPreset)
+    {
+      // delete current preset's saved entry
+      _deleteUserPreset(lastParmSet);
     }
-    _deleteUserPreset(lastSetName);
-    lastSetName=curSetName;
-    savModified_actionPerformed(e);
-    curSetName=null;
-    boolean setd = settingDialog;
-    settingDialog=true;
-    syncSetNamesWithStore();
-    settingDialog=setd;
+    reInitDialog(null); // service default
   }
 
-  protected void savModified_actionPerformed(ActionEvent e)
+  protected void create_actionPerformed(ActionEvent e)
   {
-    _storeUserPreset(lastSetName=(String) setName.getSelectedItem(), setDescr.getText(), getJobParams());
-    curSetName=null;
-    initArgSetModified(); // reset the modification state
+    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 canceljob_actionPerformed(ActionEvent e)
@@ -402,80 +496,123 @@ public class WsJobParameters extends JPanel implements ItemListener,
    */
   boolean settingDialog = false;
 
-  void initForService(Jws2Instance service, Preset p,
-          List<Argument> jobArgset)
+  void initForService(Jws2Instance service, WsParamSetI jabap,
+          List<Argument> jabajobArgset)
   {
+    WsParamSetI p = null;
+    List<ArgumentI> jobArgset = null;
     settingDialog = true;
-    this.service = service;
-    // TODO: Recover window geometry prefs for this service
-    // jobPanel.setDividerLocation(proportionalLocation)
-    // settingsPanel.setDividerLocation(proportionalLocation)
+    { // 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);
     }
-    serviceOptions = service.getRunnerConfig();
-    // add any presets not already added.
     String curname = (p == null ? "" : p.getName());
-    PresetManager prman = service.getPresets();
-    servicePresets = new Hashtable();
-    if (prman != null)
+    for (WsParamSetI pr : paramStore.getPresets())
     {
-      List prList = service.getPresets().getPresets();
-      if (prList != null)
+      if (!pr.isModifiable())
       {
-        for (Object pr : prList)
-        {
-          servicePresets.put(((Preset) pr).getName(), "preset");
-          if (!exnames.contains(((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);
-    initArgSetModified();
     settingDialog = false;
 
   }
 
   @SuppressWarnings("unchecked")
-  private void updateTable(Preset p, List<Argument> jobArgset)
+  private void updateTable(WsParamSetI p, List<ArgumentI> jobArgset)
   {
-    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)
-      {
-        Argument myarg = (Argument) arg;
+      int cw = 0;
+      boolean optset=false;
+      for (ArgumentI myarg : args)
+      { 
         // Ideally, Argument would implement isRequired !
-        if (myarg instanceof Parameter)
+        if (myarg instanceof ParameterI)
         {
-          Parameter parm = (Parameter) myarg;
-          addParameter(parm);
+          ParameterI parm = (ParameterI) myarg;
+          opanp.addParameter(parm).validate();
         }
         else
         {
-          if (myarg instanceof Option)
+          if (myarg instanceof OptionI)
           {
-            Option opt = (Option) myarg;
-            addOption(opt).resetToDefault();
+            OptionI opt = (OptionI) myarg;
+            OptionBox ob = opanp.addOption(opt);
+            ob.resetToDefault(setDefaultParams);
+            if (MAX_OPTWIDTH < ob.getPreferredSize().width)
+            {
+              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());
           }
         }
       }
@@ -483,28 +620,20 @@ public class WsJobParameters extends JPanel implements ItemListener,
     }
     if (p != null)
     {
+      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.setSelectedItem(lastSetName = SVC_DEF);
-      }
     }
 
     if (jobArgset != null)
@@ -515,31 +644,28 @@ public class WsJobParameters extends JPanel implements ItemListener,
     // get setargs from current object
     if (args != null)
     {
-      for (Argument arg : args)
+      for (ArgumentI arg : args)
       {
-        if (arg instanceof Parameter)
+        if (arg instanceof ParameterI)
         {
-          setParameter((Parameter) arg);
+          opanp.setParameter((ParameterI) arg);
         }
         else
         {
-          if (arg instanceof Option)
+          if (arg instanceof OptionI)
           {
-            System.out.println("Setting option " + arg.getName() + " with "
-                    + arg.getDefaultValue());
-            selectOption((Option) arg, arg.getDefaultValue());
+            // System.out.println("Setting option "
+            // + System.identityHashCode(arg) + ":" + arg.getName()
+            // + " with " + arg.getDefaultValue());
+            opanp.selectOption((OptionI) arg, arg.getValue());
           }
         }
 
       }
     }
 
-    jobOptions.setPreferredSize(new Dimension(PARAM_WIDTH, optSet.size()
-            * OPTSET_HEIGHT));
-    jobOptions.setLayout(new GridLayout(optSet.size(), 1));
     refreshParamLayout();
-    paramPane.validate();
-    validate();
+    revalidate();
   }
 
   private boolean isModified()
@@ -556,57 +682,64 @@ public class WsJobParameters extends JPanel implements ItemListener,
   {
     curSetName = null;
     modifiedElements.clear();
-    renmodified.setVisible(false);
-    savmodified.setVisible(false);
+    updateButtonDisplay();
+  }
+
+  private void updateButtonDisplay()
+  {
+    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
+    {
+      // 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 argSetModified(Object modifiedElement, boolean b)
+  public void argSetModified(Object modifiedElement, boolean b)
   {
     if (settingDialog)
     {
       return;
     }
-
     if (!b)
     {
       modifiedElements.remove(modifiedElement);
     }
     else
     {
-      modifiedElements.put(modifiedElement, modifiedElement);
-    }
-    // set mod status based on presence of elements in table
-    if (modifiedElements.size() > 0)
-    {
-      makeSetNameValid();
-      savmodified.setVisible(true);
-      revertsetting.setVisible(false);
-    }
-    else
-    {
-      revertsetting.setVisible(false);
-      deletesetting
-              .setVisible(!isServicePreset((String) setName
-                      .getSelectedItem())
-                      && _getUserPreset((String) setName.getSelectedItem()) != null);
-      savmodified.setVisible(false);
-    }
-    // special reveal if setName has been modified
-    if (modifiedElements.get(setName) != null)
-    {
-      if (curSetName != null && lastSetName != null
-              && !lastSetName.equals(curSetName))
+      if (b && modifiedElement == setName
+              && modifiedElements.contains(modifiedElement))
       {
-        renmodified.setVisible(!isServicePreset(lastSetName));
+        // HACK! prevents iteration on makeSetNameValid
+        b = false;
       }
+      modifiedElements.put(modifiedElement, modifiedElement);
     }
-    else
+    // set mod status based on presence of elements in table
+    if (b && modifiedElements.size() > 0)
     {
-      // setname isn't in modlist - so don't rename
-      renmodified.setVisible(false);
+      makeSetNameValid(!isUserPreset);
+      SetNamePanel.revalidate();
     }
-    validate();
+    updateButtonDisplay();
   }
 
   private boolean isServicePreset(String selectedItem)
@@ -619,22 +752,33 @@ public class WsJobParameters extends JPanel implements ItemListener,
    * check if the current set name is a valid set name for saving, if not, then
    * fix it.
    */
-  private void makeSetNameValid()
+  private void makeSetNameValid(boolean newuserset)
   {
     boolean stn = settingDialog;
     boolean renamed = false;
     settingDialog = true;
-    String nm = (String) setName.getSelectedItem();
+    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;
     }
-    // if ()
-    // if nm exists in user's preset store then savmodified will update an
-    // existing user defined preset
-    // if nm doesn't exist, then the button will create a new preset.
+    String tnm = nm;
+    if (newuserset)
+    {
+      int i = 0;
+      while (paramStore.getPreset(tnm) != null)
+      {
+        tnm = nm + " (" + (++i) + ")";
+        renamed = true;
+      }
+      if (i > 0)
+      {
+        nm = tnm;
+      }
+    }
 
     boolean makeupdate = false;
     // sync the gui with the preset database
@@ -644,516 +788,138 @@ public class WsJobParameters extends JPanel implements ItemListener,
       if (snm.equals(nm))
       {
         makeupdate = true;
-        setName.setSelectedIndex(i);
+        // setName.setSelectedIndex(i);
       }
     }
-
-    if (_getUserPreset(nm) != null)
+    if (!makeupdate)
     {
-      savmodified.setText("Update");
+      setName.addItem(curSetName = nm);
+      setName.setSelectedItem(curSetName);
     }
-    else
+    if (renamed)
     {
-      if (renamed)
-      {
-        setName.addItem(nm);
-        setName.setSelectedIndex(setName.getItemCount() - 1);
-      }
-      savmodified.setText("Save");
+      settingDialog = false; // we need this name change to be registered.
+      argSetModified(setName, renamed);
     }
     settingDialog = stn;
   }
 
-  private void addParameter(Parameter parm)
-  {
-    ParamBox pb = paramSet.get(parm.getName());
-    if (pb == null)
-    {
-      pb = new ParamBox(this, parm);
-      paramSet.put(parm.getName(), pb);
-      paramList.add(pb);
-    }
-    pb.init();
-    // take the defaults from the parameter
-    pb.updateControls(parm);
-  }
-
-  private void setParameter(Parameter arg)
-  {
-    ParamBox pb = paramSet.get(arg.getName());
-    if (pb == null)
-    {
-      addParameter(arg);
-    }
-    else
-    {
-      pb.updateControls(arg);
-    }
-
-  }
-
-  private void selectOption(Option opt, String string)
+  public void refreshParamLayout()
   {
-    OptionBox cb = optSet.get(opt.getName());
-    if (cb == null)
-    {
-      cb = addOption(opt);
-    }
-    cb.enabled.setSelected(true); // initial state for an option.
-    if (string != null)
-    {
-      if (opt.getPossibleValues().contains(string))
-      {
-        cb.val.setSelectedItem(string);
-      }
-      else
-      {
-        throw new Error("Invalid value " + string + " for option " + opt);
-      }
-
-    }
-    if (opt.isRequired() && !cb.enabled.isSelected())
+    // 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)
     {
-      // TODO: indicate paramset is not valid.. option needs to be selected!
-    }
-    cb.setInitialValue();
-  }
-
-  Map<String, ParamBox> paramSet = new Hashtable<String, ParamBox>();
-
-  public class ParamBox extends JPanel implements ChangeListener,
-          ActionListener
-  {
-    JButton showDesc = new JButton();
-
-    JTextArea string = new JTextArea();
-
-    JScrollPane descPanel = new JScrollPane();
-
-    JSlider slider = null;
-
-    JTextField valueField = null;
-
-    ValueConstrain validator = null;
-
-    JPanel settingPanel = new JPanel();
-
-    JPanel controlPanel = new JPanel();
-
-    boolean integ = false;
-
-    boolean choice = false;
-
-    boolean descisvisible = false;
 
-    final WsJobParameters pmdialogbox;
+      jobOptions.setLayout(new MigLayout("", "", ""));
+      jobOptions.removeAll();
 
-    public ParamBox(final WsJobParameters pmlayout, Parameter parm)
-    {
-      pmdialogbox = pmlayout;
-      setPreferredSize(new Dimension(PARAM_WIDTH, PARAM_CLOSEDHEIGHT));
-      setBorder(new TitledBorder(parm.getName()));
-      setLayout(null);
-      showDesc.setFont(new Font("Verdana", Font.PLAIN, 6));
-      showDesc.setText("+");
-      string.setFont(new Font("Verdana", Font.PLAIN, 11));
-      string.setBackground(getBackground());
-      // string.setSize(new Dimension(PARAM_WIDTH, 80));
-      string.setEditable(false);
-      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()
+      for (OptionBox pbox : opanp.getOptSet().values())
       {
-
-        public void actionPerformed(ActionEvent e)
+        pbox.validate();
+        cw += pbox.getSize().width + hgap;
+        if (cw + 120 > panewidth)
         {
-          descisvisible = !descisvisible;
-          descPanel.setVisible(descisvisible);
-          me.setPreferredSize(new Dimension(PARAM_WIDTH,
-                  (descisvisible) ? PARAM_HEIGHT : PARAM_CLOSEDHEIGHT));
-          me.validate();
-          pmlayout.refreshParamLayout();
+          jobOptions.add(pbox, "wrap");
+          // System.out.println("Wrap on "+pbox.option.getName());
+          cw = hgap + pbox.getSize().width;
+          fh = true;
         }
-      });
-      string.setWrapStyleWord(true);
-      string.setLineWrap(true);
-      string.setColumns(32);
-      string.setText(parm.getDescription());
-      JPanel firstrow = new JPanel();
-      firstrow.setLayout(null);
-      controlPanel.setLayout(new BorderLayout());
-      controlPanel.setBounds(new Rectangle(39, 10, PARAM_WIDTH - 70,
-              PARAM_CLOSEDHEIGHT - 50));
-      showDesc.setBounds(new Rectangle(10, 10, 16, 16));
-      firstrow.add(showDesc);
-      firstrow.add(controlPanel);
-      firstrow.setBounds(new Rectangle(10, 20, PARAM_WIDTH - 30,
-              PARAM_CLOSEDHEIGHT - 30));
-      add(firstrow);
-      validator = parm.getValidValue();
-      parameter = parm;
-      if (validator != null)
-      {
-        integ = validator.getType() == Type.Integer;
-      }
-      else
-      {
-        if (parameter.getPossibleValues() != null)
+        else
         {
-          choice = true;
+          jobOptions.add(pbox);
+        }
+        if (fh)
+        {
+          finalh += pbox.getSize().height + fl.getVgap();
+          fh = false;
         }
       }
-      updateControls(parm);
-      descPanel.setBounds(new Rectangle(10, PARAM_CLOSEDHEIGHT,
-              PARAM_WIDTH - 20, PARAM_HEIGHT - PARAM_CLOSEDHEIGHT - 5));
-      add(descPanel);
-      validate();
-    }
-
-    public void init()
-    {
-      // reset the widget's initial value.
-      lastVal = null;
+      jobOptions.revalidate();
     }
-
-    boolean adjusting = false;
-
-    Parameter parameter;
-
-    JComboBox choicebox;
-
-    public int getBoxHeight()
+    else
     {
-      return (descisvisible ? PARAM_HEIGHT : PARAM_CLOSEDHEIGHT);
+      jobOptions.setVisible(false);
     }
 
-    public void updateControls(Parameter parm)
+    // 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)
     {
-      adjusting = true;
-      boolean init = (choicebox == null && valueField == null);
-      float fVal = 0f;
-      int iVal = 0;
-      if (init)
+      paramList.removeAll();
+      paramList.setLayout(new MigLayout("", "", ""));
+      fh = true;
+      for (ParamBox pbox : opanp.getParamSet().values())
       {
-        if (choice)
+        pbox.validate();
+        cw += pbox.getSize().width + hgap;
+        if (cw + 160 > panewidth)
         {
-          choicebox = new JComboBox();
-          choicebox.addActionListener(this);
-          controlPanel.add(choicebox, BorderLayout.CENTER);
+          paramList.add(pbox, "wrap");
+          cw = pbox.getSize().width + hgap;
+          fh = true;
         }
         else
         {
-          slider = new JSlider();
-          slider.addChangeListener(this);
-          valueField = new JTextField();
-          valueField.addActionListener(this);
-          valueField.setPreferredSize(new Dimension(60, 25));
-          controlPanel.add(slider, BorderLayout.WEST);
-          controlPanel.add(valueField, BorderLayout.EAST);
-
-        }
-      }
-
-      if (parm != null)
-      {
-        if (choice)
-        {
-          if (init)
-          {
-            List vals = parm.getPossibleValues();
-            for (Object val : vals)
-            {
-              choicebox.addItem(val);
-            }
-          }
-
-          if (parm.getDefaultValue() != null)
-          {
-            choicebox.setSelectedItem(parm.getDefaultValue());
-          }
+          paramList.add(pbox);
         }
-        else
+        if (fh)
         {
-          valueField.setText(parm.getDefaultValue());
+          finalh += pbox.getSize().height + fl.getVgap();
+          fh = false;
         }
+
       }
-      lastVal = updateSliderFromValueField();
-      adjusting = false;
+      /*
+       * 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();
     }
-
-    Object lastVal;
-
-    public Parameter getParameter()
+    else
     {
-      try
-      {
-        if (choice)
-        {
-          parameter.setDefaultValue((String) choicebox.getSelectedItem());
-        }
-        else
-        {
-          parameter.setDefaultValue(valueField.getText());
-        }
-      } catch (WrongParameterException e)
-      {
-        e.printStackTrace();
-        return null;
-      }
-      return parameter;
+      paramList.setVisible(false);
     }
-
-    public Object updateSliderFromValueField()
-    {
-      int iVal;
-      float fVal;
-      if (validator != null)
-      {
-        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 };
-        }
-      }
-      else
-      {
-        if (!choice)
-        {
-          slider.setVisible(false);
-          return new String[]
-          { valueField.getText().trim() };
-        }
-        else
-        {
-          return new String[]
-          { (String) choicebox.getSelectedItem() };
-        }
-      }
-
-    }
-
-    public void stateChanged(ChangeEvent e)
-    {
-      if (!adjusting)
-      {
-        valueField.setText(""
-                + ((integ) ? ("" + (int) slider.getValue())
-                        : ("" + (float) (slider.getValue() / 1000f))));
-        checkIfModified();
-      }
-
-    }
-
-    public void actionPerformed(ActionEvent e)
-    {
-      if (adjusting)
-      {
-        return;
-      }
-      if (!choice)
-      {
-        updateSliderFromValueField();
-      }
-      checkIfModified();
-    }
-
-    private void checkIfModified()
-    {
-      Object cstate = updateSliderFromValueField();
-      boolean notmod = false;
-      if (cstate.getClass() == lastVal.getClass())
-      {
-        if (cstate instanceof int[])
-        {
-          notmod = (((int[]) cstate)[0] == ((int[]) lastVal)[0]);
-        }
-        else if (cstate instanceof float[])
-        {
-          notmod = (((float[]) cstate)[0] == ((float[]) lastVal)[0]);
-        }
-        else if (cstate instanceof String[])
-        {
-          notmod = (((String[]) cstate)[0].equals(((String[]) lastVal)[0]));
-        }
-      }
-      pmdialogbox.argSetModified(this, !notmod);
-    }
-  }
-
-  Map<String, OptionBox> optSet = new Hashtable<String, OptionBox>();
-
-  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()); // TODO: lock required options
-      enabled.setFont(new Font("Verdana", Font.PLAIN, 11));
-      enabled.setText(opt.getName());
-      enabled.setToolTipText(opt.getDescription());
-      enabled.addActionListener(this);
-      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.
-      setInitialValue();
-    }
-
-    public void resetToDefault()
-    {
-      enabled.setSelected(false);
-      if (option.isRequired())
-      {
-        // Apply default value
-        selectOption(option, option.getDefaultValue());
-      }
-    }
-
-    boolean initEnabled = false;
-
-    String initVal = null;
-
-    public void setInitialValue()
-    {
-      initEnabled = enabled.isSelected();
-      if (option.getPossibleValues() != null
-              && option.getPossibleValues().size() > 1)
-      {
-        initVal = (String) val.getSelectedItem();
-      }
-      else
-      {
-        initVal = null;
-      }
-    }
-
-    public Option getOptionIfEnabled()
-    {
-      if (!enabled.isSelected())
-      {
-        return null;
-      }
-      try
-      {
-        if (val.getSelectedItem() != null)
-        {
-          option.setDefaultValue((String) val.getSelectedItem());
-        }
-      } catch (WrongParameterException e)
-      {
-        e.printStackTrace();
-        return null;
-      }
-      return option;
-    }
-
-    public void actionPerformed(ActionEvent e)
-    {
-      if (e.getSource() != enabled)
-      {
-        enabled.setSelected(true);
-      }
-      checkIfModified();
-    }
-
-    private void checkIfModified()
-    {
-      boolean notmod = (initEnabled == enabled.isSelected());
-      if (enabled.isSelected() && initVal != null)
-      {
-        notmod |= initVal.equals(val.getSelectedItem());
-      }
-      argSetModified(this, !notmod);
-    }
-  }
-
-  private OptionBox addOption(Option opt)
-  {
-    OptionBox cb = optSet.get(opt.getName());
-    if (cb == null)
-    {
-      cb = new OptionBox(opt);
-      optSet.put(opt.getName(), cb);
-      jobOptions.add(cb);
-    }
-    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());
-    validate();
-  }
+    // 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();
+  }
 
   /**
    * testing method - grab a service and parameter set and show the window
@@ -1165,7 +931,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
     jalview.ws.jws2.Jws2Discoverer disc = jalview.ws.jws2.Jws2Discoverer
             .getDiscoverer();
     int p = 0;
-    if (args.length > 3)
+    if (args.length > 0)
     {
       Vector<String> services = new Vector<String>();
       services.addElement(args[p++]);
@@ -1180,236 +946,334 @@ public class WsJobParameters extends JPanel implements ItemListener,
       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<Preset> 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<Preset> 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<Preset> 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()
-        {
-
-          public void windowActivated(WindowEvent e)
+          Iterator<Preset> 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<Option> rg = lastserv.getRunnerConfig().getOptions();
+              for (Option o : rg)
+              {
+                try
+                {
+                  Option cpy = jalview.ws.jws2.ParameterUtils.copyOption(o);
+                } catch (Exception e)
+                {
+                  System.err.println("Failed to copy " + o.getName());
+                  e.printStackTrace();
+                } catch (Error e)
+                {
+                  System.err.println("Failed to copy " + o.getName());
+                  e.printStackTrace();
+                }
+              }
+            }
+            {
+              System.out.println("Testing param dupes:");
+              List<Parameter> rg = lastserv.getRunnerConfig()
+                      .getParameters();
+              for (Parameter o : rg)
+              {
+                try
+                {
+                  Parameter cpy = jalview.ws.jws2.ParameterUtils
+                          .copyParameter(o);
+                } catch (Exception e)
+                {
+                  System.err.println("Failed to copy " + o.getName());
+                  e.printStackTrace();
+                } catch (Error e)
+                {
+                  System.err.println("Failed to copy " + o.getName());
+                  e.printStackTrace();
+                }
+              }
+            }
+            {
+              System.out.println("Testing param write:");
+              List<String> writeparam = null, readparam = null;
+              try
+              {
+                writeparam = jalview.ws.jws2.ParameterUtils
+                        .writeParameterSet(
+                                pr.getArguments(lastserv.getRunnerConfig()),
+                                " ");
+                System.out.println("Testing param read :");
+                List<Option> pset = jalview.ws.jws2.ParameterUtils
+                        .processParameters(writeparam,
+                                lastserv.getRunnerConfig(), " ");
+                readparam = jalview.ws.jws2.ParameterUtils
+                        .writeParameterSet(pset, " ");
+                Iterator<String> o = pr.getOptions().iterator(), s = writeparam
+                        .iterator(), t = readparam.iterator();
+                boolean failed = false;
+                while (s.hasNext() && t.hasNext())
+                {
+                  String on = o.next(), sn = s.next(), st = t.next();
+                  if (!sn.equals(st))
+                  {
+                    System.out.println("Original was " + on
+                            + " Phase 1 wrote " + sn + "\tPhase 2 wrote "
+                            + st);
+                    failed = true;
+                  }
+                }
+                if (failed)
+                {
+                  System.out.println("Original parameters:\n"
+                          + pr.getOptions());
+                  System.out.println("Wrote parameters in first set:\n"
+                          + writeparam);
+                  System.out.println("Wrote parameters in second set:\n"
+                          + readparam);
+
+                }
+              } catch (Exception e)
+              {
+                e.printStackTrace();
+              }
+            }
+            WsJobParameters pgui = new WsJobParameters(lastserv,
+                    new JabaPreset(lastserv, pr));
+            JFrame jf = new JFrame("Parameters for "
+                    + lastserv.getActionText());
+            JPanel cont = new JPanel(new BorderLayout());
+            pgui.validate();
+            cont.setPreferredSize(pgui.getPreferredSize());
+            cont.add(pgui, BorderLayout.CENTER);
+            jf.setLayout(new BorderLayout());
+            jf.add(cont, BorderLayout.CENTER);
+            jf.validate();
+            final Thread thr = Thread.currentThread();
+            jf.addWindowListener(new WindowListener()
+            {
 
-          }
+              public void windowActivated(WindowEvent e)
+              {
+                // TODO Auto-generated method stub
 
-          public void windowClosed(WindowEvent e)
-          {
-          }
+              }
 
-          public void windowClosing(WindowEvent e)
-          {
-            thr.interrupt();
+              public void windowClosed(WindowEvent e)
+              {
+              }
 
-          }
+              public void windowClosing(WindowEvent e)
+              {
+                thr.interrupt();
 
-          public void windowDeactivated(WindowEvent e)
-          {
-            // TODO Auto-generated method stub
+              }
 
-          }
+              public void windowDeactivated(WindowEvent e)
+              {
+                // TODO Auto-generated method stub
 
-          public void windowDeiconified(WindowEvent e)
-          {
-            // TODO Auto-generated method stub
+              }
 
-          }
+              public void windowDeiconified(WindowEvent e)
+              {
+                // TODO Auto-generated method stub
 
-          public void windowIconified(WindowEvent e)
-          {
-            // TODO Auto-generated method stub
+              }
 
-          }
+              public void windowIconified(WindowEvent e)
+              {
+                // TODO Auto-generated method stub
 
-          public void windowOpened(WindowEvent e)
-          {
-            // TODO Auto-generated method stub
+              }
 
-          }
+              public void windowOpened(WindowEvent e)
+              {
+                // TODO Auto-generated method stub
 
-        });
-        jf.setVisible(true);
-        boolean inter = false;
-        while (!inter)
-        {
-          try
-          {
-            Thread.sleep(10000);
-          } catch (Exception e)
-          {
-            inter = true;
+              }
+
+            });
+            jf.setVisible(true);
+            boolean inter = false;
+            while (!inter)
+            {
+              try
+              {
+                Thread.sleep(10000);
+              } catch (Exception e)
+              {
+                inter = true;
+              }
+              ;
+            }
+            jf.dispose();
           }
-          ;
         }
-        jf.dispose();
       }
     }
   }
 
-  public List<Argument> getJobParams()
+  public boolean isServiceDefaults()
   {
-    List<Argument> argSet = new ArrayList<Argument>();
-    // recover options and parameters from GUI
-    for (OptionBox opts : optSet.values())
-    {
-      Option opt = opts.getOptionIfEnabled();
-      if (opt != null)
-      {
-        argSet.add(opt);
-      }
-    }
-    for (ParamBox parambox : paramSet.values())
-    {
-      Parameter parm = parambox.getParameter();
-      if (parm != null)
-      {
-        argSet.add(parm);
-      }
-    }
+    return (!isModified() && (lastParmSet != null && lastParmSet
+            .equals(SVC_DEF)));
+  }
 
-    return argSet;
+  public List<ArgumentI> getJobParams()
+  {
+    return opanp.getCurrentSettings();
   }
 
   String lastParmSet = null;
 
-  Hashtable<String, Object[]> editedParams = new Hashtable<String, Object[]>();
-
-  /**
+  /*
+   * 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<Argument> 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;
-  }
-
-  private Object[] _getUserPreset(String setName)
-  {
-    return editedParams.get(setName);
-  }
-
-  /**
-   * remove the given user preset from the preset stash
+   * @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 _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 items = new Vector();
     while (n < setName.getItemCount())
     {
       String item = (String) setName.getItemAt(n);
-      if (!isServicePreset(item) && _getUserPreset(item) == null)
+      if (!item.equals(SVC_DEF) && !paramStore.presetExists(item))
       {
         setName.removeItemAt(n);
       }
       else
       {
+        items.addElement(item);
         n++;
       }
-
+    }
+    if (!items.contains(SVC_DEF))
+    {
+      setName.addItem(SVC_DEF);
+    }
+    for (WsParamSetI upn : paramStore.getPresets())
+    {
+      if (!items.contains(upn.getName()))
+      {
+        setName.addItem(upn.getName());
+      }
     }
   }
 
+  /**
+   * true if lastParmSet is a user preset
+   */
+  boolean isUserPreset = false;
+
   private void reInitDialog(String nextPreset)
   {
     settingDialog = true;
-    syncSetNamesWithStore();
-    // updateTable(null,null);
-    Object[] pset = _getUserPreset(nextPreset);
-    if (pset != null)
+    // updateTable(null,null); // first reset to defaults
+    WsParamSetI pset = null;
+    if (nextPreset != null && nextPreset.length() > 0)
     {
-      setDescr.setText((String) pset[1]);
-      updateTable(null, (List<Argument>) pset[2]);
-      lastParmSet = nextPreset;
-      validate();
+      pset = paramStore.getPreset(nextPreset);
     }
-    else
+    if (pset != null)
     {
-      setDescr.setText("");
-      // must be a default preset from service
-      Preset p = null;
-      try
+      if (pset.isModifiable())
       {
-        PresetManager prman = service.getPresets();
-        if (prman != null)
-        {
-          p = prman.getPresetByName(nextPreset);
-        }
-      } catch (Exception ex)
-      {
-        ex.printStackTrace();
-      }
-      if (p != null)
-      {
-        updateTable(p, null);
+        isUserPreset = true;
+        setDescr.setText(pset.getDescription());
+        updateTable(null, pset.getArguments());
         lastParmSet = nextPreset;
       }
       else
       {
-        updateTable(null, null);
+        isUserPreset = false;
+        setDescr.setText("");
+        // must be a default preset from service
+        updateTable(pset, null);
+        lastParmSet = nextPreset;
       }
     }
+    else
+    {
+      isUserPreset = false;
+      // Service defaults
+      setDescr.setText("");
+      updateTable(null, null);
+      lastParmSet = SVC_DEF;
+    }
+
     initArgSetModified();
+    syncSetNamesWithStore();
+    setName.setSelectedItem(lastParmSet);
+    SetNamePanel.validate();
     validate();
     settingDialog = false;
 
@@ -1419,31 +1283,90 @@ public class WsJobParameters extends JPanel implements ItemListener,
 
   public void itemStateChanged(ItemEvent e)
   {
-    if (settingDialog)
-    {
-      // ignore event
-      return;
-    }
-    if (e.getSource() == setName)
+    if (e.getSource() == setName && e.getStateChange() == e.SELECTED)
     {
-      String setname = (String) setName.getSelectedItem();
+      final String setname = (String) setName.getSelectedItem();
+      System.out.println("Item state changed for " + setname
+              + " (handling ? " + !settingDialog + ")");
+      if (settingDialog)
+      {
+        // ignore event
+        return;
+      }
       if (setname == null)
       {
         return;
       }
-      if (curSetName == null || !setname.equals(curSetName))
+      javax.swing.SwingUtilities.invokeLater(new Runnable()
       {
-        if (isModified()
-                && javax.swing.JOptionPane.showConfirmDialog(this,
-                        "Parameter set is modifed - save ?",
-                        "Save changes ?",
-                        javax.swing.JOptionPane.OK_CANCEL_OPTION) == JOptionPane.OK_OPTION)
+        public void run()
         {
-          savModified_actionPerformed(null);
+          doPreferenceComboStateChange(setname);
         }
-        reInitDialog(setname);
+      });
+    }
+  }
+
+  private void doPreferenceComboStateChange(String setname)
+  {
+    // user has selected a different item from combo-box
+    if (isModified())
+    {
+      String lsetname = (curSetName != null) ? curSetName : lastParmSet;
+      if (lsetname.equals(setname))
+      {
+        // setname was just edited - so ignore this event.
+        return;
+      }
+      settingDialog = true;
+      System.out.println("Prompting to save " + lsetname);
+      if (javax.swing.JOptionPane
+              .showConfirmDialog(
+                      this,
+                      "Parameter set '"
+                              + lsetname
+                              + "' is modifed, and your changes will be lost.\nReally change preset ?",
+                      "Warning: Unsaved Changes",
+                      javax.swing.JOptionPane.OK_CANCEL_OPTION) != JOptionPane.OK_OPTION)
+      {
+        // 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;
+
+  }
+
+  private void _renameExistingPreset(String oldName, String curSetName2)
+  {
+    paramStore.updatePreset(oldName, curSetName2, setDescr.getText(),
+            getJobParams());
+  }
+
+  /**
+   * 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());
+
   }
 
   /**
@@ -1464,25 +1387,38 @@ public class WsJobParameters extends JPanel implements ItemListener,
       if (src.getParent() == setName)
       {
         // rename any existing records we know about for this set.
-        String newname = (String) e.getActionCommand();
-        String msg=null;
-        if (isServicePreset(newname)) {
-          JOptionPane.showConfirmDialog(this, "Invalid name - preset already exists.", "Invalid name", JOptionPane.OK_OPTION);
+        String newname = (String) e.getActionCommand().trim();
+        String msg = null;
+        if (isServicePreset(newname))
+        {
+          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()
+          {
+            public void run()
+            {
+              JOptionPane.showMessageDialog(ourframe,
+                      "Invalid name - preset already exists.",
+                      "Invalid name", JOptionPane.WARNING_MESSAGE);
+            }
+          });
+
           return;
         }
         curSetName = newname;
-        System.err.println("Command " + curSetName + " : "
-                + setName.getSelectedItem());
-        if (curSetName.trim().equals(setName.getSelectedItem()))
+        System.err.println("New name for user setting " + curSetName
+                + " (was " + setName.getSelectedItem() + ")");
+        if (curSetName.equals(setName.getSelectedItem()))
         {
           curSetName = null;
         }
         if (curSetName != null)
         {
-          setName.addItem(curSetName);
-          setName.setSelectedItem(curSetName);
-          argSetModified(setName,
-                  lastSetName != null && !curSetName.equals(lastSetName));
+          argSetModified(setName, true);
           return;
         }
 
@@ -1517,4 +1453,21 @@ public class WsJobParameters extends JPanel implements ItemListener,
   {
     checkDescrModified();
   }
-}
\ No newline at end of file
+
+  /**
+   * 
+   * @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
+    {
+      return paramStore.getPreset(lastParmSet);
+    }
+  }
+}