X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FWsJobParameters.java;h=c1b09b7471f50c4cadacc4d4b614f887d72e132e;hb=8edebdd9789b2d93fb8f9db24b8be2c1e6317690;hp=40bb5be2e77937e7387a5e21851ca07b8f97a336;hpb=47168f025aefdaa044802bd5f8f510ffe43a4808;p=jalview.git diff --git a/src/jalview/gui/WsJobParameters.java b/src/jalview/gui/WsJobParameters.java index 40bb5be..c1b09b7 100644 --- a/src/jalview/gui/WsJobParameters.java +++ b/src/jalview/gui/WsJobParameters.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -26,6 +26,7 @@ import jalview.util.MessageManager; import jalview.ws.jws2.JabaParamStore; import jalview.ws.jws2.JabaPreset; import jalview.ws.jws2.Jws2Discoverer; +import jalview.ws.jws2.ParameterUtils; import jalview.ws.jws2.jabaws2.Jws2Instance; import jalview.ws.params.ArgumentI; import jalview.ws.params.OptionI; @@ -218,7 +219,9 @@ public class WsJobParameters extends JPanel implements ItemListener, frame = new JDialog(Desktop.instance, true); - frame.setTitle("Edit parameters for " + 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(new Rectangle( @@ -265,7 +268,8 @@ public class WsJobParameters extends JPanel implements ItemListener, } }); - updatepref = JvSwingUtils.makeButton(MessageManager.getString("action.update"), + updatepref = JvSwingUtils.makeButton( + MessageManager.getString("action.update"), MessageManager.getString("label.update_user_parameter_set"), new ActionListener() { @@ -275,7 +279,8 @@ public class WsJobParameters extends JPanel implements ItemListener, update_actionPerformed(e); } }); - deletepref = JvSwingUtils.makeButton(MessageManager.getString("action.delete"), + deletepref = JvSwingUtils.makeButton( + MessageManager.getString("action.delete"), MessageManager.getString("label.delete_user_parameter_set"), new ActionListener() { @@ -285,7 +290,8 @@ public class WsJobParameters extends JPanel implements ItemListener, delete_actionPerformed(e); } }); - createpref = JvSwingUtils.makeButton(MessageManager.getString("action.create"), + createpref = JvSwingUtils.makeButton( + MessageManager.getString("action.create"), MessageManager.getString("label.create_user_parameter_set"), new ActionListener() { @@ -295,8 +301,9 @@ public class WsJobParameters extends JPanel implements ItemListener, 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() { @@ -305,16 +312,20 @@ public class WsJobParameters extends JPanel implements ItemListener, revert_actionPerformed(e); } }); - startjob = JvSwingUtils.makeButton(MessageManager.getString("action.start_job"), - MessageManager.getString("label.start_job_current_settings"), new ActionListener() + 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() + canceljob = JvSwingUtils.makeButton( + MessageManager.getString("action.cancel_job"), + MessageManager.getString("label.cancel_job_close_dialog"), + new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -322,7 +333,8 @@ public class WsJobParameters extends JPanel implements ItemListener, } }); - 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); @@ -330,9 +342,9 @@ 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.setPreferredSize(new Dimension(350, 200)); setDescrView.getViewport().setView(setDescr); setName.setEditable(true); setName.addItemListener(this); @@ -341,7 +353,8 @@ public class WsJobParameters extends JPanel implements ItemListener, GridBagLayout gbl = new GridBagLayout(); SetNamePanel.setLayout(gbl); - JLabel setNameLabel = new JLabel(MessageManager.getString("label.current_parameter_set_name")); + JLabel setNameLabel = new JLabel( + MessageManager.getString("label.current_parameter_set_name")); setNameLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); setNameInfo.add(setNameLabel); @@ -380,9 +393,11 @@ 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()); @@ -413,6 +428,11 @@ public class WsJobParameters extends JPanel implements ItemListener, 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.instance == null ? 540 + : Desktop.instance.getHeight(); + setPreferredSize(new Dimension(540, windowHeight)); add(dialogpanel, BorderLayout.SOUTH); validate(); } @@ -420,7 +440,7 @@ public class WsJobParameters extends JPanel implements ItemListener, protected void revert_actionPerformed(ActionEvent e) { reInitDialog(lastParmSet); - + updateWebServiceMenus(); } protected void update_actionPerformed(ActionEvent e) @@ -449,6 +469,7 @@ public class WsJobParameters extends JPanel implements ItemListener, _deleteUserPreset(lastParmSet); } reInitDialog(null); // service default + updateWebServiceMenus(); } protected void create_actionPerformed(ActionEvent e) @@ -459,7 +480,9 @@ public class WsJobParameters extends JPanel implements ItemListener, _storeCurrentPreset(curname); lastParmSet = curname; isUserPreset = true; + reInitDialog(curname); initArgSetModified(); + updateWebServiceMenus(); } else { @@ -514,7 +537,7 @@ public class WsJobParameters extends JPanel implements ItemListener, 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. @@ -570,17 +593,17 @@ public class WsJobParameters extends JPanel implements ItemListener, @SuppressWarnings("unchecked") private void updateTable(WsParamSetI p, List jobArgset) { - boolean setDefaultParams=false; + 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())) + if (p == null && SVC_DEF.equals("" + setName.getSelectedItem())) { // indicate that service defaults should be set if available - setDefaultParams=true; + setDefaultParams = true; } // populate table from default parameter set. List args = paramStore.getServiceParameters(); @@ -588,9 +611,9 @@ public class WsJobParameters extends JPanel implements ItemListener, // split to params and required arguments { int cw = 0; - boolean optset=false; + boolean optset = false; for (ArgumentI myarg : args) - { + { // Ideally, Argument would implement isRequired ! if (myarg instanceof ParameterI) { @@ -930,14 +953,13 @@ public class WsJobParameters extends JPanel implements ItemListener, */ public static void main(String[] args) { - jalview.ws.jws2.Jws2Discoverer disc = jalview.ws.jws2.Jws2Discoverer - .getDiscoverer(); + Jws2Discoverer disc = Jws2Discoverer.getDiscoverer(); int p = 0; if (args.length > 0) { Vector services = new Vector(); services.addElement(args[p++]); - Jws2Discoverer.setServiceUrls(services); + Jws2Discoverer.getDiscoverer().setServiceUrls(services); } try { @@ -999,7 +1021,7 @@ public class WsJobParameters extends JPanel implements ItemListener, { try { - Option cpy = jalview.ws.jws2.ParameterUtils.copyOption(o); + Option cpy = ParameterUtils.copyOption(o); } catch (Exception e) { System.err.println("Failed to copy " + o.getName()); @@ -1019,7 +1041,7 @@ public class WsJobParameters extends JPanel implements ItemListener, { try { - Parameter cpy = jalview.ws.jws2.ParameterUtils + Parameter cpy = ParameterUtils .copyParameter(o); } catch (Exception e) { @@ -1037,15 +1059,15 @@ public class WsJobParameters extends JPanel implements ItemListener, List writeparam = null, readparam = null; try { - writeparam = jalview.ws.jws2.ParameterUtils + writeparam = ParameterUtils .writeParameterSet( pr.getArguments(lastserv.getRunnerConfig()), " "); System.out.println("Testing param read :"); - List