X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FWsJobParameters.java;h=2da6106cd594bef9f9c50462db0a13efeafbc1d0;hb=6486a5333807ca300db4a28a6bf9899f5dddf5a6;hp=e639b41954576382dc10b75fdabb5b1ebdfa2037;hpb=1cc07f96279fa63ebaab79ff42d37e981da6c95f;p=jalview.git diff --git a/src/jalview/gui/WsJobParameters.java b/src/jalview/gui/WsJobParameters.java index e639b41..2da6106 100644 --- a/src/jalview/gui/WsJobParameters.java +++ b/src/jalview/gui/WsJobParameters.java @@ -23,6 +23,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 +33,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; @@ -54,6 +60,8 @@ 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 compbio.metadata.Argument; @@ -66,32 +74,70 @@ 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 + * (user + presets + Defaults), and any changes to parameters creates a modified + * user parameter set. LOGIC: If the parameter set is modified, and its name is + * a valid, non-existant user parameter set, then a save button is shown. If the + * parameter set is modified and its name is a valid, extant user parameter set, + * then an update button is shown. If user parameter set's name is edited, and + * old name exists as a writable user parameter set, then rename button is + * shown. If current parameter set is associated with a user defined parameter + * set, then : if set is modifed, a 'revert' button is shown. if set is not + * modified, a 'delete' button is shown. + * + * @author JimP + * + */ public class WsJobParameters extends JPanel implements ItemListener, - ActionListener + ActionListener, DocumentListener { + 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; private static final int OPTSET_HEIGHT = 30; + JPanel SetNamePanel = new JPanel(); + JPanel setDetails = new JPanel(); JSplitPane settingsPanel = new JSplitPane(); JSplitPane jobPanel = new JSplitPane(); - + 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 revertpref = new JButton(); + + JButton updatepref = new JButton(); JButton startjob = new JButton(); @@ -103,21 +149,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); } /** @@ -125,16 +170,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(); } @@ -143,6 +208,11 @@ public class WsJobParameters extends JPanel implements ItemListener, JDialog frame = null; + /** + * shows a modal dialog containing the parameters. + * + * @return + */ public boolean showRunDialog() { @@ -151,9 +221,13 @@ 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); + tabpanels.setSelectedComponent(jobOptionsPane); + frame.validate(); frame.setVisible(true); if (response > 0) @@ -163,49 +237,53 @@ public class WsJobParameters extends JPanel implements ItemListener, return false; } + private void jbInit() { - savmodified.setText("Save"); - savmodified.setToolTipText("Not implemented yet :) "); - savmodified.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); - savmodified.setForeground(Color.red); - savmodified.setHorizontalAlignment(SwingConstants.RIGHT); - savmodified.addActionListener(new ActionListener() - { + updatepref = JvSwingUtils.makeButton("Update", "Update the stored user preference", + new ActionListener() + { - public void actionPerformed(ActionEvent e) - { - savModified_actionPerformed(e); - } - }); - renmodified.setText("Rename"); - renmodified.setToolTipText("Not implemented yet :) "); - renmodified.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); - renmodified.setForeground(Color.red); - renmodified.setHorizontalAlignment(SwingConstants.CENTER); - renmodified.addActionListener(new ActionListener() - { + public void actionPerformed(ActionEvent e) + { + update_actionPerformed(e); + } + }); + deletepref = JvSwingUtils.makeButton("Delete", "Delete the user preference", + new ActionListener() + { - public void actionPerformed(ActionEvent e) - { - renModified_actionPerformed(e); - } - }); - renmodified.setVisible(false); - 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) + { + delete_actionPerformed(e); + } + }); + createpref = JvSwingUtils.makeButton("Create", "Create a new preference", + new ActionListener() + { + + public void actionPerformed(ActionEvent e) + { + create_actionPerformed(e); + } + }); + revertpref = JvSwingUtils.makeButton("Revert", + "Undo all changes to the current set", new ActionListener() + { + + public void actionPerformed(ActionEvent e) + { + revert_actionPerformed(e); + } + }); + startjob = JvSwingUtils.makeButton("Start", "Start Job",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", "Cancel Job", new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -219,25 +297,44 @@ public class WsJobParameters extends JPanel implements ItemListener, setDescr.setWrapStyleWord(true); setDescr.setLineWrap(true); setDescr.setBackground(getBackground()); - setDescr.setEditable(false); + setDescr.setEditable(true); + setDescr.getDocument().addDocumentListener(this); JScrollPane setDescrView = new JScrollPane(); // setDescrView.setPreferredSize(new Dimension(350, 200)); setDescrView.getViewport().setView(setDescr); setName.setEditable(true); setName.addItemListener(this); setName.getEditor().addActionListener(this); - savmodified.setEnabled(false); // initially unmodified parameters - // modified.setPreferredSize(new Dimension(15, 15)); - JPanel SetNamePanel = new JPanel(); - SetNamePanel.setLayout(new BorderLayout()); - SetNamePanel.add(setName, BorderLayout.WEST); - SetNamePanel.add(renmodified, BorderLayout.CENTER); - SetNamePanel.add(savmodified, BorderLayout.EAST); - setDetails.add(SetNamePanel, BorderLayout.NORTH); + JPanel setNameInfo = new JPanel(new FlowLayout(FlowLayout.LEFT)); + SetNamePanel.setLayout(new GridLayout(2, 1)); + SetNamePanel.setMinimumSize(new Dimension(300, 40)); + JLabel setNameLabel = new JLabel("Parameter set: "); + setNameLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); + // setNameLabel.setHorizontalAlignment(FlowLayout.LEFT); + setNameInfo.add(setNameLabel); + setNameInfo.add(setName); + // initial button visibility + updatepref.setVisible(false); + deletepref.setVisible(false); + revertpref.setVisible(false); + createpref.setVisible(false); + JPanel setsavebuts = new JPanel(); + setsavebuts.setLayout(new FlowLayout(FlowLayout.LEFT)); // GridLayout(1,2)); + ((FlowLayout) setsavebuts.getLayout()).setHgap(10); + ((FlowLayout) setsavebuts.getLayout()).setVgap(0); + 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)); @@ -249,18 +346,22 @@ 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); + //settingsPanel.setLeftComponent(jobOptionsPanel); + //settingsPanel.setRightComponent(jobParameters); + //settingsPanel.setOrientation(JSplitPane.VERTICAL_SPLIT); setLayout(new BorderLayout()); - // setPreferredSize(new Dimension(400, 600)); - // setSize(new Dimension(400, 600)); jobPanel.setLeftComponent(setDetails); - jobPanel.setRightComponent(settingsPanel); + jobPanel.setRightComponent(tabpanels); jobPanel.setOrientation(JSplitPane.VERTICAL_SPLIT); - jobPanel.setDividerLocation(0.8); + add(SetNamePanel, BorderLayout.NORTH); + //add(jobPanel, BorderLayout.CENTER); + //setDescrView.setName("Description"); + //tabpanels.add(setDescrView); + jobOptionsPane.setName("Options"); + tabpanels.add(jobOptionsPane); + paramPane.setName("Parameters"); + tabpanels.add(paramPane); add(jobPanel, BorderLayout.CENTER); JPanel dialogpanel = new JPanel(); dialogpanel.add(startjob); @@ -268,22 +369,55 @@ public class WsJobParameters extends JPanel implements ItemListener, add(dialogpanel, BorderLayout.SOUTH); } - protected void renModified_actionPerformed(ActionEvent e) + protected void revert_actionPerformed(ActionEvent e) { + reInitDialog(lastParmSet); - // TODO Auto-generated method stub - // save current prefs with new name and delete user pref with old name + } + protected void update_actionPerformed(ActionEvent e) + { + if (isUserPreset) + { + String curname = ((String) setName.getSelectedItem()).trim(); + _updatePreset(lastParmSet, curname); + lastParmSet = curname; + isUserPreset = true; + initArgSetModified(); + syncSetNamesWithStore(); + } } - protected void savModified_actionPerformed(ActionEvent e) + private void _deleteUserPreset(String lastParmSet2) { - // TODO Auto-generated method stub - // Store the current settings - // write out param file and name. - // update gui - initArgSetModified(); // reset the modification state + paramStore.deletePreset(lastParmSet2); + } + protected void delete_actionPerformed(ActionEvent e) + { + if (isUserPreset) + { + // delete current preset's saved entry + _deleteUserPreset(lastParmSet); + } + reInitDialog(null); // service default + } + + protected void create_actionPerformed(ActionEvent e) + { + 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) @@ -307,84 +441,110 @@ public class WsJobParameters extends JPanel implements ItemListener, Jws2Instance service; /** + * list of service presets in the gui + */ + Hashtable servicePresets = null; + + /** * set if dialog is being set - so handlers will avoid spurious events */ 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) Hashtable exnames = new Hashtable(); - for (int i=0,iSize=setName.getItemCount(); i 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; - addOption(opt); - // Apply default value, always. - selectOption(opt, opt.getDefaultValue()); + OptionI opt = (OptionI) myarg; + addOption(opt).resetToDefault(); } else { System.err.println("Ignoring unknown service argument type " - + arg.getClass().getName()); + + myarg.getClass().getName()); } } } @@ -392,27 +552,29 @@ public class WsJobParameters extends JPanel implements ItemListener, } if (p != null) { + isUserPreset = false; // initialise setname - setName.setSelectedItem(lastSetName=p.getName()); - setDescr.setText(lastDescrText=p.getDescription()); + 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="Defaults"); + + setName.setSelectedItem(lastSetName = SVC_DEF); } } @@ -424,137 +586,219 @@ 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) { - setargs.add((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()); } } } } - // mdl.setData(setargs); - // jobOptions.setLayout(new GridLayout(optSet.size() / 2 + 1, 2)); jobOptions.setPreferredSize(new Dimension(PARAM_WIDTH, optSet.size() * OPTSET_HEIGHT)); jobOptions.setLayout(new GridLayout(optSet.size(), 1)); refreshParamLayout(); - // paramPanel.setLayout(new GridLayout(paramSet.size(), 1)); - // paramList.va - // paramPane.getViewport().validate(); paramPane.validate(); - validate(); + revalidate(); } private boolean isModified() { - return savmodified.isEnabled(); + return modifiedElements.size() > 0; } private Hashtable modifiedElements = new Hashtable(); + /** * reset gui and modification state settings */ - private void initArgSetModified() { + private void initArgSetModified() + { curSetName = null; modifiedElements.clear(); - renmodified.setVisible(false); - savmodified.setEnabled(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) { + if (settingDialog) + { + return; + } if (!b) { modifiedElements.remove(modifiedElement); } else { + if (b && modifiedElement == setName + && modifiedElements.contains(modifiedElement)) + { + // HACK! prevents iteration on makeSetNameValid + b = false; + } modifiedElements.put(modifiedElement, modifiedElement); } // set mod status based on presence of elements in table - savmodified.setEnabled(modifiedElements.size() > 0); - // special reveal if setName has been modified - if (modifiedElements.get(setName) != null) + if (b && modifiedElements.size() > 0) { - if (curSetName != null && lastSetName!=null && !lastSetName.equals(curSetName)) + makeSetNameValid(!isUserPreset); + SetNamePanel.revalidate(); + } + updateButtonDisplay(); + } + + private boolean isServicePreset(String selectedItem) + { + return selectedItem.equals(SVC_DEF) + || servicePresets.containsKey(selectedItem); + } + + /** + * check if the current set name is a valid set name for saving, if not, then + * fix it. + */ + private void makeSetNameValid(boolean newuserset) + { + boolean stn = settingDialog; + boolean renamed = false; + settingDialog = true; + String nm = (curSetName != null ? curSetName : (String) setName + .getSelectedItem()); + // check if the name is reserved - if it is, rename it. + if (isServicePreset(nm)) + { + nm = "User " + nm; + renamed = true; + } + String tnm = nm; + if (newuserset) + { + int i = 0; + while (paramStore.getPreset(tnm) != null) + { + tnm = nm + " (" + (++i) + ")"; + renamed = true; + } + if (i > 0) { - // also test to see if lastSetName exists in preset store - renmodified.setVisible(true); + nm = tnm; } } - else + + boolean makeupdate = false; + // sync the gui with the preset database + for (int i = 0, iS = setName.getItemCount(); i < iS; i++) { - // setname isn't in modlist - so don't rename - renmodified.setEnabled(false); + String snm = (String) setName.getItemAt(i); + if (snm.equals(nm)) + { + makeupdate = true; + // setName.setSelectedIndex(i); + } } - validate(); + if (!makeupdate) + { + setName.addItem(curSetName = nm); + setName.setSelectedItem(curSetName); + } + if (renamed) + { + 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 selectOption(Option opt, String string) + private void setParameter(ParameterI arg) { - OptionBox cb = optSet.get(opt.getName()); - if (cb == null) - { - cb = addOption(opt); - } - if (string == null) + ParamBox pb = paramSet.get(arg.getName()); + if (pb == null) { - // no value specified. Either a .. -// if (opt.getPossibleValues()==null || opt.getPossibleValues().size()<=1) { - // switch -// cb.enabled.setSelected(true); -// } else { -// // or unselected option -// cb.enabled.setSelected(false); -// } - if (opt.isRequired()) - { - // indicate option needs to be selected! - } - else - { - cb.enabled.setSelected(false); - } + addParameter(arg); } else { - cb.enabled.setSelected(true); + pb.updateControls(arg); + } + + } - if (opt.getPossibleValues().contains(string)) + private void selectOption(OptionI option, String string) + { + OptionBox cb = optSet.get(option.getName()); + if (cb == null) + { + cb = addOption(option); + } + cb.enabled.setSelected(string != null); // initial state for an option. + if (string != null) + { + 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! } @@ -564,7 +808,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(); @@ -576,7 +820,7 @@ public class WsJobParameters extends JPanel implements ItemListener, JTextField valueField = null; - ValueConstrain validator = null; + ValueConstrainI validator = null; JPanel settingPanel = new JPanel(); @@ -590,7 +834,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)); @@ -608,10 +854,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; @@ -665,7 +920,7 @@ public class WsJobParameters extends JPanel implements ItemListener, boolean adjusting = false; - Parameter parameter; + ParameterI parameter; JComboBox choicebox; @@ -674,10 +929,10 @@ 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); + boolean init = (choicebox == null && valueField == null); float fVal = 0f; int iVal = 0; if (init) @@ -705,14 +960,15 @@ public class WsJobParameters extends JPanel implements ItemListener, { if (choice) { - if (init) { + if (init) + { List vals = parm.getPossibleValues(); for (Object val : vals) { choicebox.addItem(val); } } - + if (parm.getDefaultValue() != null) { choicebox.setSelectedItem(parm.getDefaultValue()); @@ -729,24 +985,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() @@ -762,6 +1012,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) { } @@ -785,6 +1049,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) { } @@ -820,7 +1098,6 @@ public class WsJobParameters extends JPanel implements ItemListener, } - @Override public void stateChanged(ChangeEvent e) { if (!adjusting) @@ -833,7 +1110,6 @@ public class WsJobParameters extends JPanel implements ItemListener, } - @Override public void actionPerformed(ActionEvent e) { if (adjusting) @@ -868,27 +1144,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; + + OptionI option; - public OptionBox(Option opt) + 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) { @@ -907,6 +1238,16 @@ public class WsJobParameters extends JPanel implements ItemListener, setInitialValue(); } + public void resetToDefault() + { + enabled.setSelected(false); + if (option.isRequired()) + { + // Apply default value + selectOption(option, option.getDefaultValue()); + } + } + boolean initEnabled = false; String initVal = null; @@ -919,29 +1260,27 @@ public class WsJobParameters extends JPanel implements ItemListener, { initVal = (String) val.getSelectedItem(); } + else + { + 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) @@ -954,15 +1293,61 @@ public class WsJobParameters extends JPanel implements ItemListener, private void checkIfModified() { boolean notmod = (initEnabled == enabled.isSelected()); - if (initVal != null) + if (enabled.isSelected()) { - notmod = initVal.equals(val.getSelectedItem()); + 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 == 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) @@ -974,15 +1359,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(); } @@ -1015,122 +1421,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