import java.awt.event.ItemListener;
import java.awt.event.WindowEvent;
import java.awt.event.WindowListener;
+import java.net.URL;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
+import javax.swing.JSplitPane;
import javax.swing.JTextArea;
import javax.swing.border.TitledBorder;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
+import net.miginfocom.swing.MigLayout;
+
import compbio.metadata.Argument;
import compbio.metadata.Option;
import compbio.metadata.Parameter;
import compbio.metadata.Preset;
import compbio.metadata.PresetManager;
-import net.miginfocom.swing.MigLayout;
+import compbio.metadata.RunnerConfig;
/**
* job parameter editing/browsing dialog box. User can browse existing settings
public class WsJobParameters extends JPanel implements ItemListener,
ActionListener, DocumentListener, OptsParametersContainerI
{
- private static final int PREFERRED_WIDTH = 540;
-
- private static final int DEFAULT_HEIGHT = 640;
+ URL linkImageURL = getClass().getResource("/images/link.gif");
- // the default parameter set shown to the user
- private static final String SVC_DEF = "Defaults";
+ private static final String SVC_DEF = "Defaults"; // this is the null
+ // parameter set as shown to
+ // user
- private int maxOptWidth = 200;
-
- // URL linkImageURL = getClass().getResource("/images/link.gif");
-
- /*
- * controller for options and parameters layout
+ /**
+ * manager for options and parameters.
*/
- OptsAndParamsPage opanp;
+ OptsAndParamsPage opanp = new OptsAndParamsPage(this);
- /*
+ /**
* panel containing job options
*/
- JPanel optionsPanel = new JPanel();
+ JPanel jobOptions = new JPanel();
- /*
+ /**
* panel containing job parameters
*/
- JPanel paramsPanel = new JPanel();
+ JPanel paramList = new JPanel();
+
+ JPanel SetNamePanel = new JPanel();
- JPanel setNamePanel = new JPanel();
+ JPanel setDetails = new JPanel();
+
+ JSplitPane settingsPanel = new JSplitPane();
+
+ JPanel jobPanel = new JPanel();
+
+ JScrollPane jobOptionsPane = new JScrollPane();
JButton createpref = new JButton();
JButton updatepref = new JButton();
- JComboBox<String> setName = new JComboBox<>();
+ JButton startjob = new JButton();
- JTextArea setDescr = new JTextArea();
+ JButton canceljob = new JButton();
- JScrollPane paramPane = new JScrollPane();
+ JComboBox setName = new JComboBox();
- ParamDatastoreI paramStore;
+ JTextArea setDescr = new JTextArea();
- // set true when 'Start Job' is clicked
- boolean startJob = false;
+ JScrollPane paramPane = new JScrollPane();
- JDialog frame = null;
+ // ScrollablePanel optsAndparams = new ScrollablePanel();
+ JPanel optsAndparams = new JPanel();
- Jws2Instance service;
+ RunnerConfig serviceOptions;
- /*
- * list of service presets in the gui
- */
- Hashtable<String, String> servicePresets = null;
-
- /*
- * set if dialog is being set - so handlers will avoid spurious events
- */
- boolean settingDialog = false;
+ ParamDatastoreI paramStore;
- private Hashtable<Object, Object> modifiedElements = new Hashtable<>();
+ private int MAX_OPTWIDTH = 200;
- String lastParmSet = null;
+ WsJobParameters(Jws2Instance service)
+ {
+ this(service, null);
+ }
- public WsJobParameters(ParamDatastoreI store, WsParamSetI preset,
- List<ArgumentI> args)
+ public WsJobParameters(Jws2Instance service, WsParamSetI preset)
{
- super();
+ this(null, service, preset, null);
+ }
- // parameters dialog in 'compact' format (help as tooltips)
- opanp = new OptsAndParamsPage(this, true);
- jbInit();
- this.paramStore = store;
- this.service = null;
- init(preset, args);
- validate();
+ /**
+ *
+ * @param desktop
+ * - if null, create new JFrame outside of desktop
+ * @param service
+ * @param preset
+ */
+ public WsJobParameters(JFrame parent, Jws2Instance service,
+ WsParamSetI preset, List<Argument> jobArgset)
+ {
+ this(parent, null, service, preset, jobArgset);
}
/**
- * Constructor given a set of parameters and presets, a service to be invoked,
- * and a list of (Jabaws client) arguments
*
+ * @param parent
* @param paramStorei
* @param service
* @param preset
* @param jobArgset
*/
- public WsJobParameters(ParamDatastoreI paramStorei, Jws2Instance service,
- WsParamSetI preset, List<Argument> jobArgset)
+ public WsJobParameters(JFrame parent, ParamDatastoreI paramStorei,
+ Jws2Instance service, WsParamSetI preset,
+ List<Argument> jobArgset)
{
super();
-
- // parameters dialog in 'expanded' format (help text boxes)
- opanp = new OptsAndParamsPage(this, false);
-
jbInit();
this.paramStore = paramStorei;
- if (paramStore == null && service != null)
+ if (paramStore == null)
{
paramStore = service.getParamStore();
}
this.service = service;
- initForService(preset, jobArgset);
+ // argSetModified(false);
+ // populate parameter table
+ initForService(service, preset, jobArgset);
+ // display in new JFrame attached to parent.
validate();
}
+ int response = -1;
+
+ JDialog frame = null;
+
/**
- * Shows a modal dialog containing the parameters and Start or Cancel options.
- * Answers true if the job is started, false if cancelled.
+ * shows a modal dialog containing the parameters.
*
* @return
*/
{
frame = new JDialog(Desktop.instance, true);
- if (service != null)
- {
- frame.setTitle(MessageManager.formatMessage("label.edit_params_for",
- new String[]
- { service.getActionText() }));
- }
+ frame.setTitle(MessageManager.formatMessage("label.edit_params_for",
+ new String[]
+ { service.getActionText() }));
Rectangle deskr = Desktop.instance.getBounds();
Dimension pref = this.getPreferredSize();
frame.setBounds(
});
frame.setVisible(true);
- return startJob;
+ if (response > 0)
+ {
+ return true;
+ }
+ return false;
}
private void jbInit()
@Override
public void actionPerformed(ActionEvent e)
{
- update_actionPerformed();
+ update_actionPerformed(e);
}
});
deletepref = JvSwingUtils.makeButton(
@Override
public void actionPerformed(ActionEvent e)
{
- delete_actionPerformed();
+ delete_actionPerformed(e);
}
});
createpref = JvSwingUtils.makeButton(
@Override
public void actionPerformed(ActionEvent e)
{
- create_actionPerformed();
+ create_actionPerformed(e);
}
});
revertpref = JvSwingUtils.makeButton(
@Override
public void actionPerformed(ActionEvent e)
{
- revert_actionPerformed();
+ revert_actionPerformed(e);
}
});
-
- JButton startjob = JvSwingUtils.makeButton(
+ startjob = JvSwingUtils.makeButton(
MessageManager.getString("action.start_job"),
MessageManager.getString("label.start_job_current_settings"),
new ActionListener()
@Override
public void actionPerformed(ActionEvent e)
{
- startjob_actionPerformed();
+ startjob_actionPerformed(e);
}
});
- JButton canceljob = JvSwingUtils.makeButton(
+ canceljob = JvSwingUtils.makeButton(
MessageManager.getString("action.cancel_job"),
MessageManager.getString("label.cancel_job_close_dialog"),
new ActionListener()
@Override
public void actionPerformed(ActionEvent e)
{
- canceljob_actionPerformed();
+ canceljob_actionPerformed(e);
}
});
- JPanel setDetails = new JPanel();
setDetails.setBorder(
new TitledBorder(MessageManager.getString("label.details")));
setDetails.setLayout(new BorderLayout());
setName.getEditor().addActionListener(this);
JPanel setNameInfo = new JPanel(new FlowLayout(FlowLayout.LEFT));
GridBagLayout gbl = new GridBagLayout();
- setNamePanel.setLayout(gbl);
+ SetNamePanel.setLayout(gbl);
JLabel setNameLabel = new JLabel(
MessageManager.getString("label.current_parameter_set_name"));
revertpref.setVisible(false);
createpref.setVisible(false);
JPanel setsavebuts = new JPanel();
- setsavebuts.setLayout(new FlowLayout(FlowLayout.LEFT, 10, 0)); // GridLayout(1,2));
+ 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.setSize(new Dimension(150, 30));
JPanel buttonArea = new JPanel(new GridLayout(1, 1));
buttonArea.add(setsavebuts);
- setNamePanel.add(setNameInfo);
+ SetNamePanel.add(setNameInfo);
GridBagConstraints gbc = new GridBagConstraints();
gbc.gridheight = 2;
gbl.setConstraints(setNameInfo, gbc);
- setNamePanel.add(buttonArea);
+ SetNamePanel.add(buttonArea);
gbc = new GridBagConstraints();
gbc.gridx = 0;
gbc.gridy = 2;
// paramPane.setPreferredSize(new Dimension(360, 400));
// paramPane.setPreferredSize(null);
- optionsPanel.setBorder(
+ jobOptions.setBorder(
new TitledBorder(MessageManager.getString("label.options")));
- optionsPanel.setOpaque(true);
- paramsPanel.setBorder(
+ jobOptions.setOpaque(true);
+ paramList.setBorder(
new TitledBorder(MessageManager.getString("label.parameters")));
- paramsPanel.setOpaque(true);
+ 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());
- JPanel optsAndparams = new JPanel();
optsAndparams.setLayout(new BorderLayout());
- optsAndparams.add(optionsPanel, BorderLayout.NORTH);
- optsAndparams.add(paramsPanel, BorderLayout.CENTER);
+ 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());
-
- 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(SetNamePanel, BorderLayout.NORTH);
add(jobPanel, BorderLayout.CENTER);
JPanel dialogpanel = new JPanel();
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.instance == null ? DEFAULT_HEIGHT
+ final int windowHeight = Desktop.instance == null ? 540
: Desktop.instance.getHeight();
- // setPreferredSize(new Dimension(PREFERRED_WIDTH, windowHeight));
+ setPreferredSize(new Dimension(540, windowHeight));
add(dialogpanel, BorderLayout.SOUTH);
validate();
}
- protected void revert_actionPerformed()
+ protected void revert_actionPerformed(ActionEvent e)
{
reInitDialog(lastParmSet);
updateWebServiceMenus();
}
- protected void update_actionPerformed()
+ protected void update_actionPerformed(ActionEvent e)
{
if (isUserPreset)
{
paramStore.deletePreset(lastParmSet2);
}
- protected void delete_actionPerformed()
+ protected void delete_actionPerformed(ActionEvent e)
{
if (isUserPreset)
{
updateWebServiceMenus();
}
- protected void create_actionPerformed()
+ protected void create_actionPerformed(ActionEvent e)
{
String curname = ((String) setName.getSelectedItem()).trim();
if (curname.length() > 0)
}
}
- protected void canceljob_actionPerformed()
+ protected void canceljob_actionPerformed(ActionEvent e)
{
- startJob = false;
+ response = 0;
if (frame != null)
{
frame.setVisible(false);
}
}
- protected void startjob_actionPerformed()
+ protected void startjob_actionPerformed(ActionEvent e)
{
- startJob = true;
+ response = 1;
if (frame != null)
{
frame.setVisible(false);
}
}
- void initForService(WsParamSetI jabap, List<Argument> jabajobArgset)
+ Jws2Instance service;
+
+ /**
+ * list of service presets in the gui
+ */
+ Hashtable servicePresets = null;
+
+ /**
+ * set if dialog is being set - so handlers will avoid spurious events
+ */
+ boolean settingDialog = false;
+
+ void initForService(Jws2Instance service, WsParamSetI jabap,
+ List<Argument> jabajobArgset)
{
WsParamSetI p = null;
List<ArgumentI> jobArgset = null;
// null;
}
- init(p, jobArgset);
-
- }
-
- void init(WsParamSetI p, List<ArgumentI> jobArgset)
- {
- Hashtable<String, String> exnames = new Hashtable<>();
+ 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<>();
+ servicePresets = new Hashtable();
// Add the default entry - if not present already.
if (!exnames.contains(SVC_DEF))
{
exnames.put(SVC_DEF, SVC_DEF);
servicePresets.put(SVC_DEF, SVC_DEF);
}
-
- // String curname = (p == null ? "" : p.getName());
+ String curname = (p == null ? "" : p.getName());
for (WsParamSetI pr : paramStore.getPresets())
{
if (!pr.isModifiable())
}
}
settingDialog = false;
+
}
+ @SuppressWarnings("unchecked")
private void updateTable(WsParamSetI p, List<ArgumentI> jobArgset)
{
boolean setDefaultParams = false;
OptionI opt = (OptionI) myarg;
OptionBox ob = opanp.addOption(opt);
ob.resetToDefault(setDefaultParams);
- if (maxOptWidth < ob.getPreferredSize().width)
+ if (MAX_OPTWIDTH < ob.getPreferredSize().width)
{
- maxOptWidth = ob.getPreferredSize().width;
+ MAX_OPTWIDTH = ob.getPreferredSize().width;
}
ob.validate();
cw += ob.getPreferredSize().width + 5;
return modifiedElements.size() > 0;
}
+ private Hashtable modifiedElements = new Hashtable();
+
/**
* reset gui and modification state settings
*/
if (b && modifiedElements.size() > 0)
{
makeSetNameValid(!isUserPreset);
- setNamePanel.revalidate();
+ SetNamePanel.revalidate();
}
updateButtonDisplay();
}
// sync the gui with the preset database
for (int i = 0, iS = setName.getItemCount(); i < iS; i++)
{
- String snm = setName.getItemAt(i);
+ String snm = (String) setName.getItemAt(i);
if (snm.equals(nm))
{
makeupdate = true;
settingDialog = stn;
}
- /**
- * Rebuilds the Options and Parameters panels
- */
@Override
public void refreshParamLayout()
{
- final int rightMargin = 40;
- final int availableWidth = paramPane.getViewport().getSize().width
- - rightMargin
- - optionsPanel.getBorder().getBorderInsets(optionsPanel).left
- + optionsPanel.getBorder().getBorderInsets(optionsPanel).right;
+ // 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)
{
- 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;
+ jobOptions.setLayout(new MigLayout("", "", ""));
+ jobOptions.removeAll();
- /*
- * 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)
+ 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
{
- optionsPanel.remove(lastAdded);
- optionsPanel.add(lastAdded, "wrap");
- currentWidth = hgap + boxWidth;
+ jobOptions.add(pbox);
+ }
+ if (fh)
+ {
+ finalh += pbox.getSize().height + fl.getVgap();
+ fh = false;
}
- optionsPanel.add(pbox);
- lastAdded = pbox;
}
- optionsPanel.revalidate();
+ jobOptions.revalidate();
}
else
{
- optionsPanel.setVisible(false);
+ jobOptions.setVisible(false);
}
+ // 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)
{
- paramsPanel.removeAll();
- paramsPanel.setLayout(new MigLayout("", "", ""));
- int hgap = 5;
- int currentWidth = hgap;
-
- JPanel lastAdded = null;
+ paramList.removeAll();
+ paramList.setLayout(new MigLayout("", "", ""));
+ fh = true;
for (ParamBox pbox : opanp.getParamSet().values())
{
pbox.validate();
- int boxWidth = pbox.getSize().width;
- currentWidth += boxWidth + hgap;
- boolean wrapAfterLast = currentWidth > availableWidth
- && lastAdded != null;
- if (wrapAfterLast)
+ cw += pbox.getSize().width + hgap;
+ if (cw + 160 > panewidth)
{
- paramsPanel.remove(lastAdded);
- paramsPanel.add(lastAdded, "wrap");
- currentWidth = pbox.getSize().width + hgap;
+ 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;
}
- paramsPanel.add(pbox);
- lastAdded = pbox;
- }
+ }
/*
* s = 2 * sep; for (ParamBox pbox : opanp.getParamSet().values()) {
* pbox.validate(); s += sep +
* .getBorder().getBorderInsets(paramList).bottom+paramList
* .getBorder().getBorderInsets(paramList).top;
*/
- paramsPanel.revalidate();
+ paramList.revalidate();
}
else
{
- paramsPanel.setVisible(false);
+ paramList.setVisible(false);
}
// TODO: waste some time trying to eliminate any unnecessary .validate calls
// here
int p = 0;
if (args.length > 0)
{
- Vector<String> services = new Vector<>();
+ Vector<String> services = new Vector<String>();
services.addElement(args[p++]);
Jws2Discoverer.getDiscoverer().setServiceUrls(services);
}
e.printStackTrace();
}
}
- WsJobParameters pgui = new WsJobParameters(null, lastserv,
- new JabaPreset(lastserv, pr), null);
+ WsJobParameters pgui = new WsJobParameters(lastserv,
+ new JabaPreset(lastserv, pr));
JFrame jf = new JFrame(MessageManager
.formatMessage("label.ws_parameters_for", new String[]
{ lastserv.getActionText() }));
return opanp.getCurrentSettings();
}
+ String lastParmSet = null;
+
/*
* Hashtable<String, Object[]> editedParams = new Hashtable<String,
* Object[]>();
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<String> items = new Vector<>();
+ Vector items = new Vector();
while (n < setName.getItemCount())
{
- String item = setName.getItemAt(n);
+ String item = (String) setName.getItemAt(n);
if (!item.equals(SVC_DEF) && !paramStore.presetExists(item))
{
setName.removeItemAt(n);
initArgSetModified();
syncSetNamesWithStore();
setName.setSelectedItem(lastParmSet);
- setNamePanel.validate();
+ SetNamePanel.validate();
validate();
settingDialog = false;
}
@Override
public void itemStateChanged(ItemEvent e)
{
- if (e.getSource() == setName
- && e.getStateChange() == ItemEvent.SELECTED)
+ if (e.getSource() == setName && e.getStateChange() == e.SELECTED)
{
final String setname = (String) setName.getSelectedItem();
- // System.out.println("Item state changed for " + setname
- // + " (handling ? " + !settingDialog + ")");
+ System.out.println("Item state changed for " + setname
+ + " (handling ? " + !settingDialog + ")");
if (settingDialog)
{
// ignore event
git://source.jalview.org / jalview.git / blobdiff