X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FWsJobParameters.java;h=42f2ddb5cf0440ab268522e94af8e55ae208e68d;hb=747167089ecf8d6afc70d417f5a20352e029bd95;hp=b651833c42962bebcca0e530b172ed3c805f37bd;hpb=c6016c2fdffb1f7f84e44fbc0a1c0630d89ca17e;p=jalview.git diff --git a/src/jalview/gui/WsJobParameters.java b/src/jalview/gui/WsJobParameters.java index b651833..42f2ddb 100644 --- a/src/jalview/gui/WsJobParameters.java +++ b/src/jalview/gui/WsJobParameters.java @@ -1,75 +1,70 @@ +/* + * 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.bin.Console; +import jalview.gui.OptsAndParamsPage.OptionBox; +import jalview.gui.OptsAndParamsPage.ParamBox; +import jalview.util.MessageManager; +import jalview.ws.api.UIinfo; +import jalview.ws.params.ArgumentI; +import jalview.ws.params.OptionI; +import jalview.ws.params.ParamDatastoreI; +import jalview.ws.params.ParameterI; +import jalview.ws.params.WsParamSetI; import java.awt.BorderLayout; -import java.awt.Color; import java.awt.Component; import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Font; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; import java.awt.GridLayout; import java.awt.Rectangle; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.event.ComponentEvent; -import java.awt.event.ComponentListener; -import java.awt.event.ContainerEvent; -import java.awt.event.ContainerListener; +import java.awt.event.HierarchyBoundsListener; +import java.awt.event.HierarchyEvent; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; -import java.awt.event.KeyEvent; -import java.awt.event.KeyListener; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; -import java.awt.event.WindowEvent; -import java.awt.event.WindowListener; -import java.awt.event.WindowStateListener; -import java.util.ArrayList; -import java.util.EventObject; -import java.util.HashSet; import java.util.Hashtable; -import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Vector; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.CompletionStage; import javax.swing.JButton; -import javax.swing.JCheckBox; import javax.swing.JComboBox; import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.JLabel; -import javax.swing.JList; -import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; -import javax.swing.JSlider; -import javax.swing.JSplitPane; -import javax.swing.JTable; import javax.swing.JTextArea; -import javax.swing.JTextField; -import javax.swing.ListSelectionModel; -import javax.swing.SwingConstants; -import javax.swing.SwingUtilities; +import javax.swing.WindowConstants; 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; -import compbio.metadata.Option; -import compbio.metadata.Parameter; -import compbio.metadata.Preset; -import compbio.metadata.PresetManager; -import compbio.metadata.RunnerConfig; -import compbio.metadata.ValueConstrain; -import compbio.metadata.WrongParameterException; -import compbio.metadata.ValueConstrain.Type; - -import jalview.ws.jws2.Jws2Discoverer; -import jalview.ws.jws2.Jws2Discoverer.Jws2Instance; +import net.miginfocom.swing.MigLayout; /** * job parameter editing/browsing dialog box. User can browse existing settings @@ -87,183 +82,211 @@ import jalview.ws.jws2.Jws2Discoverer.Jws2Instance; * */ public class WsJobParameters extends JPanel implements ItemListener, - ActionListener, DocumentListener + ActionListener, DocumentListener, OptsParametersContainerI { - 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 PREFERRED_WIDTH = 540; - private static final int OPTSET_HEIGHT = 30; + private static final int DEFAULT_HEIGHT = 640; - JPanel SetNamePanel = new JPanel(); + // the default parameter set shown to the user + private static final String SVC_DEF = "Defaults"; - JPanel setDetails = new JPanel(); + private int maxOptWidth = 200; - JSplitPane settingsPanel = new JSplitPane(); + // URL linkImageURL = getClass().getResource("/images/link.gif"); - JSplitPane jobPanel = new JSplitPane(); + // TODO ABSRACT FROM JABAWS CLASSES - JPanel jobOptions = new JPanel(); - - JScrollPane jobOptionsPane = new JScrollPane(); + // completion stage representing whether start was clicked + private final CompletableFuture completionStage = new CompletableFuture<>(); + + /** + * manager for options and parameters. + */ + OptsAndParamsPage opanp; - JPanel jobParameters = new JPanel(); + /* + * panel containing job options + */ + JPanel optionsPanel = new JPanel(); - JButton savmodified = new JButton(); + /* + * panel containing job parameters + */ + JPanel paramsPanel = new JPanel(); - JButton renmodified = new JButton(); + JPanel setNamePanel = new JPanel(); - JButton deletesetting = new JButton(); + JButton createpref = new JButton(); - JButton revertsetting = new JButton(); + JButton deletepref = new JButton(); - JButton startjob = new JButton(); + JButton revertpref = new JButton(); - JButton canceljob = new JButton(); + JButton updatepref = new JButton(); - JComboBox setName = new JComboBox(); + JComboBox setName = new JComboBox<>(); JTextArea setDescr = new JTextArea(); JScrollPane paramPane = new JScrollPane(); + + JButton startjob = JvSwingUtils.makeButton( + MessageManager.getString("action.start_job"), + MessageManager.getString("label.start_job_current_settings"), + this::startjob_actionPerformed); + JButton canceljob = JvSwingUtils.makeButton( + MessageManager.getString("action.cancel_job"), + MessageManager.getString("label.cancel_job_close_dialog"), + this::canceljob_actionPerformed); - // JList paramList = new JList(); - JPanel paramList = new JPanel(); + ParamDatastoreI paramStore; - RunnerConfig serviceOptions; + // set true when 'Start Job' is clicked + boolean startJob = false; - private BorderLayout jparamLayout; + JFrame frame = null; - WsJobParameters(Jws2Instance service) - { - this(service, null); - } + UIinfo service; + + /* + * list of service presets in the gui + */ + Hashtable servicePresets = null; - public WsJobParameters(Jws2Instance service, Preset p) + /* + * set if dialog is being set - so handlers will avoid spurious events + */ + boolean settingDialog = false; + + private Hashtable modifiedElements = new Hashtable<>(); + + String lastParmSet = null; + + public WsJobParameters(ParamDatastoreI store, WsParamSetI preset, + List args) { - this(null, service, p, null); + super(); + + // parameters dialog in 'compact' format (help as tooltips) + opanp = new OptsAndParamsPage(this, true); + jbInit(); + this.paramStore = store; + this.service = null; + initForService(preset, args); + validate(); } /** + * Constructor given a set of parameters and presets, a service to be invoked, + * and a list of (Jabaws client) arguments * - * @param desktop - * - if null, create new JFrame outside of desktop + * @param paramStorei * @param service - * @param p + * @param preset + * @param jobArgset */ - public WsJobParameters(JFrame parent, Jws2Instance service, Preset p, - List jobArgset) + public WsJobParameters(ParamDatastoreI paramStorei, UIinfo service, + WsParamSetI preset, List jobArgset) { super(); + // parameters dialog in 'expanded' format (help text boxes) + opanp = new OptsAndParamsPage(this, false); jbInit(); - // argSetModified(false); - // populate parameter table - initForService(service, p, jobArgset); - // display in new JFrame attached to parent. + this.paramStore = paramStorei; + if (paramStore == null && service != null) + { + paramStore = service.getParamStore(); + } + this.service = service; + initForService(preset, jobArgset); validate(); } - int response = -1; - JDialog frame = null; - - public boolean showRunDialog() + /** + * Shows a modal dialog containing the parameters and Start or Cancel options. + * Answers true if the job is started, false if cancelled. + * + * @return + */ + public CompletionStage showRunDialog() { - 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() - 92), 380, 385)); + // Should JFrame hahve a parent of getDesktop ? + frame = new JFrame(); + frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); + if (service != null) + { + frame.setTitle(MessageManager.formatMessage("label.edit_params_for", + new String[] { service.getActionText() })); + } + Rectangle deskr = Desktop.getInstance().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); - frame.setVisible(true); + // should perhaps recover defaults from user prefs. - if (response > 0) + frame.validate(); + javax.swing.SwingUtilities.invokeLater(new Runnable() { - return true; - } - return false; - } + @Override + public void run() + { + // jobPanel.setDividerLocation(0.25); - protected JButton makeButton(String label, String tooltip, - ActionListener action) - { - JButton button = new JButton(); - button.setText(label); - button.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); - button.setForeground(Color.black); - button.setHorizontalAlignment(SwingConstants.CENTER); - button.setToolTipText(tooltip); - button.addActionListener(action); - return button; + } + }); + + frame.setVisible(true); + + return completionStage; } private void jbInit() { - savmodified = makeButton("Save", "Not implemented yet :) ", - new ActionListener() - { - - public void actionPerformed(ActionEvent e) - { - savModified_actionPerformed(e); - } - }); - renmodified = makeButton("Rename", "Not implemented yet :) ", - new ActionListener() - { - - public void actionPerformed(ActionEvent e) - { - renModified_actionPerformed(e); - } - }); - deletesetting = makeButton("Delete", "Not implemented yet :) ", - new ActionListener() - { - - public void actionPerformed(ActionEvent e) - { - deleteSetting_actionPerformed(e); - } - }); - revertsetting = makeButton("Revert", "Undo changes to parameters.", - new ActionListener() - { - - public void actionPerformed(ActionEvent e) - { - revertSetting_actionPerformed(e); - } - }); - - startjob.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); - startjob.setText("Start"); - startjob.setToolTipText("Start Job"); - startjob.addActionListener(new ActionListener() + this.addHierarchyBoundsListener(new HierarchyBoundsListener() { - public void actionPerformed(ActionEvent e) + + @Override + public void ancestorResized(HierarchyEvent arg0) { - startjob_actionPerformed(e); + refreshParamLayout(); } - }); - canceljob.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); - canceljob.setText("Cancel"); - canceljob.setToolTipText("Cancel Job"); - canceljob.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent e) + + @Override + public void ancestorMoved(HierarchyEvent arg0) { - canceljob_actionPerformed(e); + // TODO Auto-generated method stub + } }); - - setDetails.setBorder(new TitledBorder("Details")); + updatepref = JvSwingUtils.makeButton( + MessageManager.getString("action.update"), + MessageManager.getString("label.update_user_parameter_set"), + this::update_actionPerformed); + deletepref = JvSwingUtils.makeButton( + MessageManager.getString("action.delete"), + MessageManager.getString("label.delete_user_parameter_set"), + this::delete_actionPerformed); + createpref = JvSwingUtils.makeButton( + MessageManager.getString("action.create"), + MessageManager.getString("label.create_user_parameter_set"), + this::create_actionPerformed); + revertpref = JvSwingUtils.makeButton( + MessageManager.getString("action.revert"), + MessageManager + .getString("label.revert_changes_user_parameter_set"), + this::revert_actionPerformed); + + + JPanel setDetails = new JPanel(); + setDetails.setBorder( + new TitledBorder(MessageManager.getString("label.details"))); setDetails.setLayout(new BorderLayout()); setDescr.setColumns(40); setDescr.setWrapStyleWord(true); @@ -271,211 +294,282 @@ public class WsJobParameters extends JPanel implements ItemListener, setDescr.setBackground(getBackground()); setDescr.setEditable(true); setDescr.getDocument().addDocumentListener(this); + setDescr.setToolTipText( + MessageManager.getString("label.edit_notes_parameter_set")); JScrollPane setDescrView = new JScrollPane(); - // setDescrView.setPreferredSize(new Dimension(350, 200)); setDescrView.getViewport().setView(setDescr); setName.setEditable(true); setName.addItemListener(this); setName.getEditor().addActionListener(this); - SetNamePanel.setLayout(new BorderLayout()); - SetNamePanel.add(setName, BorderLayout.WEST); + JPanel setNameInfo = new JPanel(new FlowLayout(FlowLayout.LEFT)); + GridBagLayout gbl = new GridBagLayout(); + setNamePanel.setLayout(gbl); + + JLabel setNameLabel = new JLabel( + MessageManager.getString("label.current_parameter_set_name")); + setNameLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); + + setNameInfo.add(setNameLabel); + setNameInfo.add(setName); + // initial button visibility - deletesetting.setVisible(false); - revertsetting.setVisible(false); - renmodified.setVisible(false); - savmodified.setVisible(false); + updatepref.setVisible(false); + deletepref.setVisible(false); + revertpref.setVisible(false); + createpref.setVisible(false); JPanel setsavebuts = new JPanel(); - setsavebuts.setLayout(new FlowLayout()); - setsavebuts.add(revertsetting, BorderLayout.CENTER); - setsavebuts.add(renmodified, BorderLayout.CENTER); - setsavebuts.add(deletesetting, BorderLayout.CENTER); - setsavebuts.add(savmodified, BorderLayout.EAST); - SetNamePanel.add(setsavebuts,BorderLayout.EAST); + setsavebuts.setLayout(new FlowLayout(FlowLayout.LEFT, 10, 0)); // GridLayout(1,2)); + JPanel spacer = new JPanel(); + spacer.setPreferredSize(new Dimension(2, 30)); + setsavebuts.add(spacer); + setsavebuts.add(deletepref); + setsavebuts.add(revertpref); + setsavebuts.add(createpref); + setsavebuts.add(updatepref); + // setsavebuts.setSize(new Dimension(150, 30)); + JPanel buttonArea = new JPanel(new GridLayout(1, 1)); + buttonArea.add(setsavebuts); + setNamePanel.add(setNameInfo); + GridBagConstraints gbc = new GridBagConstraints(); + gbc.gridheight = 2; + gbl.setConstraints(setNameInfo, gbc); + setNamePanel.add(buttonArea); + gbc = new GridBagConstraints(); + gbc.gridx = 0; + gbc.gridy = 2; + gbc.gridheight = 1; + gbl.setConstraints(buttonArea, gbc); setDetails.add(setDescrView, BorderLayout.CENTER); - // setDetails.setPreferredSize(new Dimension(360, 100)); - jobParameters.setBorder(new TitledBorder("Parameters")); - jobParameters.setLayout(jparamLayout = new BorderLayout()); - paramPane.setPreferredSize(new Dimension(360, 300)); - paramPane.getVerticalScrollBar().setUnitIncrement(20); - // paramPanel.setPreferredSize(new Dimension(360, 300)); - // TODO: relayout buttons nicely - paramPane.getViewport().setView(paramList); - jobParameters.add(paramPane, BorderLayout.CENTER); - JPanel jobOptionsPanel = new JPanel(); - jobOptionsPanel.setLayout(new BorderLayout()); - jobOptionsPanel.setBorder(new TitledBorder("Options")); - jobOptionsPane.getViewport().setView(jobOptions); - jobOptionsPanel.add(jobOptionsPane, BorderLayout.CENTER); - settingsPanel.setLeftComponent(jobOptionsPanel); - settingsPanel.setRightComponent(jobParameters); - settingsPanel.setOrientation(JSplitPane.VERTICAL_SPLIT); - settingsPanel.setDividerLocation(0.4); + // paramPane.setPreferredSize(new Dimension(360, 400)); + // paramPane.setPreferredSize(null); + optionsPanel.setBorder( + new TitledBorder(MessageManager.getString("label.options"))); + optionsPanel.setOpaque(true); + paramsPanel.setBorder( + new TitledBorder(MessageManager.getString("label.parameters"))); + paramsPanel.setOpaque(true); + // optsAndparams.setScrollableWidth(ScrollableSizeHint.FIT); + // optsAndparams.setScrollableHeight(ScrollableSizeHint.NONE); + // optsAndparams.setLayout(new BorderLayout()); + JPanel optsAndparams = new JPanel(); + optsAndparams.setLayout(new BorderLayout()); + optsAndparams.add(optionsPanel, BorderLayout.NORTH); + optsAndparams.add(paramsPanel, BorderLayout.CENTER); + JPanel jp = new JPanel(new BorderLayout()); + jp.add(optsAndparams, BorderLayout.CENTER); + paramPane.getViewport().setView(jp); + paramPane.setBorder(null); setLayout(new BorderLayout()); - // setPreferredSize(new Dimension(400, 600)); - // setSize(new Dimension(400, 600)); - jobPanel.setLeftComponent(setDetails); - jobPanel.setRightComponent(settingsPanel); - jobPanel.setOrientation(JSplitPane.VERTICAL_SPLIT); - jobPanel.setDividerLocation(0.8); - add(SetNamePanel, BorderLayout.NORTH); + JPanel jobPanel = new JPanel(); + 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: + // check for null is for JUnit usage + final int windowHeight = Desktop.getInstance() == null ? DEFAULT_HEIGHT + : Desktop.getInstance().getHeight(); + setPreferredSize(new Dimension(540, windowHeight)); add(dialogpanel, BorderLayout.SOUTH); + validate(); } - protected void revertSetting_actionPerformed(ActionEvent e) + protected void revert_actionPerformed(ActionEvent e) { - // TODO Auto-generated method stub - + reInitDialog(lastParmSet); + updateWebServiceMenus(); } - protected void deleteSetting_actionPerformed(ActionEvent e) + protected void update_actionPerformed(ActionEvent e) { - String setname = (String) setName.getSelectedItem(); - int p=setName.getSelectedIndex(); - if (_getUserPreset(setname)!=null) + if (isUserPreset) { - _deleteUserPreset(setname); - + String curname = ((String) setName.getSelectedItem()).trim(); + _updatePreset(lastParmSet, curname); + lastParmSet = curname; + isUserPreset = true; + initArgSetModified(); + syncSetNamesWithStore(); } - if (p>0 && p+1==setName.getItemCount()) - { - p--; - } - setName.setSelectedIndex(p); - } - protected void renModified_actionPerformed(ActionEvent e) + private void _deleteUserPreset(String lastParmSet2) { - if (curSetName==null || _getUserPreset(lastSetName)==null) { - System.err.println("can't rename - names unchanged or original name not a preset."); - return; + paramStore.deletePreset(lastParmSet2); + } + + protected void delete_actionPerformed(ActionEvent e) + { + if (isUserPreset) + { + // delete current preset's saved entry + _deleteUserPreset(lastParmSet); } - _deleteUserPreset(lastSetName); - lastSetName=curSetName; - savModified_actionPerformed(e); - curSetName=null; - boolean setd = settingDialog; - settingDialog=true; - syncSetNamesWithStore(); - settingDialog=setd; + reInitDialog(null); // service default + updateWebServiceMenus(); } - protected void savModified_actionPerformed(ActionEvent e) + protected void create_actionPerformed(ActionEvent e) { - _storeUserPreset(lastSetName=(String) setName.getSelectedItem(), setDescr.getText(), getJobParams()); - curSetName=null; - initArgSetModified(); // reset the modification state + String curname = ((String) setName.getSelectedItem()).trim(); + if (curname.length() > 0) + { + _storeCurrentPreset(curname); + lastParmSet = curname; + isUserPreset = true; + reInitDialog(curname); + initArgSetModified(); + updateWebServiceMenus(); + } + else + { + // TODO: show warning + System.err.println("Invalid name. Not saved."); + } } protected void canceljob_actionPerformed(ActionEvent e) { - response = 0; + startJob = false; if (frame != null) { frame.setVisible(false); } + completionStage.complete(false); } protected void startjob_actionPerformed(ActionEvent e) { - response = 1; + startJob = true; if (frame != null) { frame.setVisible(false); } + completionStage.complete(true); } - Jws2Instance service; + void initForService(WsParamSetI paramSet, List jobArgset) + { + settingDialog = true; - /** - * list of service presets in the gui - */ - Hashtable servicePresets = null; + init(paramSet, jobArgset); - /** - * set if dialog is being set - so handlers will avoid spurious events - */ - boolean settingDialog = false; + } - void initForService(Jws2Instance service, Preset p, - List jobArgset) + void init(WsParamSetI p, List jobArgset) { - settingDialog = true; - this.service = service; - // TODO: Recover window geometry prefs for this service - // jobPanel.setDividerLocation(proportionalLocation) - // settingsPanel.setDividerLocation(proportionalLocation) - Hashtable exnames = new Hashtable(); + Hashtable exnames = new Hashtable<>(); for (int i = 0, iSize = setName.getItemCount(); i < iSize; i++) { - exnames.put((String) setName.getItemAt(i), setName.getItemAt(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); } - serviceOptions = service.getRunnerConfig(); - // add any presets not already added. - String curname = (p == null ? "" : p.getName()); - PresetManager prman = service.getPresets(); - servicePresets = new Hashtable(); - if (prman != null) + // String curname = (p == null ? "" : p.getName()); + for (WsParamSetI pr : paramStore.getPresets()) { - List prList = service.getPresets().getPresets(); - if (prList != null) + if (!pr.isModifiable()) { - for (Object pr : prList) - { - servicePresets.put(((Preset) pr).getName(), "preset"); - if (!exnames.contains(((Preset) pr).getName())) - { - setName.addItem(((Preset) pr).getName()); - } - } + servicePresets.put(pr.getName(), "preset"); + } + else + { + } + if (!exnames.contains(pr.getName())) + { + setName.addItem(pr.getName()); + } + } + // TODO: if initial jobArgset matches a given user setting or preset then + // should recover setting accordingly + // updateTable(p, jobArgset); + if (p != null) + { + reInitDialog(p.getName()); + initArgSetModified(); + } + else + { + if (jobArgset != null && jobArgset.size() > 0) + { + curSetName = "Supplied Settings"; + isUserPreset = false; + updateTable(p, jobArgset); + setName.setSelectedItem(curSetName); + updateButtonDisplay(); + } + else + { + curSetName = null; + reInitDialog(null); } } - updateTable(p, jobArgset); - initArgSetModified(); settingDialog = false; } - @SuppressWarnings("unchecked") - private void updateTable(Preset p, List jobArgset) + private void updateTable(WsParamSetI p, List jobArgset) { - List setargs = new ArrayList(); + boolean setDefaultParams = false; + if (lastParmSet == null) + { + isUserPreset = false; + // First call - so provide Service default settings + setName.setSelectedItem(lastSetName = SVC_DEF); + } + if (p == null && SVC_DEF.equals("" + setName.getSelectedItem())) + { + // indicate that service defaults should be set if available + setDefaultParams = true; + } // populate table from default parameter set. - List 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; - addParameter(parm); + ParameterI parm = (ParameterI) myarg; + opanp.addParameter(parm).validate(); } else { - if (myarg instanceof Option) + if (myarg instanceof OptionI) { - Option opt = (Option) myarg; - addOption(opt).resetToDefault(); + OptionI opt = (OptionI) myarg; + OptionBox ob = opanp.addOption(opt); + ob.resetToDefault(setDefaultParams); + if (maxOptWidth < ob.getPreferredSize().width) + { + maxOptWidth = ob.getPreferredSize().width; + } + ob.validate(); + cw += ob.getPreferredSize().width + 5; } else { System.err.println("Ignoring unknown service argument type " - + arg.getClass().getName()); + + myarg.getClass().getName()); } } } @@ -483,28 +577,20 @@ public class WsJobParameters extends JPanel implements ItemListener, } if (p != null) { + isUserPreset = false; // initialise setname setName.setSelectedItem(lastSetName = p.getName()); setDescr.setText(lastDescrText = p.getDescription()); // TODO - URL link try { - args = p.getArguments(serviceOptions); + args = p.getArguments(); } catch (Exception e) { e.printStackTrace(); } // TODO: check if args should be unselected prior to resetting using the // preset - setargs.clear(); - } - else - { - if (lastParmSet == null) - { - // first call - so create a dummy name - setName.setSelectedItem(lastSetName = SVC_DEF); - } } if (jobArgset != null) @@ -515,31 +601,28 @@ public class WsJobParameters extends JPanel implements ItemListener, // get setargs from current object if (args != null) { - for (Argument arg : args) + for (ArgumentI arg : args) { - if (arg instanceof Parameter) + if (arg instanceof ParameterI) { - setParameter((Parameter) arg); + opanp.setParameter((ParameterI) arg); } else { - if (arg instanceof Option) + if (arg instanceof OptionI) { - System.out.println("Setting option " + arg.getName() + " with " - + arg.getDefaultValue()); - selectOption((Option) arg, arg.getDefaultValue()); + // System.out.println("Setting option " + // + System.identityHashCode(arg) + ":" + arg.getName() + // + " with " + arg.getDefaultValue()); + opanp.selectOption((OptionI) arg, arg.getValue()); } } } } - jobOptions.setPreferredSize(new Dimension(PARAM_WIDTH, optSet.size() - * OPTSET_HEIGHT)); - jobOptions.setLayout(new GridLayout(optSet.size(), 1)); refreshParamLayout(); - paramPane.validate(); - validate(); + revalidate(); } private boolean isModified() @@ -547,7 +630,6 @@ public class WsJobParameters extends JPanel implements ItemListener, return modifiedElements.size() > 0; } - private Hashtable modifiedElements = new Hashtable(); /** * reset gui and modification state settings @@ -556,57 +638,66 @@ public class WsJobParameters extends JPanel implements ItemListener, { curSetName = null; modifiedElements.clear(); - renmodified.setVisible(false); - savmodified.setVisible(false); + updateButtonDisplay(); + } + private void updateButtonDisplay() + { + boolean _update = false, _create = false, _delete = false, + _revert = false; + if (modifiedElements.size() > 0) + { + // set modified + _revert = true; + _update = isUserPreset; // can only update user presets + if (!isUserPreset || modifiedElements.containsKey(setName)) + { + // name modified - can create new preset + _create = true; + } + } + else + { + // set unmodified + } + // can still delete a user preset + _delete = isUserPreset; + + createpref.setVisible(_create); + updatepref.setVisible(_update); + deletepref.setVisible(_delete); + revertpref.setVisible(_revert); + validate(); } - private void argSetModified(Object modifiedElement, boolean b) + @Override + public void argSetModified(Object modifiedElement, boolean b) { if (settingDialog) { return; } - if (!b) { modifiedElements.remove(modifiedElement); } else { - modifiedElements.put(modifiedElement, modifiedElement); - } - // set mod status based on presence of elements in table - if (modifiedElements.size() > 0) - { - makeSetNameValid(); - savmodified.setVisible(true); - revertsetting.setVisible(false); - } - else - { - revertsetting.setVisible(false); - deletesetting - .setVisible(!isServicePreset((String) setName - .getSelectedItem()) - && _getUserPreset((String) setName.getSelectedItem()) != null); - savmodified.setVisible(false); - } - // special reveal if setName has been modified - if (modifiedElements.get(setName) != null) - { - if (curSetName != null && lastSetName != null - && !lastSetName.equals(curSetName)) + if (b && modifiedElement == setName + && modifiedElements.contains(modifiedElement)) { - renmodified.setVisible(!isServicePreset(lastSetName)); + // HACK! prevents iteration on makeSetNameValid + b = false; } + modifiedElements.put(modifiedElement, modifiedElement); } - else + // set mod status based on presence of elements in table + if (b && modifiedElements.size() > 0) { - // setname isn't in modlist - so don't rename - renmodified.setVisible(false); + makeSetNameValid(!isUserPreset); + setNamePanel.revalidate(); } - validate(); + updateButtonDisplay(); } private boolean isServicePreset(String selectedItem) @@ -619,843 +710,395 @@ public class WsJobParameters extends JPanel implements ItemListener, * check if the current set name is a valid set name for saving, if not, then * fix it. */ - private void makeSetNameValid() + private void makeSetNameValid(boolean newuserset) { boolean stn = settingDialog; boolean renamed = false; settingDialog = true; - String nm = (String) setName.getSelectedItem(); + String nm = (curSetName != null ? curSetName + : (String) setName.getSelectedItem()); // check if the name is reserved - if it is, rename it. if (isServicePreset(nm)) { nm = "User " + nm; renamed = true; } - // if () - // if nm exists in user's preset store then savmodified will update an - // existing user defined preset - // if nm doesn't exist, then the button will create a new preset. + String tnm = nm; + if (newuserset) + { + int i = 0; + while (paramStore.getPreset(tnm) != null) + { + tnm = nm + " (" + (++i) + ")"; + renamed = true; + } + if (i > 0) + { + nm = tnm; + } + } boolean makeupdate = false; // sync the gui with the preset database for (int i = 0, iS = setName.getItemCount(); i < iS; i++) { - String snm = (String) setName.getItemAt(i); + String snm = setName.getItemAt(i); if (snm.equals(nm)) { makeupdate = true; - setName.setSelectedIndex(i); + // setName.setSelectedIndex(i); } } - - if (_getUserPreset(nm) != null) + if (!makeupdate) { - savmodified.setText("Update"); + setName.addItem(curSetName = nm); + setName.setSelectedItem(curSetName); } - else + if (renamed) { - if (renamed) - { - setName.addItem(nm); - setName.setSelectedIndex(setName.getItemCount() - 1); - } - savmodified.setText("Save"); + settingDialog = false; // we need this name change to be registered. + argSetModified(setName, renamed); } settingDialog = stn; } - private void addParameter(Parameter parm) + /** + * Rebuilds the Options and Parameters panels + */ + @Override + public void refreshParamLayout() { - ParamBox pb = paramSet.get(parm.getName()); - if (pb == null) - { - pb = new ParamBox(this, parm); - paramSet.put(parm.getName(), pb); - paramList.add(pb); - } - pb.init(); - // take the defaults from the parameter - pb.updateControls(parm); - } + final int rightMargin = 40; + final int availableWidth = paramPane.getViewport().getSize().width + - rightMargin + - optionsPanel.getBorder().getBorderInsets(optionsPanel).left + + optionsPanel.getBorder().getBorderInsets(optionsPanel).right; - private void setParameter(Parameter arg) - { - ParamBox pb = paramSet.get(arg.getName()); - if (pb == null) + if (opanp.getOptSet().size() > 0) { - addParameter(arg); + int hgap = 5; + int currentWidth = hgap; + + /* + * layout constraint 'nogrid' prevents vertical column alignment, + * allowing controls to flow without extra space inserted to align + */ + optionsPanel.setLayout(new MigLayout("nogrid", "", "")); + optionsPanel.removeAll(); + JPanel lastAdded = null; + + /* + * add each control in turn; if adding would overflow the right margin, + * remove and re-add the previous parameter with "wrap" (after) + * in order to start a new row + */ + for (OptionBox pbox : opanp.getOptSet().values()) + { + pbox.validate(); + int boxWidth = pbox.getSize().width; + currentWidth += boxWidth + hgap; + boolean wrapAfterLast = currentWidth > availableWidth + && lastAdded != null; + // System.out.println(String.format( + // "%s width=%d, paneWidth=%d, currentWidth=%d, wrapAfterLast=%s", + // pbox.toString(), boxWidth, panewidth, currentWidth, + // wrapAfterLast)); + if (wrapAfterLast) + { + optionsPanel.remove(lastAdded); + optionsPanel.add(lastAdded, "wrap"); + currentWidth = hgap + boxWidth; + } + optionsPanel.add(pbox); + lastAdded = pbox; + } + optionsPanel.revalidate(); } else { - pb.updateControls(arg); + optionsPanel.setVisible(false); } - } - - private void selectOption(Option opt, String string) - { - OptionBox cb = optSet.get(opt.getName()); - if (cb == null) - { - cb = addOption(opt); - } - cb.enabled.setSelected(true); // initial state for an option. - if (string != null) + if (opanp.getParamSet().size() > 0) { - if (opt.getPossibleValues().contains(string)) - { - cb.val.setSelectedItem(string); - } - else + paramsPanel.removeAll(); + paramsPanel.setLayout(new MigLayout("", "", "")); + int hgap = 5; + int currentWidth = hgap; + + JPanel lastAdded = null; + for (ParamBox pbox : opanp.getParamSet().values()) { - throw new Error("Invalid value " + string + " for option " + opt); + pbox.validate(); + int boxWidth = pbox.getSize().width; + currentWidth += boxWidth + hgap; + boolean wrapAfterLast = currentWidth > availableWidth + && lastAdded != null; + if (wrapAfterLast) + { + paramsPanel.remove(lastAdded); + paramsPanel.add(lastAdded, "wrap"); + currentWidth = pbox.getSize().width + hgap; + } + paramsPanel.add(pbox); + lastAdded = pbox; } + /* + * 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; + */ + paramsPanel.revalidate(); } - if (opt.isRequired() && !cb.enabled.isSelected()) + else { - // TODO: indicate paramset is not valid.. option needs to be selected! + paramsPanel.setVisible(false); } - cb.setInitialValue(); + // 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(); } - Map paramSet = new Hashtable(); - public class ParamBox extends JPanel implements ChangeListener, - ActionListener + public boolean isServiceDefaults() { - JButton showDesc = new JButton(); - - JTextArea string = new JTextArea(); - - JScrollPane descPanel = new JScrollPane(); - - JSlider slider = null; - - JTextField valueField = null; - - ValueConstrain validator = null; - - JPanel settingPanel = new JPanel(); - - JPanel controlPanel = new JPanel(); - - boolean integ = false; + return (!isModified() + && (lastParmSet != null && lastParmSet.equals(SVC_DEF))); + } - boolean choice = false; + public List getJobParams() + { + return opanp.getCurrentSettings(); + } - boolean descisvisible = false; - final WsJobParameters pmdialogbox; + /* + * Hashtable editedParams = new Hashtable(); + * + * store the given parameters in the user parameter set database. + * + * @param storeSetName - lastParmSet + * + * @param descr - setDescr.getText() + * + * @param jobParams - getJobParams() + * + * private void _storeUserPreset(String storeSetName, String descr, + * List jobParams) { // this is a simple hash store. Object[] pset; + * editedParams.put(storeSetName, pset = new Object[3]); pset[0] = + * storeSetName; pset[1] = descr; pset[2] = jobParams; // writeParam("Saving " + * + storeSetName + ": ", jobParams); } + * + * private void writeParam(String nm, List params) { for (ArgumentI + * p : params) { System.out.println(nm + ":" + System.identityHashCode(p) + + * " Name: " + p.getName() + " Value: " + p.getDefaultValue()); } } + * + * private Object[] _getUserPreset(String setName) { Object[] pset = + * editedParams.get(setName); // if (pset != null) // writeParam("Retrieving " + * + setName + ": ", (List) pset[2]); return pset; } + * + * * remove the given user preset from the preset stash + * + * @param setName + * + * private void _deleteUserPreset(String setName) { + * editedParams.remove(setName); } + */ - public ParamBox(final WsJobParameters pmlayout, Parameter parm) + private void syncSetNamesWithStore() + { + int n = 0; + // remove any set names in the drop down menu that aren't either a reserved + // setting, or a user defined or service preset. + Vector items = new Vector<>(); + while (n < setName.getItemCount()) { - pmdialogbox = pmlayout; - setPreferredSize(new Dimension(PARAM_WIDTH, PARAM_CLOSEDHEIGHT)); - setBorder(new TitledBorder(parm.getName())); - setLayout(null); - showDesc.setFont(new Font("Verdana", Font.PLAIN, 6)); - showDesc.setText("+"); - string.setFont(new Font("Verdana", Font.PLAIN, 11)); - string.setBackground(getBackground()); - // string.setSize(new Dimension(PARAM_WIDTH, 80)); - string.setEditable(false); - descPanel.getViewport().setView(string); - // descPanel.setLocation(2,17); - descPanel.setVisible(false); - // string.setMinimumSize(new Dimension(140,80)); - // string.setMaximumSize(new Dimension(280,80)); - final ParamBox me = this; - showDesc.addActionListener(new ActionListener() - { - - @Override - 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) + String item = setName.getItemAt(n); + if (!item.equals(SVC_DEF) && !paramStore.presetExists(item)) { - integ = validator.getType() == Type.Integer; + setName.removeItemAt(n); } else { - if (parameter.getPossibleValues() != null) - { - choice = true; - } + items.addElement(item); + n++; } - updateControls(parm); - descPanel.setBounds(new Rectangle(10, PARAM_CLOSEDHEIGHT, - PARAM_WIDTH - 20, PARAM_HEIGHT - PARAM_CLOSEDHEIGHT - 5)); - add(descPanel); - validate(); } - - public void init() + if (!items.contains(SVC_DEF)) { - // reset the widget's initial value. - lastVal = null; + setName.addItem(SVC_DEF); } + for (WsParamSetI upn : paramStore.getPresets()) + { + if (!items.contains(upn.getName())) + { + setName.addItem(upn.getName()); + } + } + } - boolean adjusting = false; - - Parameter parameter; - - JComboBox choicebox; + /** + * true if lastParmSet is a user preset + */ + boolean isUserPreset = false; - public int getBoxHeight() + private void reInitDialog(String nextPreset) + { + settingDialog = true; + // updateTable(null,null); // first reset to defaults + WsParamSetI pset = null; + if (nextPreset != null && nextPreset.length() > 0) { - return (descisvisible ? PARAM_HEIGHT : PARAM_CLOSEDHEIGHT); + pset = paramStore.getPreset(nextPreset); } - - public void updateControls(Parameter parm) + if (pset != null) { - adjusting = true; - boolean init = (choicebox == null && valueField == null); - float fVal = 0f; - int iVal = 0; - if (init) + if (pset.isModifiable()) { - 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); - - } + isUserPreset = true; + setDescr.setText(pset.getDescription()); + updateTable(null, pset.getArguments()); + lastParmSet = nextPreset; } - - if (parm != null) + else { - 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; - } - - Object lastVal; - - public Parameter getParameter() - { - try - { - if (choice) - { - parameter.setDefaultValue((String) choicebox.getSelectedItem()); - } - else - { - parameter.setDefaultValue(valueField.getText()); - } - } catch (WrongParameterException e) - { - e.printStackTrace(); - return null; - } - return parameter; - } - - public Object updateSliderFromValueField() - { - int iVal; - float fVal; - if (validator != null) - { - if (integ) - { - iVal = 0; - try - { - valueField.setText(valueField.getText().trim()); - iVal = Integer.valueOf(valueField.getText()); - } catch (Exception e) - { - } - ; - if (validator.getMin() != null && validator.getMax() != null) - { - slider.getModel().setRangeProperties(iVal, 1, - validator.getMin().intValue(), - validator.getMax().intValue(), true); - } - else - { - slider.setVisible(false); - } - return new int[] - { iVal }; - } - else - { - fVal = 0f; - try - { - fVal = Float.valueOf(valueField.getText()); - } catch (Exception e) - { - } - ; - if (validator.getMin() != null && validator.getMax() != null) - { - slider.getModel().setRangeProperties((int) fVal * 1000, 1, - (int) validator.getMin().floatValue() * 1000, - (int) validator.getMax().floatValue() * 1000, true); - } - else - { - slider.setVisible(false); - } - return new float[] - { fVal }; - } - } - else - { - if (!choice) - { - slider.setVisible(false); - return new String[] - { valueField.getText().trim() }; - } - else - { - return new String[] - { (String) choicebox.getSelectedItem() }; - } - } - - } - - @Override - public void stateChanged(ChangeEvent e) - { - if (!adjusting) - { - valueField.setText("" - + ((integ) ? ("" + (int) slider.getValue()) - : ("" + (float) (slider.getValue() / 1000f)))); - checkIfModified(); + isUserPreset = false; + setDescr.setText(""); + // must be a default preset from service + updateTable(pset, null); + lastParmSet = nextPreset; } - } - - @Override - public void actionPerformed(ActionEvent e) + else { - if (adjusting) - { - return; - } - if (!choice) - { - updateSliderFromValueField(); - } - checkIfModified(); + isUserPreset = false; + // Service defaults + setDescr.setText(""); + updateTable(null, null); + lastParmSet = SVC_DEF; } - 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); - } + initArgSetModified(); + syncSetNamesWithStore(); + setName.setSelectedItem(lastParmSet); + setNamePanel.validate(); + validate(); + settingDialog = false; } - Map optSet = new Hashtable(); - - public class OptionBox extends JPanel implements ActionListener + /** + * Rebuild the AlignFrame web service menus (after add/delete of a preset + * option). + */ + protected void updateWebServiceMenus() { - JComboBox val = new JComboBox(); - - JCheckBox enabled = new JCheckBox(); - - Option option; - - public OptionBox(Option opt) + if (Desktop.getInstance() == null) { - option = opt; - setLayout(new BorderLayout()); - enabled.setSelected(opt.isRequired()); // TODO: lock required options - enabled.setFont(new Font("Verdana", Font.PLAIN, 11)); - enabled.setText(opt.getName()); - enabled.setToolTipText(opt.getDescription()); - enabled.addActionListener(this); - add(enabled, BorderLayout.NORTH); - if (opt.getPossibleValues().size() > 1) - { - setLayout(new GridLayout(1, 2)); - for (Object str : opt.getPossibleValues()) - { - val.addItem((String) str); - } - val.setSelectedItem((String) opt.getDefaultValue()); - val.addActionListener(this); - add(val, BorderLayout.SOUTH); - } - // TODO: add actionListeners for popup (to open further info), - // and to update list of parameters if an option is enabled - // that takes a value. - setInitialValue(); + return; } - - public void resetToDefault() + for (AlignFrame alignFrame : Desktop.getAlignFrames()) { - enabled.setSelected(false); - if (option.isRequired()) - { - // Apply default value - selectOption(option, option.getDefaultValue()); - } + alignFrame.buildWebServicesMenu(); } + } - boolean initEnabled = false; - - String initVal = null; + String curSetName = null; - public void setInitialValue() + @Override + public void itemStateChanged(ItemEvent e) + { + if (e.getSource() == setName + && e.getStateChange() == ItemEvent.SELECTED) { - initEnabled = enabled.isSelected(); - if (option.getPossibleValues() != null - && option.getPossibleValues().size() > 1) + final String setname = (String) setName.getSelectedItem(); + if (Console.isDebugEnabled()) { - initVal = (String) val.getSelectedItem(); + Console.debug("Item state changed for " + setname + " (handling ? " + + !settingDialog + ")"); } - else + if (settingDialog) { - initVal = null; + // ignore event + return; } - } - - public Option getOptionIfEnabled() - { - if (!enabled.isSelected()) + if (setname == null) { - return null; + return; } - try + javax.swing.SwingUtilities.invokeLater(new Runnable() { - if (val.getSelectedItem() != null) + @Override + public void run() { - option.setDefaultValue((String) val.getSelectedItem()); + doPreferenceComboStateChange(setname); } - } catch (WrongParameterException e) - { - e.printStackTrace(); - return null; - } - return option; - } - - @Override - public void actionPerformed(ActionEvent e) - { - if (e.getSource() != enabled) - { - enabled.setSelected(true); - } - checkIfModified(); - } - - private void checkIfModified() - { - boolean notmod = (initEnabled == enabled.isSelected()); - if (enabled.isSelected() && initVal != null) - { - notmod |= initVal.equals(val.getSelectedItem()); - } - argSetModified(this, !notmod); - } - } - - private OptionBox addOption(Option opt) - { - OptionBox cb = optSet.get(opt.getName()); - if (cb == null) - { - cb = new OptionBox(opt); - optSet.put(opt.getName(), cb); - jobOptions.add(cb); + }); } - return cb; } - protected void refreshParamLayout() + private void doPreferenceComboStateChange(String setname) { - int s = 100; - for (ParamBox pbox : paramSet.values()) - { - s += pbox.getBoxHeight(); - } - paramList.setPreferredSize(new Dimension(PARAM_WIDTH, s)); - paramList.setLayout(new FlowLayout()); - validate(); - } - - /** - * 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 > 3) - { - Vector services = new Vector(); - services.addElement(args[p++]); - Jws2Discoverer.setServiceUrls(services); - } - try - { - disc.run(); - } catch (Exception e) - { - System.err.println("Aborting. Problem discovering services."); - e.printStackTrace(); - return; - } - Jws2Discoverer.Jws2Instance lastserv = null; - for (Jws2Discoverer.Jws2Instance service : disc.getServices()) - { - lastserv = service; - if (p < args.length && service.serviceType.equalsIgnoreCase(args[p])) - { - break; - } - } - if (lastserv != null) + // user has selected a different item from combo-box + if (isModified()) { - List prl = null; - Preset pr = null; - if (++p < args.length) + String lsetname = (curSetName != null) ? curSetName : lastParmSet; + if (lsetname.equals(setname)) { - PresetManager prman = lastserv.getPresets(); - if (prman != null) - { - pr = prman.getPresetByName(args[p]); - if (pr == null) - { - // just grab the last preset. - prl = prman.getPresets(); - } - } + // setname was just edited - so ignore this event. + return; } - Iterator en = (prl == null) ? null : prl.iterator(); - while (true) + settingDialog = true; + System.out.println("Prompting to save " + lsetname); + if (JvOptionPane.showConfirmDialog(this, "Parameter set '" + lsetname + + "' is modifed, and your changes will be lost.\nReally change preset ?", + "Warning: Unsaved Changes", + JvOptionPane.OK_CANCEL_OPTION) != JvOptionPane.OK_OPTION) { - if (en != null) - { - if (!en.hasNext()) - { - en = prl.iterator(); - } - 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) - { - // TODO Auto-generated method stub - - } - - @Override - public void windowClosed(WindowEvent e) - { - } - - @Override - public void windowClosing(WindowEvent e) - { - thr.interrupt(); - - } - - @Override - public void windowDeactivated(WindowEvent e) - { - // TODO Auto-generated method stub - - } - - @Override - public void windowDeiconified(WindowEvent e) - { - // TODO Auto-generated method stub - - } - - @Override - public void windowIconified(WindowEvent e) - { - // TODO Auto-generated method stub - - } - - @Override - public void windowOpened(WindowEvent e) - { - // TODO Auto-generated method stub - - } - - }); - jf.setVisible(true); - boolean inter = false; - while (!inter) - { - try - { - Thread.sleep(10000); - } catch (Exception e) - { - inter = true; - } - ; - } - jf.dispose(); - } - } - } + // revert the combobox to the current item + settingDialog = true; + setName.setSelectedItem(lsetname); + settingDialog = false; + // and leave. + return; + // System.out.println("Saving for " + lsetname); + // _storeCurrentPreset(lsetname); - public List getJobParams() - { - List argSet = new ArrayList(); - // recover options and parameters from GUI - for (OptionBox opts : optSet.values()) - { - Option opt = opts.getOptionIfEnabled(); - if (opt != null) - { - argSet.add(opt); } } - for (ParamBox parambox : paramSet.values()) - { - Parameter parm = parambox.getParameter(); - if (parm != null) - { - argSet.add(parm); - } - } - - return argSet; - } - - String lastParmSet = null; - - Hashtable editedParams = new Hashtable(); - - /** - * store the given parameters in the user parameter set database. - * - * @param storeSetName - * - lastParmSet - * @param descr - * - setDescr.getText() - * @param jobParams - * - getJobParams() - */ - private void _storeUserPreset(String storeSetName, String descr, - List jobParams) - { - // this is a simple hash store. - Object[] pset; - editedParams.put(storeSetName, pset = new Object[3]); - pset[0] = storeSetName; - pset[1] = descr; - pset[2] = jobParams; - } + settingDialog = true; + reInitDialog(setname); + settingDialog = false; - private Object[] _getUserPreset(String setName) - { - return editedParams.get(setName); } /** - * remove the given user preset from the preset stash + * store current settings as given name. You should then reset gui. * - * @param setName + * @param curSetName2 */ - private void _deleteUserPreset(String setName) - { - editedParams.remove(setName); - } - - private void syncSetNamesWithStore() + private void _storeCurrentPreset(String curSetName2) { - int n = 0; - // remove any set names in the drop down menu that aren't either a reserved - // setting, or a user defined or service preset. - while (n < setName.getItemCount()) - { - String item = (String) setName.getItemAt(n); - if (!isServicePreset(item) && _getUserPreset(item) == null) - { - setName.removeItemAt(n); - } - else - { - n++; - } - - } + paramStore.storePreset(curSetName2, setDescr.getText(), getJobParams()); } - private void reInitDialog(String nextPreset) + private void _updatePreset(String lastParmSet2, String curname) { - settingDialog = true; - syncSetNamesWithStore(); - // updateTable(null,null); - Object[] pset = _getUserPreset(nextPreset); - if (pset != null) - { - setDescr.setText((String) pset[1]); - updateTable(null, (List) pset[2]); - lastParmSet = nextPreset; - validate(); - } - else - { - setDescr.setText(""); - // must be a default preset from service - Preset p = null; - try - { - PresetManager prman = service.getPresets(); - if (prman != null) - { - p = prman.getPresetByName(nextPreset); - } - } catch (Exception ex) - { - ex.printStackTrace(); - } - if (p != null) - { - updateTable(p, null); - lastParmSet = nextPreset; - } - else - { - updateTable(null, null); - } - } - initArgSetModified(); - validate(); - settingDialog = false; - - } - - String curSetName = null; + paramStore.updatePreset(lastParmSet2, curname, setDescr.getText(), + getJobParams()); - @Override - public void itemStateChanged(ItemEvent e) - { - if (settingDialog) - { - // ignore event - return; - } - if (e.getSource() == setName) - { - String setname = (String) setName.getSelectedItem(); - if (setname == null) - { - return; - } - if (curSetName == null || !setname.equals(curSetName)) - { - if (isModified() - && javax.swing.JOptionPane.showConfirmDialog(this, - "Parameter set is modifed - save ?", - "Save changes ?", - javax.swing.JOptionPane.OK_CANCEL_OPTION) == JOptionPane.OK_OPTION) - { - savModified_actionPerformed(null); - } - reInitDialog(setname); - } - } } /** @@ -1477,25 +1120,41 @@ public class WsJobParameters extends JPanel implements ItemListener, if (src.getParent() == setName) { // rename any existing records we know about for this set. - String newname = (String) e.getActionCommand(); - String msg=null; - if (isServicePreset(newname)) { - JOptionPane.showConfirmDialog(this, "Invalid name - preset already exists.", "Invalid name", JOptionPane.OK_OPTION); + String newname = e.getActionCommand().trim(); + String msg = null; + if (isServicePreset(newname)) + { + final String oldname = curSetName != null ? curSetName + : lastParmSet; + final Component ourframe = this; + settingDialog = true; + setName.getEditor().setItem(oldname); + settingDialog = false; + javax.swing.SwingUtilities.invokeLater(new Runnable() + { + @Override + public void run() + { + JvOptionPane.showMessageDialog(ourframe, + MessageManager.getString( + "label.invalid_name_preset_exists"), + MessageManager.getString("label.invalid_name"), + JvOptionPane.WARNING_MESSAGE); + } + }); + return; } curSetName = newname; - System.err.println("Command " + curSetName + " : " - + setName.getSelectedItem()); - if (curSetName.trim().equals(setName.getSelectedItem())) + System.err.println("New name for user setting " + curSetName + + " (was " + setName.getSelectedItem() + ")"); + if (curSetName.equals(setName.getSelectedItem())) { curSetName = null; } if (curSetName != null) { - setName.addItem(curSetName); - setName.setSelectedItem(curSetName); - argSetModified(setName, - lastSetName != null && !curSetName.equals(lastSetName)); + argSetModified(setName, true); return; } @@ -1508,9 +1167,9 @@ public class WsJobParameters extends JPanel implements ItemListener, if (!settingDialog) { - argSetModified( - setDescr, - (lastDescrText == null ? setDescr.getText().trim().length() > 0 + argSetModified(setDescr, + (lastDescrText == null + ? setDescr.getText().trim().length() > 0 : !setDescr.getText().equals(lastDescrText))); } @@ -1533,4 +1192,21 @@ public class WsJobParameters extends JPanel implements ItemListener, { checkDescrModified(); } -} \ No newline at end of file + + /** + * + * @return null or the service preset selected by the user + */ + public WsParamSetI getPreset() + { + if (isUserPreset || isModified() + || (lastParmSet != null && lastParmSet.equals(SVC_DEF))) + { + return null; + } + else + { + return paramStore.getPreset(lastParmSet); + } + } +}