X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FWsJobParameters.java;h=9164cc00131931cdb23a61c3d082a717105aab75;hb=8a6fa9ea9900d0f106529c3f6283e7f9d76dd2cb;hp=7c4391e774fba2f41a869ebf81d28f90a184783a;hpb=ede1e100824dea19a919f082f91a9697b391ce32;p=jalview.git diff --git a/src/jalview/gui/WsJobParameters.java b/src/jalview/gui/WsJobParameters.java index 7c4391e..9164cc0 100644 --- a/src/jalview/gui/WsJobParameters.java +++ b/src/jalview/gui/WsJobParameters.java @@ -1,44 +1,84 @@ +/* + * 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; +import java.awt.Color; import java.awt.Component; import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Font; 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.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.net.URL; import java.util.ArrayList; import java.util.EventObject; import java.util.HashSet; import java.util.Hashtable; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Vector; +import 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; 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 compbio.metadata.Argument; @@ -48,57 +88,103 @@ 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.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; - -public class WsJobParameters extends JPanel +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, 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(); - JPanel settingsPanel = new JPanel(); + JSplitPane settingsPanel = new JSplitPane(); + + JSplitPane jobPanel = new JSplitPane(); + + boolean split = true; + + JTabbedPane tabpanels = new JTabbedPane(); JPanel jobOptions = new JPanel(); - JPanel jobParameters = new JPanel(); + JScrollPane jobOptionsPane = new JScrollPane(); - JPanel paramButtons = new JPanel(); + JPanel jobParameters = new JPanel(); - JButton exportParams = new JButton(); + JButton createpref = new JButton(); - JButton importParams = new JButton(); + JButton deletepref = new JButton(); - JButton resetParams = new JButton(); + JButton revertpref = new JButton(); - JButton addParam = new JButton(); + JButton updatepref = new JButton(); - JButton removeParam = new JButton(); + JButton startjob = new JButton(); - JButton editParam = new JButton(); + JButton canceljob = new JButton(); - JLabel setName = new JLabel(); + JComboBox setName = new JComboBox(); JTextArea setDescr = new JTextArea(); - JTable paramTable = new JTable(); - JScrollPane paramPane = new JScrollPane(); - RunnerConfig serviceOptions; + JPanel paramList = new JPanel(); - List availableParameters; + 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); + this(null, service, preset, null); } /** @@ -106,654 +192,1263 @@ public class WsJobParameters extends JPanel * @param desktop * - if null, create new JFrame outside of desktop * @param service - * @param p + * @param preset + */ + public WsJobParameters(JFrame parent, Jws2Instance service, + WsParamSetI preset, List jobArgset) + { + this(parent, null, service, preset, jobArgset); + } + + /** + * + * @param parent + * @param paramStorei + * @param service + * @param preset + * @param jobArgset */ - public WsJobParameters(JFrame parent, Jws2Instance service, Preset p) + public WsJobParameters(JFrame parent, ParamDatastoreI paramStorei, + Jws2Instance service, WsParamSetI preset, List jobArgset) { super(); jbInit(); - initTableUI(); + this.paramStore = paramStorei; + if (paramStore == null) + { + paramStore = service.getParamStore(); + } + this.service = service; + // argSetModified(false); // populate parameter table - initForService(service, p); + initForService(service, preset, jobArgset); // display in new JFrame attached to parent. validate(); } - private void jbInit() - { - exportParams.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); - exportParams.setText("Export"); - exportParams.setToolTipText("Export parameters to a file"); - exportParams.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent e) - { - exportParams_actionPerformed(e); - } - }); - importParams.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); - importParams.setText("Import"); - importParams.setToolTipText("Import parameters from a file"); - importParams.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent e) - { - importParams_actionPerformed(e); - } - }); - resetParams.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); - resetParams.setText("Defaults"); - resetParams.setToolTipText("Reset to defaults"); - resetParams.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent e) - { - resetParams_actionPerformed(e); - } - }); - addParam.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); - addParam.setText("Add"); - addParam.setToolTipText("Add new parameter"); - addParam.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent e) - { - addParam_actionPerformed(e); - } - }); - removeParam.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); - removeParam.setText("Remove"); - removeParam.setToolTipText("Remove selected parameter"); - removeParam.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent e) - { - removeParam_actionPerformed(e); - } - }); - editParam.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); - editParam.setText("Edit"); - editParam.setToolTipText("Edit selected parameter"); - editParam.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent e) - { - editParam_actionPerformed(e); - } - }); + int response = -1; - setDetails.setBorder(new TitledBorder("Details")); - setDetails.setLayout(new GridLayout(2, 1)); - setDescr.setColumns(40); - setDescr.setWrapStyleWord(true); - setDescr.setPreferredSize(new Dimension(350, 100)); - setDetails.add(setName); - setDetails.add(setDescr); - setDetails.setPreferredSize(new Dimension(360, 150)); - settingsPanel.setLayout(new BorderLayout()); - jobOptions.setBorder(new TitledBorder("Options")); - jobParameters.setBorder(new TitledBorder("Parameters")); - jobParameters.setLayout(jparamLayout = new BorderLayout()); - paramPane.setPreferredSize(new Dimension(360, 300)); - paramButtons.setLayout(new GridLayout(2, 3)); - paramButtons.add(addParam); - paramButtons.add(editParam); - paramButtons.add(removeParam); - // TODO: relayout buttons nicely - paramButtons.add(exportParams); - paramButtons.add(importParams); - paramButtons.add(resetParams); - jobParameters.add(paramPane, BorderLayout.NORTH); - jobParameters.add(paramButtons, BorderLayout.SOUTH); - settingsPanel.add(jobOptions, BorderLayout.NORTH); - settingsPanel.add(jobParameters, BorderLayout.SOUTH); - setLayout(new BorderLayout()); - setPreferredSize(new Dimension(400, 600)); - setSize(new Dimension(400, 600)); - add(setDetails, BorderLayout.NORTH); - add(settingsPanel, BorderLayout.CENTER); - } + JDialog frame = null; /** - * need to populate table and validate after calling this to set up table and - * add it to pane + * shows a modal dialog containing the parameters. + * + * @return */ - public void initTableUI() + public boolean showRunDialog() { - paramTable = new JTable(); - paramTable.getTableHeader() - .setFont(new Font("Verdana", Font.PLAIN, 12)); - paramTable.setFont(new Font("Verdana", Font.PLAIN, 12)); - paramPane.getViewport().removeAll(); - paramPane.getViewport().add(paramTable); - paramTable.setDefaultRenderer(Argument.class, new ArgumentRenderer()); - paramTable.setDefaultRenderer(Parameter.class, new ArgumentRenderer()); - paramTable.setDefaultRenderer(Option.class, new ArgumentRenderer()); - paramTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - paramTable.addMouseListener(new MouseListener() + frame = new JDialog(Desktop.instance, true); + + frame.setTitle("Edit parameters for " + service.getActionText()); + Rectangle deskr = Desktop.instance.getBounds(); + frame.setBounds(new Rectangle((int) (deskr.getCenterX() - 240), + (int) (deskr.getCenterY() - 250), 480, 500)); + frame.setContentPane(this); + // should recover defaults from user prefs. + // settingsPanel.setDividerLocation(0.4); + // jobPanel.setDividerLocation(0.5); + frame.validate(); + if (split) { - - @Override - public void mouseClicked(MouseEvent e) + javax.swing.SwingUtilities.invokeLater(new Runnable() { - if (e.getClickCount() > 1) + public void run() { - editParam_actionPerformed(null); + settingsPanel.setDividerLocation(0.5); + jobPanel.setDividerLocation(setDescr.getLineCount() > 3 ? 0.35 + : 0.16); } - } - - @Override - public void mouseEntered(MouseEvent e) - { - // tooltips - // TODO Auto-generated method stub - - } - - @Override - public void mouseExited(MouseEvent e) - { - // tooltips - // TODO Auto-generated method stub - - } - - @Override - public void mousePressed(MouseEvent e) - { - // TODO Auto-generated method stub - - } - - @Override - public void mouseReleased(MouseEvent e) - { - // TODO Auto-generated method stub - - } - - }); - // paramTable.setDefaultEditor(Argument.class, new WsArgumentEditor(this)); - } - - public class WsArgumentEditor implements TableCellEditor - { - - int p; - - Argument arg; - - WsJobParameters wsparm; - - public WsArgumentEditor(WsJobParameters wsJobParameters) - { - wsparm = wsJobParameters; - p = wsparm.paramTable.getSelectedRow(); - arg = (Argument) wsparm.paramTable.getValueAt(p, wsparm.paramTable - .getSelectedColumn()); - /* - * if (arg instanceof Option) { if - * (JOptionPane.showInternalConfirmDialog(Desktop.desktop, - * "Remove option "+arg.getName(), - * "Delete option ?",JOptionPane.YES_NO_OPTION, - * JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) { - * - * } } - */ + }); } - - @Override - public Component getTableCellEditorComponent(JTable table, - Object value, boolean isSelected, int row, int column) + else { - // TODO Auto-generated method stub - return null; + tabpanels.setSelectedComponent(jobOptionsPane); } + frame.setVisible(true); - @Override - public void addCellEditorListener(CellEditorListener l) + if (response > 0) { - // TODO Auto-generated method stub - + return true; } + return false; + } - @Override - public void cancelCellEditing() - { - // TODO Auto-generated method stub + private void jbInit() + { + updatepref = JvSwingUtils.makeButton("Update", + "Update this existing user parameter set.", + new ActionListener() + { - } + public void actionPerformed(ActionEvent e) + { + update_actionPerformed(e); + } + }); + deletepref = JvSwingUtils.makeButton("Delete", + "Delete the currently selected user parameter set.", + new ActionListener() + { - @Override - public Object getCellEditorValue() - { - // TODO Auto-generated method stub - return null; - } + public void actionPerformed(ActionEvent e) + { + delete_actionPerformed(e); + } + }); + createpref = JvSwingUtils.makeButton("Create", + "Create a new parameter set with the current settings.", + new ActionListener() + { - @Override - public boolean isCellEditable(EventObject anEvent) - { - // TODO Auto-generated method stub - return false; - } + public void actionPerformed(ActionEvent e) + { + create_actionPerformed(e); + } + }); + revertpref = JvSwingUtils.makeButton("Revert", + "Undo all changes to the current parameter set", + new ActionListener() + { - @Override - public void removeCellEditorListener(CellEditorListener l) - { - // TODO Auto-generated method stub + public void actionPerformed(ActionEvent e) + { + revert_actionPerformed(e); + } + }); + startjob = JvSwingUtils.makeButton("Start Job", + "Start Job with current settings.", new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + startjob_actionPerformed(e); + } + }); + canceljob = JvSwingUtils.makeButton("Cancel Job", + "Close this dialog and cancel job.", new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + canceljob_actionPerformed(e); + } + }); - } + setDetails.setBorder(new TitledBorder("Details")); + setDetails.setLayout(new BorderLayout()); + setDescr.setColumns(40); + setDescr.setWrapStyleWord(true); + setDescr.setLineWrap(true); + 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); + 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 + 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)); + jobParameters.setBorder(new TitledBorder("Parameters")); + jobParameters.setLayout(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); - @Override - public boolean shouldSelectCell(EventObject anEvent) + setLayout(new BorderLayout()); + jobPanel.setLeftComponent(setDetails); + if (split) { - // TODO Auto-generated method stub - return false; + settingsPanel.setLeftComponent(jobOptionsPanel); + settingsPanel.setRightComponent(jobParameters); + settingsPanel.setOrientation(JSplitPane.VERTICAL_SPLIT); + jobPanel.setRightComponent(settingsPanel); } - - @Override - public boolean stopCellEditing() + else { - // TODO Auto-generated method stub - return false; + jobPanel.setRightComponent(tabpanels); + jobOptionsPane.setName("Options"); + tabpanels.add(jobOptionsPane); + paramPane.setName("Parameters"); + tabpanels.add(paramPane); } - + 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); } - protected void editParam_actionPerformed(ActionEvent e) + protected void revert_actionPerformed(ActionEvent e) { - // TODO Auto-generated method stub + reInitDialog(lastParmSet); } - protected void removeParam_actionPerformed(ActionEvent e) + protected void update_actionPerformed(ActionEvent e) { - // TODO Auto-generated method stub - + if (isUserPreset) + { + String curname = ((String) setName.getSelectedItem()).trim(); + _updatePreset(lastParmSet, curname); + lastParmSet = curname; + isUserPreset = true; + initArgSetModified(); + syncSetNamesWithStore(); + } } - protected void addParam_actionPerformed(ActionEvent e) + private void _deleteUserPreset(String lastParmSet2) { - // TODO Auto-generated method stub - + paramStore.deletePreset(lastParmSet2); } - protected void resetParams_actionPerformed(ActionEvent e) + protected void delete_actionPerformed(ActionEvent e) { - // TODO Auto-generated method stub - + if (isUserPreset) + { + // delete current preset's saved entry + _deleteUserPreset(lastParmSet); + } + reInitDialog(null); // service default } - protected void importParams_actionPerformed(ActionEvent e) + protected void create_actionPerformed(ActionEvent e) { - // TODO Auto-generated method stub - + String curname = ((String) setName.getSelectedItem()).trim(); + if (curname.length() > 0) + { + _storeCurrentPreset(curname); + lastParmSet = curname; + isUserPreset = true; + initArgSetModified(); + } + else + { + // TODO: show warning + System.err.println("Invalid name. Not saved."); + } } - protected void exportParams_actionPerformed(ActionEvent e) + protected void canceljob_actionPerformed(ActionEvent e) { - // TODO Auto-generated method stub - + response = 0; + if (frame != null) + { + frame.setVisible(false); + } } - void initForService(Jws2Instance service, Preset p) + protected void startjob_actionPerformed(ActionEvent e) { - serviceOptions = service.getRunnerConfig(); - updateTable(p); + response = 1; + if (frame != null) + { + frame.setVisible(false); + } } - @SuppressWarnings("unchecked") - private void updateTable(Preset p) + 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, WsParamSetI jabap, + List jabajobArgset) { - WsParameterTableModel mdl = null; - TableModel tmdl = paramTable.getModel(); - if (tmdl instanceof WsParameterTableModel) + WsParamSetI p = null; + List jobArgset = null; + settingDialog = true; + { // instantiate the abstract proxy for Jaba objects + jobArgset = jabajobArgset == null ? null : JabaParamStore + .getJwsArgsfromJaba(jabajobArgset); + p = jabap; // (jabap != null) ? paramStore.getPreset(jabap.getName()) : + // null; + } + // 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 < iSize; i++) + { + exnames.put((String) setName.getItemAt(i), setName.getItemAt(i)); + } + servicePresets = new Hashtable(); + // Add the default entry - if not present already. + if (!exnames.contains(SVC_DEF)) + { + setName.addItem(SVC_DEF); + exnames.put(SVC_DEF, SVC_DEF); + servicePresets.put(SVC_DEF, SVC_DEF); + } + String curname = (p == null ? "" : p.getName()); + for (WsParamSetI pr : paramStore.getPresets()) + { + if (!pr.isModifiable()) + { + servicePresets.put(pr.getName(), "preset"); + } + else + { + } + if (!exnames.contains(pr.getName())) + { + setName.addItem(pr.getName()); + } + } + // TODO: if initial jobArgset matches a given user setting or preset then + // should recover setting accordingly + // updateTable(p, jobArgset); + if (p != null) { - mdl = (WsParameterTableModel) tmdl; + reInitDialog(p.getName()); + initArgSetModified(); } - if (mdl == null) + else { - paramTable.setModel(mdl = new WsParameterTableModel()); + if (jobArgset != null && jobArgset.size() > 0) + { + curSetName = "Supplied Settings"; + updateTable(p, jobArgset); + } + else + { + curSetName = null; + reInitDialog(null); + } } - availableParameters = new ArrayList(); - List setargs = new ArrayList(); + settingDialog = false; + + } + + @SuppressWarnings("unchecked") + private void updateTable(WsParamSetI p, List jobArgset) + { // 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; - if (parm.isRequired()) - { - setargs.add(parm); - } - else - { - availableParameters.add(parm); - } + ParameterI parm = (ParameterI) myarg; + addParameter(parm); } else { - if (myarg instanceof Option) + if (myarg instanceof OptionI) { - Option opt = (Option) myarg; - addOption(opt); - if (opt.isRequired()) - { - 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()); } } } + args = null; // no more args to process. } - if (p != null) { - setDescr.setText(p.getDescription()); - setName.setText(p.getName()); + 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(); } - setargs.clear(); - // get setargs from current object - if (args != null) + // TODO: check if args should be unselected prior to resetting using the + // preset + } + else + { + if (lastParmSet == null) + { + isUserPreset = false; + // first call - so create a dummy name + + setName.setSelectedItem(lastSetName = SVC_DEF); + } + } + + if (jobArgset != null) + { + argSetModified(jobArgset, true); + args = jobArgset; + } + // get setargs from current object + if (args != null) + { + for (ArgumentI arg : args) { - for (Argument arg : args) + if (arg instanceof ParameterI) { - if (arg instanceof Parameter) - { - setargs.add((Parameter) arg); - } - else + setParameter((ParameterI) arg); + } + else + { + if (arg instanceof OptionI) { - if (arg instanceof Option) - { - 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); - paramTable.setModel(mdl); - // paramTable.validate(); - jobOptions.setLayout(new GridLayout(optSet.size() / 2 + 1, 2)); - jobOptions.validate(); + jobOptions.setPreferredSize(new Dimension(PARAM_WIDTH, optSet.size() + * OPTSET_HEIGHT)); + jobOptions.setLayout(new GridLayout(optSet.size(), 1)); + refreshParamLayout(); + paramPane.validate(); + revalidate(); } - private void selectOption(Option opt, String string) + private boolean isModified() { - OptionBox cb = optSet.get(opt.getName()); - if (cb == null) - { - cb = addOption(opt); - } - if (string == null) + return modifiedElements.size() > 0; + } + + private Hashtable modifiedElements = new Hashtable(); + + /** + * reset gui and modification state settings + */ + private void initArgSetModified() + { + curSetName = null; + modifiedElements.clear(); + updateButtonDisplay(); + } + + private void updateButtonDisplay() + { + boolean _update = false, _create = false, _delete = false, _revert = false; + if (modifiedElements.size() > 0) { - // no value specified. - if (opt.isRequired()) + // set modified + _revert = true; + _update = isUserPreset; // can only update user presets + if (!isUserPreset || modifiedElements.containsKey(setName)) { - // indicate option needs to be selected! - } - else - { - cb.enabled.setSelected(false); + // name modified - can create new preset + _create = true; } } else { - cb.enabled.setSelected(true); + // set unmodified + } + // can still delete a user preset + _delete = isUserPreset; - if (opt.getPossibleValues().contains(string)) - { - cb.val.setSelectedItem(string); - } - else + 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)) { - throw new Error("Invalid value " + string + " for option " + opt); + // HACK! prevents iteration on makeSetNameValid + b = false; } - + modifiedElements.put(modifiedElement, modifiedElement); } + // set mod status based on presence of elements in table + if (b && modifiedElements.size() > 0) + { + makeSetNameValid(!isUserPreset); + SetNamePanel.revalidate(); + } + updateButtonDisplay(); } - Map optSet = new Hashtable(); - - public class OptionBox extends JPanel + private boolean isServicePreset(String selectedItem) { - JComboBox val = new JComboBox(); + return selectedItem.equals(SVC_DEF) + || servicePresets.containsKey(selectedItem); + } - JCheckBox enabled = new JCheckBox(); + /** + * 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) + { + nm = tnm; + } + } - public OptionBox(Option opt) + boolean makeupdate = false; + // sync the gui with the preset database + for (int i = 0, iS = setName.getItemCount(); i < iS; i++) { - setLayout(new BorderLayout()); - enabled.setSelected(opt.isRequired()); - enabled.setFont(new Font("Verdana", Font.PLAIN, 11)); - enabled.setText(opt.getName()); - enabled.setToolTipText(opt.getDescription()); - add(enabled, BorderLayout.NORTH); - if (opt.getPossibleValues().size() > 1) + String snm = (String) setName.getItemAt(i); + if (snm.equals(nm)) { - setLayout(new GridLayout(1,2)); - for (Object str : opt.getPossibleValues()) - { - val.addItem((String) str); - } - val.setSelectedItem((String) opt.getDefaultValue()); - add(val, BorderLayout.SOUTH); + makeupdate = true; + // setName.setSelectedIndex(i); } - // TODO: add actionListeners for popup (to open further info), - // and to update list of parameters if an option is enabled - // that takes a value. } + 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 OptionBox addOption(Option opt) + private void addParameter(ParameterI arg) { - OptionBox cb = optSet.get(opt.getName()); - if (cb == null) + ParamBox pb = paramSet.get(arg.getName()); + if (pb == null) { - cb = new OptionBox(opt); - optSet.put(opt.getName(), cb); - jobOptions.add(cb); + pb = new ParamBox(this, arg); + paramSet.put(arg.getName(), pb); + paramList.add(pb); } - return cb; + pb.init(); + // take the defaults from the parameter + pb.updateControls(arg); } - class WsParameterTableModel extends AbstractTableModel + private void setParameter(ParameterI arg) { - // arg list - vector for thread safety - public Vector data = new Vector(); + ParamBox pb = paramSet.get(arg.getName()); + if (pb == null) + { + addParameter(arg); + } + else + { + pb.updateControls(arg); + } - private String[] colNames = - { "Parameter", "Value" }; + } - @Override - public int getColumnCount() + private void selectOption(OptionI option, String string) + { + OptionBox cb = optSet.get(option.getName()); + if (cb == null) { - return 2; + 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 " + option); + } - @Override - public int findColumn(String columnName) + } + if (option.isRequired() && !cb.enabled.isSelected()) { - // TODO Auto-generated method stub - return super.findColumn(columnName); + // TODO: indicate paramset is not valid.. option needs to be selected! } + cb.setInitialValue(); + } + + Map paramSet = new Hashtable(); + + public class ParamBox extends JPanel implements ChangeListener, + ActionListener, MouseListener + { + JButton showDesc = new JButton(); + + JTextArea string = new JTextArea(); + + JScrollPane descPanel = new JScrollPane(); + + JSlider slider = null; + + JTextField valueField = null; + + ValueConstrainI validator = null; - public void setData(List setargs) + JPanel settingPanel = new JPanel(); + + JPanel controlPanel = new JPanel(); + + boolean integ = false; + + boolean choice = false; + + boolean descisvisible = false; + + final WsJobParameters pmdialogbox; + + final URL finfo; + + public ParamBox(final WsJobParameters pmlayout, ParameterI parm) { - if (setargs != null) + 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; + 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() { - data = new Vector(setargs); + public void actionPerformed(ActionEvent e) + { + descisvisible = !descisvisible; + descPanel.setVisible(descisvisible); + me.setPreferredSize(new Dimension(PARAM_WIDTH, + (descisvisible) ? PARAM_HEIGHT : PARAM_CLOSEDHEIGHT)); + me.validate(); + pmlayout.refreshParamLayout(); + } + }); + 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 { - data = new Vector(); + if (parameter.getPossibleValues() != null) + { + choice = true; + } } + 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; } - public List getData() + boolean adjusting = false; + + ParameterI parameter; + + JComboBox choicebox; + + public int getBoxHeight() { - return new ArrayList(data); + return (descisvisible ? PARAM_HEIGHT : PARAM_CLOSEDHEIGHT); + } + + public void updateControls(ParameterI parm) + { + adjusting = true; + boolean init = (choicebox == null && valueField == null); + float fVal = 0f; + int iVal = 0; + if (init) + { + if (choice) + { + choicebox = new JComboBox(); + choicebox.addActionListener(this); + controlPanel.add(choicebox, BorderLayout.CENTER); + } + 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()); + } + } + else + { + valueField.setText(parm.getDefaultValue()); + } + } + lastVal = updateSliderFromValueField(); + adjusting = false; } - @Override - public int getRowCount() + Object lastVal; + + public ParameterI getParameter() { - return data.size(); + ParameterI prm = parameter.copy(); + if (choice) + { + prm.setDefaultValue((String) choicebox.getSelectedItem()); + } + else + { + prm.setDefaultValue(valueField.getText()); + } + return prm; } - @Override - public Object getValueAt(int rowIndex, int columnIndex) + public Object updateSliderFromValueField() { - if (rowIndex >= 0 && rowIndex < data.size()) + int iVal; + float fVal; + if (validator != null) { - Parameter prm = data.elementAt(rowIndex); - switch (columnIndex) + if (integ) { - case 0: - return prm.getName(); - case 1: - Object exc = null; - // the accessor name for the parameter value is possibly confusing - String val = prm.getDefaultValue(); + iVal = 0; try { - if (prm.getValidValue().getType().equals(Type.Float)) + valueField.setText(valueField.getText().trim()); + iVal = Integer.valueOf(valueField.getText()); + if (validator.getMin() != null + && validator.getMin().intValue() > iVal) { - exc = new Float(0); - return Float.parseFloat(val); + iVal = validator.getMin().intValue(); + // TODO: provide visual indication that hard limit was reached for + // this parameter } - if (prm.getValidValue().getType().equals(Type.Integer)) + if (validator.getMax() != null + && validator.getMax().intValue() < iVal) { - exc = new Integer(0); - return Integer.parseInt(val); + iVal = validator.getMax().intValue(); + // TODO: provide visual indication that hard limit was reached for + // this parameter } - } catch (NumberFormatException e) + } catch (Exception e) { - return exc; } - // must be a string - return val; - - default: + ; + 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()); + 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) + { + } + ; + 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 }; } } - return null; + else + { + if (!choice) + { + slider.setVisible(false); + return new String[] + { valueField.getText().trim() }; + } + else + { + return new String[] + { (String) choicebox.getSelectedItem() }; + } + } + } - /* - * (non-Javadoc) - * - * @see javax.swing.table.AbstractTableModel#getColumnClass(int) - */ - @Override - public Class getColumnClass(int columnIndex) + public void stateChanged(ChangeEvent e) { - switch (columnIndex) + if (!adjusting) { - case 0: - return String.class; - case 1: - return Parameter.class; + valueField.setText("" + + ((integ) ? ("" + (int) slider.getValue()) + : ("" + (float) (slider.getValue() / 1000f)))); + checkIfModified(); } - return super.getColumnClass(columnIndex); + } - /* - * (non-Javadoc) - * - * @see javax.swing.table.AbstractTableModel#getColumnName(int) - */ - @Override - public String getColumnName(int column) + public void actionPerformed(ActionEvent e) { - return colNames[column]; + 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); } - /* - * (non-Javadoc) - * - * @see javax.swing.table.AbstractTableModel#isCellEditable(int, int) - */ - @Override - public boolean isCellEditable(int rowIndex, int columnIndex) + public void mouseClicked(MouseEvent e) { - if (columnIndex == 1) + if (javax.swing.SwingUtilities.isRightMouseButton(e)) { - return true; + showUrlPopUp(this, finfo.toString(), e.getX(), e.getY()); } - return false; } + + 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 + + } + } - class ArgumentRenderer implements TableCellRenderer + Map optSet = new Hashtable(); + + public class OptionBox extends JPanel implements MouseListener, + ActionListener { + JComboBox val = new JComboBox(); + + JCheckBox enabled = new JCheckBox(); - @Override - public Component getTableCellRendererComponent(JTable table, - Object value, boolean isSelected, boolean hasFocus, int row, - int column) + JLabel optlabel = new JLabel(); + + final URL finfo; + + boolean hasLink = false; + + OptionI option; + + public OptionBox(OptionI opt) { - if (value instanceof Option) + 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.addActionListener(this); + finfo = option.getFurtherDetails(); + if (finfo != null) { - JCheckBox cb = new JCheckBox(); - cb.setSelected(true); - return cb; + hasLink = true; + // optlabel.setToolTipText("

"+opt.getDescription()+"

"); + enabled.setToolTipText("" + + JvSwingUtils.wrapTooltip(opt.getDescription() + + "
") + + ""); + // optlabel.addMouseListener(this); + enabled.addMouseListener(this); } - if (value instanceof Boolean) + else { - JCheckBox cb = new JCheckBox(); - cb.setSelected(((Boolean) value).booleanValue()); - return cb; + // optlabel.setToolTipText(opt.getDescription()); + enabled.setToolTipText("" + + JvSwingUtils.wrapTooltip(opt.getDescription()) + + ""); } - if (value instanceof String) + add(enabled, BorderLayout.NORTH); + if (opt.getPossibleValues().size() > 1) { - JLabel lbl = new JLabel(); - lbl.setFont(new Font("Verdana", Font.PLAIN, 11)); - lbl.setText((String) value); - return lbl; + 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); } - if (value instanceof Parameter) + // 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()) { - String val = ((Parameter) value).getDefaultValue(); - ValueConstrain constr = ((Parameter) value).getValidValue(); - JLabel lbl = new JLabel(); - lbl.setFont(new Font("Verdana", Font.PLAIN, 11)); - lbl.setText(val); - return lbl; - /* - * type dependent return value if - * (constr.getType().equals(Type.Integer)) - * - * { lbl.setText(val); } if (constr.getType().equals(Type.Float)) { } - * return lbl; - */ + // 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 = (initEnabled) ? option.getDefaultValue() : null; } - return null; } + + public OptionI getOptionIfEnabled() + { + if (!enabled.isSelected()) + { + return null; + } + OptionI opt = option.copy(); + + if (val.getSelectedItem() != null) + { + opt.setDefaultValue((String) val.getSelectedItem()); + } + return opt; + } + + public void actionPerformed(ActionEvent e) + { + if (e.getSource() != enabled) + { + enabled.setSelected(true); + } + checkIfModified(); + } + + private void checkIfModified() + { + boolean notmod = (initEnabled == enabled.isSelected()); + 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 == 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(OptionI opt) + { + OptionBox cb = optSet.get(opt.getName()); + if (cb == null) + { + cb = new OptionBox(opt); + optSet.put(opt.getName(), cb); + jobOptions.add(cb); + } + 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() + { + FlowLayout fl = new FlowLayout(); + paramList.setLayout(fl); + int s = 2 * fl.getVgap(); + for (ParamBox pbox : paramSet.values()) + { + s += fl.getVgap() + pbox.getBoxHeight(); // getBoxHeight(); + } + paramList.setPreferredSize(new Dimension(PARAM_WIDTH, s)); + validate(); } /** @@ -785,103 +1480,533 @@ public class WsJobParameters extends JPanel for (Jws2Discoverer.Jws2Instance service : disc.getServices()) { lastserv = service; - if (p < args.length && service.serviceType.equalsIgnoreCase(args[p])) - { - break; - } - } - if (lastserv != 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. - List prl = prman.getPresets(); - pr = prl.get(prl.size() - 1); + PresetManager prman = lastserv.getPresets(); + if (prman != null) + { + pr = prman.getPresetByName(args[p]); + if (pr == null) + { + // just grab the last preset. + prl = prman.getPresets(); + } + } + } + else + { + PresetManager prman = lastserv.getPresets(); + if (prman != null) + { + prl = prman.getPresets(); + } + } + Iterator en = (prl == null) ? null : prl.iterator(); + while (en != null && en.hasNext()) + { + 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