X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FWsJobParameters.java;h=196eb32d09e712eb1b789af5868ea98436dd4a6f;hb=c932f0e85a8852824cdd8ce790af68682732c85c;hp=c4d215ef6ce33d50d79b4a9d907af4d4493807b3;hpb=37de9310bec3501cbc6381e0c3dcb282fcaad812;p=jalview.git diff --git a/src/jalview/gui/WsJobParameters.java b/src/jalview/gui/WsJobParameters.java index c4d215e..196eb32 100644 --- a/src/jalview/gui/WsJobParameters.java +++ b/src/jalview/gui/WsJobParameters.java @@ -20,19 +20,6 @@ */ 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; @@ -61,7 +48,6 @@ 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.JSplitPane; @@ -70,14 +56,26 @@ 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 compbio.metadata.RunnerConfig; +import jalview.bin.Console; +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 net.miginfocom.swing.MigLayout; /** * job parameter editing/browsing dialog box. User can browse existing settings @@ -187,7 +185,8 @@ public class WsJobParameters extends JPanel implements ItemListener, * @param jobArgset */ public WsJobParameters(JFrame parent, ParamDatastoreI paramStorei, - Jws2Instance service, WsParamSetI preset, List jobArgset) + Jws2Instance service, WsParamSetI preset, + List jobArgset) { super(); jbInit(); @@ -219,13 +218,14 @@ public class WsJobParameters extends JPanel implements ItemListener, frame = new JDialog(Desktop.instance, true); frame.setTitle(MessageManager.formatMessage("label.edit_params_for", - new String[] { service.getActionText() })); + 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.setBounds( + new Rectangle((int) (deskr.getCenterX() - pref.width / 2), + (int) (deskr.getCenterY() - pref.height / 2), + pref.width, pref.height)); frame.setContentPane(this); // should perhaps recover defaults from user prefs. @@ -233,6 +233,7 @@ public class WsJobParameters extends JPanel implements ItemListener, frame.validate(); javax.swing.SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { // jobPanel.setDividerLocation(0.25); @@ -272,6 +273,7 @@ public class WsJobParameters extends JPanel implements ItemListener, new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { update_actionPerformed(e); @@ -283,6 +285,7 @@ public class WsJobParameters extends JPanel implements ItemListener, new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { delete_actionPerformed(e); @@ -294,17 +297,20 @@ public class WsJobParameters extends JPanel implements ItemListener, new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { create_actionPerformed(e); } }); - revertpref = JvSwingUtils.makeButton(MessageManager - .getString("action.revert"), MessageManager - .getString("label.revert_changes_user_parameter_set"), + revertpref = JvSwingUtils.makeButton( + MessageManager.getString("action.revert"), + MessageManager + .getString("label.revert_changes_user_parameter_set"), new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { revert_actionPerformed(e); @@ -315,6 +321,7 @@ public class WsJobParameters extends JPanel implements ItemListener, MessageManager.getString("label.start_job_current_settings"), new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { startjob_actionPerformed(e); @@ -325,14 +332,15 @@ public class WsJobParameters extends JPanel implements ItemListener, MessageManager.getString("label.cancel_job_close_dialog"), new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { canceljob_actionPerformed(e); } }); - setDetails.setBorder(new TitledBorder(MessageManager - .getString("label.details"))); + setDetails.setBorder( + new TitledBorder(MessageManager.getString("label.details"))); setDetails.setLayout(new BorderLayout()); setDescr.setColumns(40); setDescr.setWrapStyleWord(true); @@ -340,8 +348,8 @@ 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")); + setDescr.setToolTipText( + MessageManager.getString("label.edit_notes_parameter_set")); JScrollPane setDescrView = new JScrollPane(); setDescrView.getViewport().setView(setDescr); setName.setEditable(true); @@ -391,14 +399,14 @@ public class WsJobParameters extends JPanel implements ItemListener, // paramPane.setPreferredSize(new Dimension(360, 400)); // paramPane.setPreferredSize(null); - jobOptions.setBorder(new TitledBorder(MessageManager - .getString("label.options"))); + jobOptions.setBorder( + new TitledBorder(MessageManager.getString("label.options"))); jobOptions.setOpaque(true); - paramList.setBorder(new TitledBorder(MessageManager - .getString("label.parameters"))); + paramList.setBorder( + new TitledBorder(MessageManager.getString("label.parameters"))); paramList.setOpaque(true); - JPanel bjo = new JPanel(new BorderLayout()), bjp = new JPanel( - new BorderLayout()); + JPanel bjo = new JPanel(new BorderLayout()), + bjp = new JPanel(new BorderLayout()); bjo.add(jobOptions, BorderLayout.CENTER); bjp.add(paramList, BorderLayout.CENTER); bjp.setOpaque(true); @@ -485,7 +493,7 @@ public class WsJobParameters extends JPanel implements ItemListener, else { // TODO: show warning - System.err.println("Invalid name. Not saved."); + jalview.bin.Console.errPrintln("Invalid name. Not saved."); } } @@ -526,8 +534,8 @@ public class WsJobParameters extends JPanel implements ItemListener, List jobArgset = null; settingDialog = true; { // instantiate the abstract proxy for Jaba objects - jobArgset = jabajobArgset == null ? null : JabaParamStore - .getJwsArgsfromJaba(jabajobArgset); + jobArgset = jabajobArgset == null ? null + : JabaParamStore.getJwsArgsfromJaba(jabajobArgset); p = jabap; // (jabap != null) ? paramStore.getPreset(jabap.getName()) : // null; } @@ -634,7 +642,7 @@ public class WsJobParameters extends JPanel implements ItemListener, } else { - System.err.println("Ignoring unknown service argument type " + jalview.bin.Console.errPrintln("Ignoring unknown service argument type " + myarg.getClass().getName()); } } @@ -677,7 +685,7 @@ public class WsJobParameters extends JPanel implements ItemListener, { if (arg instanceof OptionI) { - // System.out.println("Setting option " + // jalview.bin.Console.outPrintln("Setting option " // + System.identityHashCode(arg) + ":" + arg.getName() // + " with " + arg.getDefaultValue()); opanp.selectOption((OptionI) arg, arg.getValue()); @@ -710,7 +718,8 @@ public class WsJobParameters extends JPanel implements ItemListener, private void updateButtonDisplay() { - boolean _update = false, _create = false, _delete = false, _revert = false; + boolean _update = false, _create = false, _delete = false, + _revert = false; if (modifiedElements.size() > 0) { // set modified @@ -736,6 +745,7 @@ public class WsJobParameters extends JPanel implements ItemListener, validate(); } + @Override public void argSetModified(Object modifiedElement, boolean b) { if (settingDialog) @@ -780,8 +790,8 @@ public class WsJobParameters extends JPanel implements ItemListener, boolean stn = settingDialog; boolean renamed = false; settingDialog = true; - String nm = (curSetName != null ? curSetName : (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)) { @@ -827,16 +837,17 @@ public class WsJobParameters extends JPanel implements ItemListener, settingDialog = stn; } + @Override public void refreshParamLayout() { // 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; + int os = 0, + s = jobOptions.getBorder().getBorderInsets(jobOptions).bottom + + jobOptions.getBorder().getBorderInsets(jobOptions).top + + 2 * sep; /** * final height for viewport */ @@ -845,8 +856,7 @@ public class WsJobParameters extends JPanel implements ItemListener, - jobOptions.getBorder().getBorderInsets(jobOptions).left + jobOptions.getBorder().getBorderInsets(jobOptions).right; - int w = 2 - * fl.getHgap() + int w = 2 * fl.getHgap() + (MAX_OPTWIDTH > OptsAndParamsPage.PARAM_WIDTH ? MAX_OPTWIDTH : OptsAndParamsPage.PARAM_WIDTH); int hgap = fl.getHgap(), cw = hgap; @@ -864,7 +874,7 @@ public class WsJobParameters extends JPanel implements ItemListener, if (cw + 120 > panewidth) { jobOptions.add(pbox, "wrap"); - // System.out.println("Wrap on "+pbox.option.getName()); + // jalview.bin.Console.outPrintln("Wrap on "+pbox.option.getName()); cw = hgap + pbox.getSize().width; fh = true; } @@ -936,7 +946,7 @@ public class WsJobParameters extends JPanel implements ItemListener, } // TODO: waste some time trying to eliminate any unnecessary .validate calls // here - // System.out.println("Size will be : "+w+","+os); + // jalview.bin.Console.outPrintln("Size will be : "+w+","+os); // optsAndparams.setPreferredSize(null); // paramPane.getViewport().setView(optsAndparams); paramPane.getViewport().setAutoscrolls(true); @@ -948,6 +958,7 @@ public class WsJobParameters extends JPanel implements ItemListener, * testing method - grab a service and parameter set and show the window * * @param args + * @j2sIgnore */ public static void main(String[] args) { @@ -956,7 +967,7 @@ public class WsJobParameters extends JPanel implements ItemListener, int p = 0; if (args.length > 0) { - Vector services = new Vector(); + Vector services = new Vector<>(); services.addElement(args[p++]); Jws2Discoverer.getDiscoverer().setServiceUrls(services); } @@ -965,7 +976,7 @@ public class WsJobParameters extends JPanel implements ItemListener, disc.run(); } catch (Exception e) { - System.err.println("Aborting. Problem discovering services."); + jalview.bin.Console.errPrintln("Aborting. Problem discovering services."); e.printStackTrace(); return; } @@ -1012,9 +1023,9 @@ public class WsJobParameters extends JPanel implements ItemListener, pr = en.next(); } { - System.out.println("Testing opts dupes for " - + lastserv.getUri() + " : " - + lastserv.getActionText() + ":" + pr.getName()); + jalview.bin.Console.outPrintln("Testing opts dupes for " + + lastserv.getUri() + " : " + lastserv.getActionText() + + ":" + pr.getName()); List