X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FWsJobParameters.java;h=30e4fbe29768c2d777d091b5f34ad9c2487fcf3b;hb=a8f483d04205bb8273ee311c12968b7e86d205fa;hp=2266bf8d21abac6cfba80558ac685d0eba819b75;hpb=b57a02c25e335d033c97f8a6bacd6b54f62bd2b6;p=jalview.git
diff --git a/src/jalview/gui/WsJobParameters.java b/src/jalview/gui/WsJobParameters.java
index 2266bf8..30e4fbe 100644
--- a/src/jalview/gui/WsJobParameters.java
+++ b/src/jalview/gui/WsJobParameters.java
@@ -1,24 +1,26 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
+ *
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.gui;
import jalview.gui.OptsAndParamsPage.OptionBox;
import jalview.gui.OptsAndParamsPage.ParamBox;
+import jalview.util.MessageManager;
import jalview.ws.jws2.JabaParamStore;
import jalview.ws.jws2.JabaPreset;
import jalview.ws.jws2.Jws2Discoverer;
@@ -261,8 +263,8 @@ public class WsJobParameters extends JPanel implements ItemListener,
}
});
- updatepref = JvSwingUtils.makeButton("Update",
- "Update this existing user parameter set.",
+ updatepref = JvSwingUtils.makeButton(MessageManager.getString("action.update"),
+ MessageManager.getString("label.update_user_parameter_set"),
new ActionListener()
{
@@ -271,8 +273,8 @@ public class WsJobParameters extends JPanel implements ItemListener,
update_actionPerformed(e);
}
});
- deletepref = JvSwingUtils.makeButton("Delete",
- "Delete the currently selected user parameter set.",
+ deletepref = JvSwingUtils.makeButton(MessageManager.getString("action.delete"),
+ MessageManager.getString("label.delete_user_parameter_set"),
new ActionListener()
{
@@ -281,8 +283,8 @@ public class WsJobParameters extends JPanel implements ItemListener,
delete_actionPerformed(e);
}
});
- createpref = JvSwingUtils.makeButton("Create",
- "Create a new parameter set with the current settings.",
+ createpref = JvSwingUtils.makeButton(MessageManager.getString("action.create"),
+ MessageManager.getString("label.create_user_parameter_set"),
new ActionListener()
{
@@ -291,8 +293,8 @@ public class WsJobParameters extends JPanel implements ItemListener,
create_actionPerformed(e);
}
});
- revertpref = JvSwingUtils.makeButton("Revert",
- "Undo all changes to the current parameter set",
+ revertpref = JvSwingUtils.makeButton(MessageManager.getString("action.revert"),
+ MessageManager.getString("label.revert_changes_user_parameter_set"),
new ActionListener()
{
@@ -301,16 +303,16 @@ public class WsJobParameters extends JPanel implements ItemListener,
revert_actionPerformed(e);
}
});
- startjob = JvSwingUtils.makeButton("Start Job",
- "Start Job with 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("Cancel Job",
- "Close this dialog and cancel job.", new ActionListener()
+ canceljob = JvSwingUtils.makeButton(MessageManager.getString("action.cancel_job"),
+ MessageManager.getString("label.cancel_job_close_dialog"), new ActionListener()
{
public void actionPerformed(ActionEvent e)
{
@@ -318,7 +320,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
}
});
- setDetails.setBorder(new TitledBorder("Details"));
+ setDetails.setBorder(new TitledBorder(MessageManager.getString("label.details")));
setDetails.setLayout(new BorderLayout());
setDescr.setColumns(40);
setDescr.setWrapStyleWord(true);
@@ -326,7 +328,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
setDescr.setBackground(getBackground());
setDescr.setEditable(true);
setDescr.getDocument().addDocumentListener(this);
- setDescr.setToolTipText("Click to edit the notes for this 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);
@@ -337,7 +339,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
GridBagLayout gbl = new GridBagLayout();
SetNamePanel.setLayout(gbl);
- JLabel setNameLabel = new JLabel("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);
@@ -376,9 +378,9 @@ public class WsJobParameters extends JPanel implements ItemListener,
// paramPane.setPreferredSize(new Dimension(360, 400));
// paramPane.setPreferredSize(null);
- jobOptions.setBorder(new TitledBorder("Options"));
+ jobOptions.setBorder(new TitledBorder(MessageManager.getString("label.options")));
jobOptions.setOpaque(true);
- paramList.setBorder(new TitledBorder("Parameters"));
+ paramList.setBorder(new TitledBorder(MessageManager.getString("label.parameters")));
paramList.setOpaque(true);
JPanel bjo = new JPanel(new BorderLayout()), bjp = new JPanel(
new BorderLayout());
@@ -566,14 +568,27 @@ public class WsJobParameters extends JPanel implements ItemListener,
@SuppressWarnings("unchecked")
private void updateTable(WsParamSetI p, List jobArgset)
{
+ 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 = paramStore.getServiceParameters();
// split to params and required arguments
{
int cw = 0;
+ boolean optset=false;
for (ArgumentI myarg : args)
- {
+ {
// Ideally, Argument would implement isRequired !
if (myarg instanceof ParameterI)
{
@@ -586,7 +601,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
{
OptionI opt = (OptionI) myarg;
OptionBox ob = opanp.addOption(opt);
- ob.resetToDefault();
+ ob.resetToDefault(setDefaultParams);
if (MAX_OPTWIDTH < ob.getPreferredSize().width)
{
MAX_OPTWIDTH = ob.getPreferredSize().width;
@@ -620,16 +635,6 @@ public class WsJobParameters extends JPanel implements ItemListener,
// TODO: check if args should be unselected prior to resetting using the
// preset
}
- else
- {
- if (lastParmSet == null)
- {
- isUserPreset = false;
- // first call - so create a dummy name
-
- setName.setSelectedItem(lastSetName = SVC_DEF);
- }
- }
if (jobArgset != null)
{