X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FWsJobParameters.java;h=09499ffde6168f132075c695b71a35262ce3d90e;hb=153dd62dc91da13ae732600e6ea55ddbe15eab39;hp=b651833c42962bebcca0e530b172ed3c805f37bd;hpb=c6016c2fdffb1f7f84e44fbc0a1c0630d89ca17e;p=jalview.git
diff --git a/src/jalview/gui/WsJobParameters.java b/src/jalview/gui/WsJobParameters.java
index b651833..09499ff 100644
--- a/src/jalview/gui/WsJobParameters.java
+++ b/src/jalview/gui/WsJobParameters.java
@@ -1,3 +1,20 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
+ * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ *
+ * This file is part of Jalview.
+ *
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ */
package jalview.gui;
import java.awt.BorderLayout;
@@ -23,6 +40,7 @@ import java.awt.event.MouseListener;
import java.awt.event.WindowEvent;
import java.awt.event.WindowListener;
import java.awt.event.WindowStateListener;
+import java.net.URL;
import java.util.ArrayList;
import java.util.EventObject;
import java.util.HashSet;
@@ -32,18 +50,23 @@ import java.util.List;
import java.util.Map;
import java.util.Vector;
+import javax.swing.InputVerifier;
import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
+import javax.swing.JComponent;
import javax.swing.JDialog;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JList;
+import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
import javax.swing.JScrollPane;
import javax.swing.JSlider;
import javax.swing.JSplitPane;
+import javax.swing.JTabbedPane;
import javax.swing.JTable;
import javax.swing.JTextArea;
import javax.swing.JTextField;
@@ -68,8 +91,20 @@ import compbio.metadata.ValueConstrain;
import compbio.metadata.WrongParameterException;
import compbio.metadata.ValueConstrain.Type;
+import jalview.util.jarInputStreamProvider;
+import jalview.ws.jws2.JabaParamStore;
+import jalview.ws.jws2.JabaPreset;
import jalview.ws.jws2.Jws2Discoverer;
+import jalview.ws.jws2.ParameterUtils;
import jalview.ws.jws2.Jws2Discoverer.Jws2Instance;
+import jalview.ws.jws2.dm.JabaOption;
+import jalview.ws.jws2.dm.JabaParameter;
+import jalview.ws.params.ArgumentI;
+import jalview.ws.params.OptionI;
+import jalview.ws.params.ParamDatastoreI;
+import jalview.ws.params.ParameterI;
+import jalview.ws.params.ValueConstrainI;
+import jalview.ws.params.WsParamSetI;
/**
* job parameter editing/browsing dialog box. User can browse existing settings
@@ -89,6 +124,7 @@ import jalview.ws.jws2.Jws2Discoverer.Jws2Instance;
public class WsJobParameters extends JPanel implements ItemListener,
ActionListener, DocumentListener
{
+ URL linkImageURL = getClass().getResource("/images/link.gif");
private static final String SVC_DEF = "Defaults"; // this is the null
// parameter set as shown to
// user
@@ -105,20 +141,21 @@ public class WsJobParameters extends JPanel implements ItemListener,
JSplitPane settingsPanel = new JSplitPane();
JSplitPane jobPanel = new JSplitPane();
-
+ boolean split=true;
+ JTabbedPane tabpanels=new JTabbedPane();
JPanel jobOptions = 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 +167,20 @@ public class WsJobParameters extends JPanel implements ItemListener,
JScrollPane paramPane = new JScrollPane();
- // JList paramList = new JList();
JPanel paramList = new JPanel();
RunnerConfig serviceOptions;
- private BorderLayout jparamLayout;
+ ParamDatastoreI paramStore;
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 +188,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,
+ WsParamSetI preset, List jobArgset)
+ {
+ this(parent, null, service, preset, jobArgset);
+ }
+
+ /**
+ *
+ * @param parent
+ * @param paramStorei
+ * @param service
+ * @param preset
+ * @param jobArgset
*/
- public WsJobParameters(JFrame parent, Jws2Instance service, Preset p,
- List jobArgset)
+ public WsJobParameters(JFrame parent, ParamDatastoreI paramStorei,
+ Jws2Instance service, WsParamSetI preset, List jobArgset)
{
super();
jbInit();
+ 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 +226,11 @@ public class WsJobParameters extends JPanel implements ItemListener,
JDialog frame = null;
+ /**
+ * shows a modal dialog containing the parameters.
+ *
+ * @return
+ */
public boolean showRunDialog()
{
@@ -178,9 +239,22 @@ 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));
+ (int) (deskr.getCenterY() - 250), 480, 500));
frame.setContentPane(this);
-
+ // should recover defaults from user prefs.
+ //settingsPanel.setDividerLocation(0.4);
+ //jobPanel.setDividerLocation(0.5);
+ frame.validate();
+ if (split) {
+ javax.swing.SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ settingsPanel.setDividerLocation(0.5);
+ jobPanel.setDividerLocation(setDescr.getLineCount()>3 ? 0.35 : 0.16 );
+ }
+ });
+ } else {
+ tabpanels.setSelectedComponent(jobOptionsPane);
+ }
frame.setVisible(true);
if (response > 0)
@@ -190,72 +264,53 @@ 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 :) ",
+ updatepref = JvSwingUtils.makeButton("Update", "Update this existing 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("Delete", "Delete the currently selected 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("Create", "Create a new parameter set with the current settings.",
new ActionListener()
{
public void actionPerformed(ActionEvent e)
{
- deleteSetting_actionPerformed(e);
+ create_actionPerformed(e);
}
});
- revertsetting = makeButton("Revert", "Undo changes to parameters.",
- new ActionListener()
+ revertpref = JvSwingUtils.makeButton("Revert",
+ "Undo all changes to the current parameter set", new ActionListener()
{
public void actionPerformed(ActionEvent e)
{
- revertSetting_actionPerformed(e);
+ revert_actionPerformed(e);
}
});
-
- startjob.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
- startjob.setText("Start");
- startjob.setToolTipText("Start Job");
- startjob.addActionListener(new ActionListener()
+ startjob = JvSwingUtils.makeButton("Start Job", "Start Job with current settings.",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()
+ canceljob = JvSwingUtils.makeButton("Cancel Job", "Close this dialog and cancel job.", new ActionListener()
{
public void actionPerformed(ActionEvent e)
{
@@ -271,30 +326,43 @@ public class WsJobParameters extends JPanel implements ItemListener,
setDescr.setBackground(getBackground());
setDescr.setEditable(true);
setDescr.getDocument().addDocumentListener(this);
+ setDescr.setToolTipText("Click to edit the notes for this parameter set.");
JScrollPane setDescrView = new JScrollPane();
// setDescrView.setPreferredSize(new Dimension(350, 200));
setDescrView.getViewport().setView(setDescr);
setName.setEditable(true);
setName.addItemListener(this);
setName.getEditor().addActionListener(this);
- SetNamePanel.setLayout(new BorderLayout());
- SetNamePanel.add(setName, BorderLayout.WEST);
+ JPanel setNameInfo = new JPanel(new FlowLayout(FlowLayout.LEFT));
+ SetNamePanel.setLayout(new GridLayout(2, 1));
+ SetNamePanel.setMinimumSize(new Dimension(300, 40));
+ JLabel setNameLabel = new JLabel("Current parameter set name :");
+ setNameLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
+ // setNameLabel.setHorizontalAlignment(FlowLayout.LEFT);
+ 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);
+ setsavebuts.add(deletepref);
+ setsavebuts.add(revertpref);
+ setsavebuts.add(createpref);
+ setsavebuts.add(updatepref);
+ setsavebuts.setSize(new Dimension(150, 20));
+ JPanel buttonArea = new JPanel(new GridLayout(1, 1));
+ buttonArea.add(setsavebuts);
+ SetNamePanel.add(setNameInfo);
+ SetNamePanel.add(buttonArea);
setDetails.add(setDescrView, BorderLayout.CENTER);
- // setDetails.setPreferredSize(new Dimension(360, 100));
+ //setDetails.setPreferredSize(new Dimension(360, 100));
jobParameters.setBorder(new TitledBorder("Parameters"));
- jobParameters.setLayout(jparamLayout = new BorderLayout());
+ jobParameters.setLayout(new BorderLayout());
paramPane.setPreferredSize(new Dimension(360, 300));
paramPane.getVerticalScrollBar().setUnitIncrement(20);
// paramPanel.setPreferredSize(new Dimension(360, 300));
@@ -306,19 +374,23 @@ public class WsJobParameters extends JPanel implements ItemListener,
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);
-
+
setLayout(new BorderLayout());
- // setPreferredSize(new Dimension(400, 600));
- // setSize(new Dimension(400, 600));
jobPanel.setLeftComponent(setDetails);
- jobPanel.setRightComponent(settingsPanel);
+ if (split) {
+ settingsPanel.setLeftComponent(jobOptionsPanel);
+ settingsPanel.setRightComponent(jobParameters);
+ settingsPanel.setOrientation(JSplitPane.VERTICAL_SPLIT);
+ jobPanel.setRightComponent(settingsPanel);
+ } else {
+ jobPanel.setRightComponent(tabpanels);
+ jobOptionsPane.setName("Options");
+ tabpanels.add(jobOptionsPane);
+ paramPane.setName("Parameters");
+ tabpanels.add(paramPane);
+ }
jobPanel.setOrientation(JSplitPane.VERTICAL_SPLIT);
- jobPanel.setDividerLocation(0.8);
- add(SetNamePanel, BorderLayout.NORTH);
+ add(SetNamePanel, BorderLayout.NORTH);
add(jobPanel, BorderLayout.CENTER);
JPanel dialogpanel = new JPanel();
dialogpanel.add(startjob);
@@ -326,50 +398,55 @@ public class WsJobParameters extends JPanel implements ItemListener,
add(dialogpanel, BorderLayout.SOUTH);
}
- 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)
- {
- _deleteUserPreset(setname);
-
- }
- if (p>0 && p+1==setName.getItemCount())
+ if (isUserPreset)
{
- p--;
+ String curname = ((String) setName.getSelectedItem()).trim();
+ _updatePreset(lastParmSet, curname);
+ lastParmSet = curname;
+ isUserPreset = true;
+ initArgSetModified();
+ syncSetNamesWithStore();
}
- 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,11 +479,18 @@ public class WsJobParameters extends JPanel implements ItemListener,
*/
boolean settingDialog = false;
- void initForService(Jws2Instance service, Preset p,
- List jobArgset)
+ void initForService(Jws2Instance service, WsParamSetI jabap,
+ List jabajobArgset)
{
+ WsParamSetI p = null;
+ List jobArgset = null;
settingDialog = true;
- this.service = service;
+ { // instantiate the abstract proxy for Jaba objects
+ jobArgset = jabajobArgset == null ? null : JabaParamStore
+ .getJwsArgsfromJaba(jabajobArgset);
+ p = jabap; // (jabap != null) ? paramStore.getPreset(jabap.getName()) :
+ // null;
+ }
// TODO: Recover window geometry prefs for this service
// jobPanel.setDividerLocation(proportionalLocation)
// settingsPanel.setDividerLocation(proportionalLocation)
@@ -415,67 +499,81 @@ public class WsJobParameters extends JPanel implements ItemListener,
{
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())
+ {
+ servicePresets.put(pr.getName(), "preset");
+ }
+ else
{
- for (Object pr : prList)
- {
- servicePresets.put(((Preset) pr).getName(), "preset");
- if (!exnames.contains(((Preset) pr).getName()))
- {
- setName.addItem(((Preset) pr).getName());
- }
- }
+ }
+ 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";
+ updateTable(p, jobArgset);
+ }
+ else
+ {
+ curSetName = null;
+ reInitDialog(null);
}
}
- updateTable(p, jobArgset);
- initArgSetModified();
settingDialog = false;
}
@SuppressWarnings("unchecked")
- private void updateTable(Preset p, List jobArgset)
+ private void updateTable(WsParamSetI p, List jobArgset)
{
- List setargs = new ArrayList();
// populate table from default parameter set.
- List args = serviceOptions.getArguments();
+ List args = paramStore.getServiceParameters();
// split to params and required arguments
{
- for (Argument arg : args)
+ 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;
+ ParameterI parm = (ParameterI) myarg;
addParameter(parm);
}
else
{
- if (myarg instanceof Option)
+ if (myarg instanceof OptionI)
{
- Option opt = (Option) myarg;
+ OptionI opt = (OptionI) myarg;
addOption(opt).resetToDefault();
}
else
{
System.err.println("Ignoring unknown service argument type "
- + arg.getClass().getName());
+ + myarg.getClass().getName());
}
}
}
@@ -483,26 +581,28 @@ 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)
{
+ isUserPreset = false;
// first call - so create a dummy name
+
setName.setSelectedItem(lastSetName = SVC_DEF);
}
}
@@ -515,19 +615,20 @@ 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);
+ 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());
+ selectOption((OptionI) arg, arg.getDefaultValue());
}
}
@@ -539,7 +640,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
jobOptions.setLayout(new GridLayout(optSet.size(), 1));
refreshParamLayout();
paramPane.validate();
- validate();
+ revalidate();
}
private boolean isModified()
@@ -556,9 +657,35 @@ 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)
@@ -567,46 +694,27 @@ public class WsJobParameters extends JPanel implements ItemListener,
{
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 +727,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,41 +763,37 @@ 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)
+ private void addParameter(ParameterI arg)
{
- ParamBox pb = paramSet.get(parm.getName());
+ ParamBox pb = paramSet.get(arg.getName());
if (pb == null)
{
- pb = new ParamBox(this, parm);
- paramSet.put(parm.getName(), pb);
+ pb = new ParamBox(this, arg);
+ paramSet.put(arg.getName(), pb);
paramList.add(pb);
}
pb.init();
// take the defaults from the parameter
- pb.updateControls(parm);
+ pb.updateControls(arg);
}
- private void setParameter(Parameter arg)
+ private void setParameter(ParameterI arg)
{
ParamBox pb = paramSet.get(arg.getName());
if (pb == null)
@@ -692,27 +807,27 @@ public class WsJobParameters extends JPanel implements ItemListener,
}
- private void selectOption(Option opt, String string)
+ private void selectOption(OptionI option, String string)
{
- OptionBox cb = optSet.get(opt.getName());
+ OptionBox cb = optSet.get(option.getName());
if (cb == null)
{
- cb = addOption(opt);
+ cb = addOption(option);
}
- cb.enabled.setSelected(true); // initial state for an option.
+ cb.enabled.setSelected(string != null); // initial state for an option.
if (string != null)
{
- if (opt.getPossibleValues().contains(string))
+ if (option.getPossibleValues().contains(string))
{
cb.val.setSelectedItem(string);
}
else
{
- throw new Error("Invalid value " + string + " for option " + opt);
+ throw new Error("Invalid value " + string + " for option " + option);
}
}
- if (opt.isRequired() && !cb.enabled.isSelected())
+ if (option.isRequired() && !cb.enabled.isSelected())
{
// TODO: indicate paramset is not valid.. option needs to be selected!
}
@@ -722,7 +837,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
Map paramSet = new Hashtable();
public class ParamBox extends JPanel implements ChangeListener,
- ActionListener
+ ActionListener, MouseListener
{
JButton showDesc = new JButton();
@@ -734,7 +849,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
JTextField valueField = null;
- ValueConstrain validator = null;
+ ValueConstrainI validator = null;
JPanel settingPanel = new JPanel();
@@ -748,7 +863,9 @@ public class WsJobParameters extends JPanel implements ItemListener,
final WsJobParameters pmdialogbox;
- public ParamBox(final WsJobParameters pmlayout, Parameter parm)
+ final URL finfo;
+
+ public ParamBox(final WsJobParameters pmlayout, ParameterI parm)
{
pmdialogbox = pmlayout;
setPreferredSize(new Dimension(PARAM_WIDTH, PARAM_CLOSEDHEIGHT));
@@ -766,10 +883,19 @@ public class WsJobParameters extends JPanel implements ItemListener,
// string.setMinimumSize(new Dimension(140,80));
// string.setMaximumSize(new Dimension(280,80));
final ParamBox me = this;
+ finfo = parm.getFurtherDetails();
+ if (finfo != null)
+ {
+ showDesc.setToolTipText(""+JvSwingUtils.wrapTooltip("Click to show brief description
Right click for further information.")+"");
+ showDesc.addMouseListener(this);
+ }
+ else
+ {
+ showDesc.setToolTipText(""+JvSwingUtils.wrapTooltip("Click to show brief description.")+"");
+ }
showDesc.addActionListener(new ActionListener()
{
- @Override
public void actionPerformed(ActionEvent e)
{
descisvisible = !descisvisible;
@@ -823,7 +949,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
boolean adjusting = false;
- Parameter parameter;
+ ParameterI parameter;
JComboBox choicebox;
@@ -832,7 +958,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
return (descisvisible ? PARAM_HEIGHT : PARAM_CLOSEDHEIGHT);
}
- public void updateControls(Parameter parm)
+ public void updateControls(ParameterI parm)
{
adjusting = true;
boolean init = (choicebox == null && valueField == null);
@@ -888,24 +1014,18 @@ public class WsJobParameters extends JPanel implements ItemListener,
Object lastVal;
- public Parameter getParameter()
+ public ParameterI getParameter()
{
- try
+ ParameterI prm = parameter.copy();
+ if (choice)
{
- if (choice)
- {
- parameter.setDefaultValue((String) choicebox.getSelectedItem());
- }
- else
- {
- parameter.setDefaultValue(valueField.getText());
- }
- } catch (WrongParameterException e)
+ prm.setDefaultValue((String) choicebox.getSelectedItem());
+ }
+ else
{
- e.printStackTrace();
- return null;
+ prm.setDefaultValue(valueField.getText());
}
- return parameter;
+ return prm;
}
public Object updateSliderFromValueField()
@@ -921,6 +1041,20 @@ public class WsJobParameters extends JPanel implements ItemListener,
{
valueField.setText(valueField.getText().trim());
iVal = Integer.valueOf(valueField.getText());
+ if (validator.getMin() != null
+ && validator.getMin().intValue() > iVal)
+ {
+ iVal = validator.getMin().intValue();
+ // TODO: provide visual indication that hard limit was reached for
+ // this parameter
+ }
+ if (validator.getMax() != null
+ && validator.getMax().intValue() < iVal)
+ {
+ iVal = validator.getMax().intValue();
+ // TODO: provide visual indication that hard limit was reached for
+ // this parameter
+ }
} catch (Exception e)
{
}
@@ -944,6 +1078,20 @@ public class WsJobParameters extends JPanel implements ItemListener,
try
{
fVal = Float.valueOf(valueField.getText());
+ if (validator.getMin() != null
+ && validator.getMin().floatValue() > fVal)
+ {
+ fVal = validator.getMin().floatValue();
+ // TODO: provide visual indication that hard limit was reached for
+ // this parameter
+ }
+ if (validator.getMax() != null
+ && validator.getMax().floatValue() < fVal)
+ {
+ fVal = validator.getMax().floatValue();
+ // TODO: provide visual indication that hard limit was reached for
+ // this parameter
+ }
} catch (Exception e)
{
}
@@ -979,7 +1127,6 @@ public class WsJobParameters extends JPanel implements ItemListener,
}
- @Override
public void stateChanged(ChangeEvent e)
{
if (!adjusting)
@@ -992,7 +1139,6 @@ public class WsJobParameters extends JPanel implements ItemListener,
}
- @Override
public void actionPerformed(ActionEvent e)
{
if (adjusting)
@@ -1027,27 +1173,82 @@ public class WsJobParameters extends JPanel implements ItemListener,
}
pmdialogbox.argSetModified(this, !notmod);
}
+
+ public void mouseClicked(MouseEvent e)
+ {
+ if (javax.swing.SwingUtilities.isRightMouseButton(e))
+ {
+ showUrlPopUp(this, finfo.toString(), e.getX(), e.getY());
+ }
+ }
+
+ public void mousePressed(MouseEvent e)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void mouseReleased(MouseEvent e)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void mouseEntered(MouseEvent e)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void mouseExited(MouseEvent e)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
}
Map optSet = new Hashtable();
- public class OptionBox extends JPanel implements ActionListener
+ public class OptionBox extends JPanel implements MouseListener,
+ ActionListener
{
JComboBox val = new JComboBox();
JCheckBox enabled = new JCheckBox();
- Option option;
+ JLabel optlabel = new JLabel();
+
+ final URL finfo;
+
+ boolean hasLink = false;
- public OptionBox(Option opt)
+ OptionI option;
+
+ public OptionBox(OptionI opt)
{
option = opt;
setLayout(new BorderLayout());
enabled.setSelected(opt.isRequired()); // TODO: lock required options
enabled.setFont(new Font("Verdana", Font.PLAIN, 11));
+ enabled.setText("");
enabled.setText(opt.getName());
- enabled.setToolTipText(opt.getDescription());
enabled.addActionListener(this);
+ finfo = option.getFurtherDetails();
+ if (finfo != null)
+ {
+ hasLink = true;
+ // optlabel.setToolTipText(""+opt.getDescription()+"
");
+ enabled.setToolTipText("" + JvSwingUtils.wrapTooltip(opt.getDescription()+"
")
+ + "");
+ // optlabel.addMouseListener(this);
+ enabled.addMouseListener(this);
+ }
+ else
+ {
+ // optlabel.setToolTipText(opt.getDescription());
+ enabled.setToolTipText(""+JvSwingUtils.wrapTooltip(opt.getDescription())+"");
+ }
add(enabled, BorderLayout.NORTH);
if (opt.getPossibleValues().size() > 1)
{
@@ -1090,31 +1291,25 @@ public class WsJobParameters extends JPanel implements ItemListener,
}
else
{
- initVal = null;
+ initVal = (initEnabled) ? option.getDefaultValue() : null;
}
}
- public Option getOptionIfEnabled()
+ public OptionI getOptionIfEnabled()
{
if (!enabled.isSelected())
{
return null;
}
- try
- {
- if (val.getSelectedItem() != null)
- {
- option.setDefaultValue((String) val.getSelectedItem());
- }
- } catch (WrongParameterException e)
+ OptionI opt = option.copy();
+
+ if (val.getSelectedItem() != null)
{
- e.printStackTrace();
- return null;
+ opt.setDefaultValue((String) val.getSelectedItem());
}
- return option;
+ return opt;
}
- @Override
public void actionPerformed(ActionEvent e)
{
if (e.getSource() != enabled)
@@ -1127,15 +1322,61 @@ public class WsJobParameters extends JPanel implements ItemListener,
private void checkIfModified()
{
boolean notmod = (initEnabled == enabled.isSelected());
- if (enabled.isSelected() && initVal != null)
+ if (enabled.isSelected())
+ {
+ if (initVal != null)
+ {
+ notmod &= initVal.equals(val.getSelectedItem());
+ }
+ else
+ {
+ // compare against default service setting
+ notmod &= option.getDefaultValue() == null
+ || option.getDefaultValue().equals(val.getSelectedItem());
+ }
+ }
+ else
{
- notmod |= initVal.equals(val.getSelectedItem());
+ notmod &= initVal == null;
}
argSetModified(this, !notmod);
}
+
+ public void mouseClicked(MouseEvent e)
+ {
+ if (javax.swing.SwingUtilities.isRightMouseButton(e))
+ {
+ showUrlPopUp(this, finfo.toString(), e.getX(), e.getY());
+ }
+ }
+
+ public void mousePressed(MouseEvent e)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void mouseReleased(MouseEvent e)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void mouseEntered(MouseEvent e)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void mouseExited(MouseEvent e)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
}
- private OptionBox addOption(Option opt)
+ private OptionBox addOption(OptionI opt)
{
OptionBox cb = optSet.get(opt.getName());
if (cb == null)
@@ -1147,15 +1388,36 @@ public class WsJobParameters extends JPanel implements ItemListener,
return cb;
}
+ public static void showUrlPopUp(JComponent invoker, final String finfo,
+ int x, int y)
+ {
+
+ JPopupMenu mnu = new JPopupMenu();
+ JMenuItem mitem = new JMenuItem("View " + finfo);
+ mitem.addActionListener(new ActionListener()
+ {
+
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ Desktop.showUrl(finfo);
+
+ }
+ });
+ mnu.add(mitem);
+ mnu.show(invoker, x, y);
+ }
+
protected void refreshParamLayout()
{
- int s = 100;
+ FlowLayout fl = new FlowLayout();
+ paramList.setLayout(fl);
+ int s = 2 * fl.getVgap();
for (ParamBox pbox : paramSet.values())
{
- s += pbox.getBoxHeight();
+ s += fl.getVgap() + pbox.getBoxHeight(); // getBoxHeight();
}
paramList.setPreferredSize(new Dimension(PARAM_WIDTH, s));
- paramList.setLayout(new FlowLayout());
validate();
}
@@ -1188,122 +1450,210 @@ public class WsJobParameters extends JPanel implements ItemListener,
for (Jws2Discoverer.Jws2Instance service : disc.getServices())
{
lastserv = service;
- if (p < args.length && service.serviceType.equalsIgnoreCase(args[p]))
- {
- break;
- }
- }
- if (lastserv != null)
- {
- List prl = null;
- Preset pr = null;
- if (++p < args.length)
+ if (p >= args.length || service.serviceType.equalsIgnoreCase(args[p]))
{
- PresetManager prman = lastserv.getPresets();
- if (prman != null)
+ if (lastserv != null)
{
- pr = prman.getPresetByName(args[p]);
- if (pr == null)
+ List prl = null;
+ Preset pr = null;
+ if (++p < args.length)
{
- // just grab the last preset.
- prl = prman.getPresets();
+ PresetManager prman = lastserv.getPresets();
+ if (prman != null)
+ {
+ pr = prman.getPresetByName(args[p]);
+ if (pr == null)
+ {
+ // just grab the last preset.
+ prl = prman.getPresets();
+ }
+ }
}
- }
- }
- Iterator en = (prl == null) ? null : prl.iterator();
- while (true)
- {
- if (en != null)
- {
- if (!en.hasNext())
+ else
{
- en = prl.iterator();
+ PresetManager prman = lastserv.getPresets();
+ if (prman != null)
+ {
+ prl = prman.getPresets();
+ }
}
- pr = en.next();
- }
- WsJobParameters pgui = new WsJobParameters(lastserv, pr);
- JFrame jf = new JFrame("Parameters for " + lastserv.getActionText());
- JPanel cont = new JPanel();
- // jf.setPreferredSize(new Dimension(600, 800));
- cont.add(pgui);
- jf.add(cont);
- final Thread thr = Thread.currentThread();
- jf.addWindowListener(new WindowListener()
- {
-
- @Override
- public void windowActivated(WindowEvent e)
+ Iterator en = (prl == null) ? null : prl.iterator();
+ while (en != null && en.hasNext())
{
- // TODO Auto-generated method stub
+ if (en != null)
+ {
+ if (!en.hasNext())
+ {
+ en = prl.iterator();
+ }
+ pr = en.next();
+ }
+ {
+ System.out.println("Testing opts dupes for "
+ + lastserv.getUri() + " : "
+ + lastserv.getActionText() + ":" + pr.getName());
+ List