X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FWsJobParameters.java;h=ff03fef96b7d6f9d143609cf5409d4f747f8d5bb;hb=be32c14cd8e48fe0a207cd7030cb9cd46f894678;hp=7c4391e774fba2f41a869ebf81d28f90a184783a;hpb=ede1e100824dea19a919f082f91a9697b391ce32;p=jalview.git diff --git a/src/jalview/gui/WsJobParameters.java b/src/jalview/gui/WsJobParameters.java index 7c4391e..ff03fef 100644 --- a/src/jalview/gui/WsJobParameters.java +++ b/src/jalview/gui/WsJobParameters.java @@ -1,45 +1,76 @@ +/* + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors + * + * This file is part of Jalview. + * + * Jalview is free software: you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, either version 3 + * of the License, or (at your option) any later version. + * + * Jalview is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. + */ package jalview.gui; +import jalview.gui.OptsAndParamsPage.OptionBox; +import jalview.gui.OptsAndParamsPage.ParamBox; +import jalview.util.MessageManager; +import jalview.ws.jws2.JabaParamStore; +import jalview.ws.jws2.JabaPreset; +import jalview.ws.jws2.Jws2Discoverer; +import jalview.ws.jws2.jabaws2.Jws2Instance; +import jalview.ws.params.ArgumentI; +import jalview.ws.params.OptionI; +import jalview.ws.params.ParamDatastoreI; +import jalview.ws.params.ParameterI; +import jalview.ws.params.WsParamSetI; + import java.awt.BorderLayout; import java.awt.Component; import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Font; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; import java.awt.GridLayout; +import java.awt.Rectangle; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.event.ComponentEvent; -import java.awt.event.ComponentListener; -import java.awt.event.ContainerEvent; -import java.awt.event.ContainerListener; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; +import java.awt.event.HierarchyBoundsListener; +import java.awt.event.HierarchyEvent; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; import java.awt.event.WindowEvent; import java.awt.event.WindowListener; -import java.awt.event.WindowStateListener; -import java.util.ArrayList; -import java.util.EventObject; -import java.util.HashSet; +import java.net.URL; import java.util.Hashtable; +import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Vector; import javax.swing.JButton; -import javax.swing.JCheckBox; import javax.swing.JComboBox; +import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; -import javax.swing.JTable; +import javax.swing.JSplitPane; import javax.swing.JTextArea; -import javax.swing.ListSelectionModel; -import javax.swing.SwingUtilities; import javax.swing.border.TitledBorder; -import javax.swing.event.CellEditorListener; -import javax.swing.table.*; +import javax.swing.event.DocumentEvent; +import javax.swing.event.DocumentListener; + +import net.miginfocom.swing.MigLayout; import compbio.metadata.Argument; import compbio.metadata.Option; @@ -47,58 +78,91 @@ import compbio.metadata.Parameter; import compbio.metadata.Preset; import compbio.metadata.PresetManager; import compbio.metadata.RunnerConfig; -import compbio.metadata.ValueConstrain; -import compbio.metadata.ValueConstrain.Type; - -import jalview.ws.jws2.Jws2Discoverer; -import jalview.ws.jws2.Jws2Discoverer.Jws2Instance; -public class WsJobParameters extends JPanel +/** + * 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, OptsParametersContainerI { - JPanel setDetails = new JPanel(); + URL linkImageURL = getClass().getResource("/images/link.gif"); - JPanel settingsPanel = new JPanel(); + private static final String SVC_DEF = "Defaults"; // this is the null + // parameter set as shown to + // user + + /** + * manager for options and parameters. + */ + OptsAndParamsPage opanp = new OptsAndParamsPage(this); + /** + * panel containing job options + */ JPanel jobOptions = new JPanel(); - JPanel jobParameters = new JPanel(); + /** + * panel containing job parameters + */ + JPanel paramList = new JPanel(); + + JPanel SetNamePanel = new JPanel(); - JPanel paramButtons = new JPanel(); + JPanel setDetails = new JPanel(); - JButton exportParams = new JButton(); + JSplitPane settingsPanel = new JSplitPane(); - JButton importParams = new JButton(); + JPanel jobPanel = new JPanel(); - JButton resetParams = new JButton(); + JScrollPane jobOptionsPane = new JScrollPane(); - JButton addParam = new JButton(); + JButton createpref = new JButton(); - JButton removeParam = new JButton(); + JButton deletepref = new JButton(); - JButton editParam = new JButton(); + JButton revertpref = new JButton(); - JLabel setName = new JLabel(); + JButton updatepref = new JButton(); - JTextArea setDescr = new JTextArea(); + JButton startjob = new JButton(); - JTable paramTable = new JTable(); + JButton canceljob = new JButton(); + + JComboBox setName = new JComboBox(); + + JTextArea setDescr = new JTextArea(); JScrollPane paramPane = new JScrollPane(); + // ScrollablePanel optsAndparams = new ScrollablePanel(); + JPanel optsAndparams = new JPanel(); + RunnerConfig serviceOptions; - List availableParameters; + ParamDatastoreI paramStore; - private BorderLayout jparamLayout; + private int MAX_OPTWIDTH = 200; WsJobParameters(Jws2Instance service) { this(service, null); } - public WsJobParameters(Jws2Instance service, Preset p) + public WsJobParameters(Jws2Instance service, WsParamSetI preset) { - this(null, service, p); + this(null, service, preset, null); } /** @@ -106,782 +170,1338 @@ 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, Preset p) + 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, 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); - @Override - public void mouseClicked(MouseEvent e) - { - if (e.getClickCount() > 1) - { - editParam_actionPerformed(null); - } - } + frame.setTitle(MessageManager.formatMessage("label.edit_params_for", + new String[] + { service.getActionText() })); + Rectangle deskr = Desktop.instance.getBounds(); + Dimension pref = this.getPreferredSize(); + frame.setBounds(new Rectangle( + (int) (deskr.getCenterX() - pref.width / 2), (int) (deskr + .getCenterY() - pref.height / 2), pref.width, + pref.height)); + frame.setContentPane(this); - @Override - public void mouseEntered(MouseEvent e) + // should perhaps recover defaults from user prefs. + + frame.validate(); + javax.swing.SwingUtilities.invokeLater(new Runnable() + { + public void run() { - // tooltips - // TODO Auto-generated method stub + // jobPanel.setDividerLocation(0.25); } + }); + frame.setVisible(true); - @Override - public void mouseExited(MouseEvent e) - { - // tooltips - // TODO Auto-generated method stub + if (response > 0) + { + return true; + } + return false; + } - } + private void jbInit() + { + this.addHierarchyBoundsListener(new HierarchyBoundsListener() + { @Override - public void mousePressed(MouseEvent e) + public void ancestorResized(HierarchyEvent arg0) { - // TODO Auto-generated method stub - + refreshParamLayout(); } @Override - public void mouseReleased(MouseEvent e) + public void ancestorMoved(HierarchyEvent arg0) { // 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) { - * - * } } - */ - } + updatepref = JvSwingUtils.makeButton( + MessageManager.getString("action.update"), + MessageManager.getString("label.update_user_parameter_set"), + new ActionListener() + { - @Override - public Component getTableCellEditorComponent(JTable table, - Object value, boolean isSelected, int row, int column) - { - // TODO Auto-generated method stub - return null; - } + public void actionPerformed(ActionEvent e) + { + update_actionPerformed(e); + } + }); + deletepref = JvSwingUtils.makeButton( + MessageManager.getString("action.delete"), + MessageManager.getString("label.delete_user_parameter_set"), + new ActionListener() + { - @Override - public void addCellEditorListener(CellEditorListener l) - { - // TODO Auto-generated method stub + public void actionPerformed(ActionEvent e) + { + delete_actionPerformed(e); + } + }); + createpref = JvSwingUtils.makeButton( + MessageManager.getString("action.create"), + MessageManager.getString("label.create_user_parameter_set"), + new ActionListener() + { - } + public void actionPerformed(ActionEvent e) + { + create_actionPerformed(e); + } + }); + revertpref = JvSwingUtils.makeButton(MessageManager + .getString("action.revert"), MessageManager + .getString("label.revert_changes_user_parameter_set"), + new ActionListener() + { - @Override - public void cancelCellEditing() - { - // TODO Auto-generated method stub + public void actionPerformed(ActionEvent e) + { + revert_actionPerformed(e); + } + }); + startjob = JvSwingUtils.makeButton( + MessageManager.getString("action.start_job"), + MessageManager.getString("label.start_job_current_settings"), + new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + startjob_actionPerformed(e); + } + }); + canceljob = JvSwingUtils.makeButton( + MessageManager.getString("action.cancel_job"), + MessageManager.getString("label.cancel_job_close_dialog"), + new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + canceljob_actionPerformed(e); + } + }); + + setDetails.setBorder(new TitledBorder(MessageManager + .getString("label.details"))); + setDetails.setLayout(new BorderLayout()); + setDescr.setColumns(40); + setDescr.setWrapStyleWord(true); + setDescr.setLineWrap(true); + setDescr.setBackground(getBackground()); + setDescr.setEditable(true); + setDescr.getDocument().addDocumentListener(this); + setDescr.setToolTipText(MessageManager + .getString("label.edit_notes_parameter_set")); + JScrollPane setDescrView = new JScrollPane(); + setDescrView.getViewport().setView(setDescr); + setName.setEditable(true); + setName.addItemListener(this); + setName.getEditor().addActionListener(this); + JPanel setNameInfo = new JPanel(new FlowLayout(FlowLayout.LEFT)); + GridBagLayout gbl = new GridBagLayout(); + SetNamePanel.setLayout(gbl); + + JLabel setNameLabel = new JLabel( + MessageManager.getString("label.current_parameter_set_name")); + setNameLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); + + setNameInfo.add(setNameLabel); + setNameInfo.add(setName); + + // initial button visibility + updatepref.setVisible(false); + deletepref.setVisible(false); + revertpref.setVisible(false); + createpref.setVisible(false); + JPanel setsavebuts = new JPanel(); + setsavebuts.setLayout(new FlowLayout(FlowLayout.LEFT)); // GridLayout(1,2)); + ((FlowLayout) setsavebuts.getLayout()).setHgap(10); + ((FlowLayout) setsavebuts.getLayout()).setVgap(0); + JPanel spacer = new JPanel(); + spacer.setPreferredSize(new Dimension(2, 30)); + setsavebuts.add(spacer); + setsavebuts.add(deletepref); + setsavebuts.add(revertpref); + setsavebuts.add(createpref); + setsavebuts.add(updatepref); + // setsavebuts.setSize(new Dimension(150, 30)); + JPanel buttonArea = new JPanel(new GridLayout(1, 1)); + buttonArea.add(setsavebuts); + SetNamePanel.add(setNameInfo); + GridBagConstraints gbc = new GridBagConstraints(); + gbc.gridheight = 2; + gbl.setConstraints(setNameInfo, gbc); + SetNamePanel.add(buttonArea); + gbc = new GridBagConstraints(); + gbc.gridx = 0; + gbc.gridy = 2; + gbc.gridheight = 1; + gbl.setConstraints(buttonArea, gbc); + setDetails.add(setDescrView, BorderLayout.CENTER); + + // paramPane.setPreferredSize(new Dimension(360, 400)); + // paramPane.setPreferredSize(null); + jobOptions.setBorder(new TitledBorder(MessageManager + .getString("label.options"))); + jobOptions.setOpaque(true); + paramList.setBorder(new TitledBorder(MessageManager + .getString("label.parameters"))); + paramList.setOpaque(true); + JPanel bjo = new JPanel(new BorderLayout()), bjp = new JPanel( + new BorderLayout()); + bjo.add(jobOptions, BorderLayout.CENTER); + bjp.add(paramList, BorderLayout.CENTER); + bjp.setOpaque(true); + bjo.setOpaque(true); + // optsAndparams.setScrollableWidth(ScrollableSizeHint.FIT); + // optsAndparams.setScrollableHeight(ScrollableSizeHint.NONE); + // optsAndparams.setLayout(new BorderLayout()); + optsAndparams.setLayout(new BorderLayout()); + optsAndparams.add(jobOptions, BorderLayout.NORTH); + optsAndparams.add(paramList, BorderLayout.CENTER); + JPanel jp = new JPanel(new BorderLayout()); + jp.add(optsAndparams, BorderLayout.CENTER); + paramPane.getViewport().setView(jp); + paramPane.setBorder(null); + setLayout(new BorderLayout()); + jobPanel.setPreferredSize(null); + jobPanel.setLayout(new BorderLayout()); + jobPanel.add(setDetails, BorderLayout.NORTH); + jobPanel.add(paramPane, BorderLayout.CENTER); + // jobPanel.setOrientation(JSplitPane.VERTICAL_SPLIT); + + add(SetNamePanel, BorderLayout.NORTH); + add(jobPanel, BorderLayout.CENTER); + + JPanel dialogpanel = new JPanel(); + dialogpanel.add(startjob); + dialogpanel.add(canceljob); + // JAL-1580: setMaximumSize() doesn't work, so just size for the worst case: + setPreferredSize(new Dimension(540, Desktop.instance.getHeight())); + add(dialogpanel, BorderLayout.SOUTH); + validate(); + } - } + protected void revert_actionPerformed(ActionEvent e) + { + reInitDialog(lastParmSet); + updateWebServiceMenus(); + } - @Override - public Object getCellEditorValue() + protected void update_actionPerformed(ActionEvent e) + { + if (isUserPreset) { - // TODO Auto-generated method stub - return null; + String curname = ((String) setName.getSelectedItem()).trim(); + _updatePreset(lastParmSet, curname); + lastParmSet = curname; + isUserPreset = true; + initArgSetModified(); + syncSetNamesWithStore(); } + } - @Override - public boolean isCellEditable(EventObject anEvent) - { - // TODO Auto-generated method stub - return false; - } + private void _deleteUserPreset(String lastParmSet2) + { + paramStore.deletePreset(lastParmSet2); + } - @Override - public void removeCellEditorListener(CellEditorListener l) + protected void delete_actionPerformed(ActionEvent e) + { + if (isUserPreset) { - // TODO Auto-generated method stub - + // delete current preset's saved entry + _deleteUserPreset(lastParmSet); } + reInitDialog(null); // service default + updateWebServiceMenus(); + } - @Override - public boolean shouldSelectCell(EventObject anEvent) + protected void create_actionPerformed(ActionEvent e) + { + String curname = ((String) setName.getSelectedItem()).trim(); + if (curname.length() > 0) { - // TODO Auto-generated method stub - return false; + _storeCurrentPreset(curname); + lastParmSet = curname; + isUserPreset = true; + reInitDialog(curname); + initArgSetModified(); + updateWebServiceMenus(); } - - @Override - public boolean stopCellEditing() + else { - // TODO Auto-generated method stub - return false; + // TODO: show warning + System.err.println("Invalid name. Not saved."); } - } - protected void editParam_actionPerformed(ActionEvent e) + protected void canceljob_actionPerformed(ActionEvent e) { - // TODO Auto-generated method stub - - } - - protected void removeParam_actionPerformed(ActionEvent e) - { - // TODO Auto-generated method stub - + response = 0; + if (frame != null) + { + frame.setVisible(false); + } } - protected void addParam_actionPerformed(ActionEvent e) + protected void startjob_actionPerformed(ActionEvent e) { - // TODO Auto-generated method stub - + response = 1; + if (frame != null) + { + frame.setVisible(false); + } } - protected void resetParams_actionPerformed(ActionEvent e) - { - // TODO Auto-generated method stub - - } + Jws2Instance service; - protected void importParams_actionPerformed(ActionEvent e) - { - // TODO Auto-generated method stub + /** + * 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; - protected void exportParams_actionPerformed(ActionEvent e) + void initForService(Jws2Instance service, WsParamSetI jabap, + List jabajobArgset) { - // TODO Auto-generated method stub + 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; + } - } + Hashtable exnames = new Hashtable(); + for (int i = 0, iSize = setName.getItemCount(); i < iSize; i++) + { + exnames.put(setName.getItemAt(i), setName.getItemAt(i)); + } + servicePresets = new Hashtable(); + // Add the default entry - if not present already. + if (!exnames.contains(SVC_DEF)) + { + 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) + { + reInitDialog(p.getName()); + initArgSetModified(); + } + else + { + if (jobArgset != null && jobArgset.size() > 0) + { + curSetName = "Supplied Settings"; + isUserPreset = false; + updateTable(p, jobArgset); + setName.setSelectedItem(curSetName); + updateButtonDisplay(); + } + else + { + curSetName = null; + reInitDialog(null); + } + } + settingDialog = false; - void initForService(Jws2Instance service, Preset p) - { - serviceOptions = service.getRunnerConfig(); - updateTable(p); } @SuppressWarnings("unchecked") - private void updateTable(Preset p) + private void updateTable(WsParamSetI p, List jobArgset) { - WsParameterTableModel mdl = null; - TableModel tmdl = paramTable.getModel(); - if (tmdl instanceof WsParameterTableModel) + boolean setDefaultParams = false; + if (lastParmSet == null) { - mdl = (WsParameterTableModel) tmdl; + isUserPreset = false; + // First call - so provide Service default settings + setName.setSelectedItem(lastSetName = SVC_DEF); } - if (mdl == null) + if (p == null && SVC_DEF.equals("" + setName.getSelectedItem())) { - paramTable.setModel(mdl = new WsParameterTableModel()); + // indicate that service defaults should be set if available + setDefaultParams = true; } - availableParameters = new ArrayList(); - 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) + int cw = 0; + boolean optset = false; + for (ArgumentI myarg : args) { - Argument myarg = (Argument) arg; // Ideally, Argument would implement isRequired ! - if (myarg instanceof Parameter) + if (myarg instanceof ParameterI) { - Parameter parm = (Parameter) myarg; - if (parm.isRequired()) - { - setargs.add(parm); - } - else - { - availableParameters.add(parm); - } + ParameterI parm = (ParameterI) myarg; + opanp.addParameter(parm).validate(); } else { - if (myarg instanceof Option) + if (myarg instanceof OptionI) { - Option opt = (Option) myarg; - addOption(opt); - if (opt.isRequired()) + OptionI opt = (OptionI) myarg; + OptionBox ob = opanp.addOption(opt); + ob.resetToDefault(setDefaultParams); + if (MAX_OPTWIDTH < ob.getPreferredSize().width) { - selectOption(opt, opt.getDefaultValue()); + MAX_OPTWIDTH = ob.getPreferredSize().width; } + ob.validate(); + cw += ob.getPreferredSize().width + 5; } else { System.err.println("Ignoring unknown service argument type " - + arg.getClass().getName()); + + myarg.getClass().getName()); } } } + 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 + } + + 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 + opanp.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()); + opanp.selectOption((OptionI) arg, arg.getValue()); } - } + } } - mdl.setData(setargs); - paramTable.setModel(mdl); - // paramTable.validate(); - jobOptions.setLayout(new GridLayout(optSet.size() / 2 + 1, 2)); - jobOptions.validate(); + refreshParamLayout(); + 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(); + } + + public 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(); - - JCheckBox enabled = new JCheckBox(); + return selectedItem.equals(SVC_DEF) + || servicePresets.containsKey(selectedItem); + } - public OptionBox(Option opt) + /** + * check if the current set name is a valid set name for saving, if not, then + * fix it. + */ + private void makeSetNameValid(boolean newuserset) + { + boolean stn = settingDialog; + boolean renamed = false; + settingDialog = true; + String nm = (curSetName != null ? curSetName : (String) setName + .getSelectedItem()); + // check if the name is reserved - if it is, rename it. + if (isServicePreset(nm)) { - setLayout(new 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) + nm = "User " + nm; + renamed = true; + } + String tnm = nm; + if (newuserset) + { + int i = 0; + while (paramStore.getPreset(tnm) != null) { - setLayout(new GridLayout(1,2)); - for (Object str : opt.getPossibleValues()) - { - val.addItem((String) str); - } - val.setSelectedItem((String) opt.getDefaultValue()); - add(val, BorderLayout.SOUTH); + tnm = nm + " (" + (++i) + ")"; + renamed = true; + } + if (i > 0) + { + nm = tnm; } - // TODO: add actionListeners for popup (to open further info), - // and to update list of parameters if an option is enabled - // that takes a value. } - } - private OptionBox addOption(Option opt) - { - OptionBox cb = optSet.get(opt.getName()); - if (cb == null) + boolean makeupdate = false; + // sync the gui with the preset database + for (int i = 0, iS = setName.getItemCount(); i < iS; i++) { - cb = new OptionBox(opt); - optSet.put(opt.getName(), cb); - jobOptions.add(cb); + String snm = (String) setName.getItemAt(i); + if (snm.equals(nm)) + { + makeupdate = true; + // setName.setSelectedIndex(i); + } + } + if (!makeupdate) + { + setName.addItem(curSetName = nm); + setName.setSelectedItem(curSetName); } - return cb; + if (renamed) + { + settingDialog = false; // we need this name change to be registered. + argSetModified(setName, renamed); + } + settingDialog = stn; } - class WsParameterTableModel extends AbstractTableModel + public void refreshParamLayout() { - // arg list - vector for thread safety - public Vector data = new Vector(); + // optsAndparams.setPreferredSize(null); + FlowLayout fl = new FlowLayout(FlowLayout.LEFT); + int sep = fl.getVgap(); + boolean fh = true; + int os = 0, s = jobOptions.getBorder().getBorderInsets(jobOptions).bottom + + jobOptions.getBorder().getBorderInsets(jobOptions).top + + 2 + * sep; + /** + * final height for viewport + */ + int finalh = s; + int panewidth = paramPane.getViewport().getSize().width - 120 + - jobOptions.getBorder().getBorderInsets(jobOptions).left + + jobOptions.getBorder().getBorderInsets(jobOptions).right; + + int w = 2 + * fl.getHgap() + + (MAX_OPTWIDTH > OptsAndParamsPage.PARAM_WIDTH ? MAX_OPTWIDTH + : OptsAndParamsPage.PARAM_WIDTH); + int hgap = fl.getHgap(), cw = hgap; + + if (opanp.getOptSet().size() > 0) + { - private String[] colNames = - { "Parameter", "Value" }; + jobOptions.setLayout(new MigLayout("", "", "")); + jobOptions.removeAll(); - @Override - public int getColumnCount() - { - return 2; + for (OptionBox pbox : opanp.getOptSet().values()) + { + pbox.validate(); + cw += pbox.getSize().width + hgap; + if (cw + 120 > panewidth) + { + jobOptions.add(pbox, "wrap"); + // System.out.println("Wrap on "+pbox.option.getName()); + cw = hgap + pbox.getSize().width; + fh = true; + } + else + { + jobOptions.add(pbox); + } + if (fh) + { + finalh += pbox.getSize().height + fl.getVgap(); + fh = false; + } + } + jobOptions.revalidate(); } - - @Override - public int findColumn(String columnName) + else { - // TODO Auto-generated method stub - return super.findColumn(columnName); + jobOptions.setVisible(false); } - public void setData(List setargs) + // Now layout the parameters assuming they occupy one column - to calculate + // total height of options+parameters + fl = new FlowLayout(FlowLayout.LEFT); + // helpful hint from + // http://stackoverflow.com/questions/2743177/top-alignment-for-flowlayout + fl.setAlignOnBaseline(true); + if (opanp.getParamSet().size() > 0) { - if (setargs != null) + paramList.removeAll(); + paramList.setLayout(new MigLayout("", "", "")); + fh = true; + for (ParamBox pbox : opanp.getParamSet().values()) { - data = new Vector(setargs); + pbox.validate(); + cw += pbox.getSize().width + hgap; + if (cw + 160 > panewidth) + { + paramList.add(pbox, "wrap"); + cw = pbox.getSize().width + hgap; + fh = true; + } + else + { + paramList.add(pbox); + } + if (fh) + { + finalh += pbox.getSize().height + fl.getVgap(); + fh = false; + } } - else - { - data = new Vector(); - } + /* + * s = 2 * sep; for (ParamBox pbox : opanp.getParamSet().values()) { + * pbox.validate(); s += sep + + * pbox.getPreferredSize().height+pbox.getBorder + * ().getBorderInsets(pbox).bottom; } + * + * // paramList.setPreferredSize(new Dimension(w, s)); + * os+=s+2*sep+paramList + * .getBorder().getBorderInsets(paramList).bottom+paramList + * .getBorder().getBorderInsets(paramList).top; + */ + paramList.revalidate(); } - - public List getData() + else { - return new ArrayList(data); + paramList.setVisible(false); } + // TODO: waste some time trying to eliminate any unnecessary .validate calls + // here + // System.out.println("Size will be : "+w+","+os); + // optsAndparams.setPreferredSize(null); + // paramPane.getViewport().setView(optsAndparams); + paramPane.getViewport().setAutoscrolls(true); + paramPane.revalidate(); + revalidate(); + } - @Override - public int getRowCount() + /** + * testing method - grab a service and parameter set and show the window + * + * @param args + */ + public static void main(String[] args) + { + jalview.ws.jws2.Jws2Discoverer disc = jalview.ws.jws2.Jws2Discoverer + .getDiscoverer(); + int p = 0; + if (args.length > 0) { - return data.size(); + Vector services = new Vector(); + services.addElement(args[p++]); + Jws2Discoverer.getDiscoverer().setServiceUrls(services); } - - @Override - public Object getValueAt(int rowIndex, int columnIndex) + try { - if (rowIndex >= 0 && rowIndex < data.size()) + disc.run(); + } catch (Exception e) + { + System.err.println("Aborting. Problem discovering services."); + e.printStackTrace(); + return; + } + Jws2Instance lastserv = null; + for (Jws2Instance service : disc.getServices()) + { + lastserv = service; + if (p >= args.length || service.serviceType.equalsIgnoreCase(args[p])) { - Parameter prm = data.elementAt(rowIndex); - switch (columnIndex) + if (lastserv != null) { - case 0: - return prm.getName(); - case 1: - Object exc = null; - // the accessor name for the parameter value is possibly confusing - String val = prm.getDefaultValue(); - try + List prl = null; + Preset pr = null; + if (++p < args.length) { - if (prm.getValidValue().getType().equals(Type.Float)) + PresetManager prman = lastserv.getPresets(); + if (prman != null) { - exc = new Float(0); - return Float.parseFloat(val); + pr = prman.getPresetByName(args[p]); + if (pr == null) + { + // just grab the last preset. + prl = prman.getPresets(); + } } - if (prm.getValidValue().getType().equals(Type.Integer)) + } + else + { + PresetManager prman = lastserv.getPresets(); + if (prman != null) { - exc = new Integer(0); - return Integer.parseInt(val); + prl = prman.getPresets(); } - } catch (NumberFormatException e) - { - return exc; } - // must be a string - return val; + 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