/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
- * 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.
*
* 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.
+ * 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 <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see <http://www.gnu.org/licenses/>.
* 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;
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;
* @param jobArgset
*/
public WsJobParameters(JFrame parent, ParamDatastoreI paramStorei,
- Jws2Instance service, WsParamSetI preset, List<Argument> jobArgset)
+ Jws2Instance service, WsParamSetI preset,
+ List<Argument> jobArgset)
{
super();
jbInit();
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(
- (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.
frame.validate();
javax.swing.SwingUtilities.invokeLater(new Runnable()
{
+ @Override
public void run()
{
// jobPanel.setDividerLocation(0.25);
}
});
- 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()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
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()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
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()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
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()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
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()
{
+ @Override
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()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
canceljob_actionPerformed(e);
}
});
- setDetails.setBorder(new TitledBorder("Details"));
+ setDetails.setBorder(
+ new TitledBorder(MessageManager.getString("label.details")));
setDetails.setLayout(new BorderLayout());
setDescr.setColumns(40);
setDescr.setWrapStyleWord(true);
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);
setName.setEditable(true);
setName.addItemListener(this);
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);
// 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());
+ JPanel bjo = new JPanel(new BorderLayout()),
+ bjp = new JPanel(new BorderLayout());
bjo.add(jobOptions, BorderLayout.CENTER);
bjp.add(paramList, BorderLayout.CENTER);
bjp.setOpaque(true);
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();
}
protected void revert_actionPerformed(ActionEvent e)
{
reInitDialog(lastParmSet);
-
+ updateWebServiceMenus();
}
protected void update_actionPerformed(ActionEvent e)
_deleteUserPreset(lastParmSet);
}
reInitDialog(null); // service default
+ updateWebServiceMenus();
}
protected void create_actionPerformed(ActionEvent e)
_storeCurrentPreset(curname);
lastParmSet = curname;
isUserPreset = true;
+ reInitDialog(curname);
initArgSetModified();
+ updateWebServiceMenus();
}
else
{
List<ArgumentI> 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;
}
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.
@SuppressWarnings("unchecked")
private void updateTable(WsParamSetI p, List<ArgumentI> 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<ArgumentI> args = paramStore.getServiceParameters();
// 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)
{
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
validate();
}
+ @Override
public void argSetModified(Object modifiedElement, boolean b)
{
if (settingDialog)
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))
{
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
*/
- 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;
{
Vector<String> services = new Vector<String>();
services.addElement(args[p++]);
- Jws2Discoverer.setServiceUrls(services);
+ Jws2Discoverer.getDiscoverer().setServiceUrls(services);
}
try
{
}
{
System.out.println("Testing opts dupes for "
- + lastserv.getUri() + " : "
- + lastserv.getActionText() + ":" + pr.getName());
+ + lastserv.getUri() + " : " + lastserv.getActionText()
+ + ":" + pr.getName());
List<Option> rg = lastserv.getRunnerConfig().getOptions();
for (Option o : rg)
{
lastserv.getRunnerConfig(), " ");
readparam = jalview.ws.jws2.ParameterUtils
.writeParameterSet(pset, " ");
- Iterator<String> o = pr.getOptions().iterator(), s = writeparam
- .iterator(), t = readparam.iterator();
+ Iterator<String> o = pr.getOptions().iterator(),
+ s = writeparam.iterator(), t = readparam.iterator();
boolean failed = false;
while (s.hasNext() && t.hasNext())
{
String on = o.next(), sn = s.next(), st = t.next();
if (!sn.equals(st))
{
- System.out.println("Original was " + on
- + " Phase 1 wrote " + sn + "\tPhase 2 wrote "
- + st);
+ System.out.println(
+ "Original was " + on + " Phase 1 wrote " + sn
+ + "\tPhase 2 wrote " + st);
failed = true;
}
}
if (failed)
{
- System.out.println("Original parameters:\n"
- + pr.getOptions());
- System.out.println("Wrote parameters in first set:\n"
- + writeparam);
- System.out.println("Wrote parameters in second set:\n"
- + readparam);
+ System.out.println(
+ "Original parameters:\n" + pr.getOptions());
+ System.out.println(
+ "Wrote parameters in first set:\n" + writeparam);
+ System.out.println(
+ "Wrote parameters in second set:\n" + readparam);
}
} catch (Exception e)
}
WsJobParameters pgui = new WsJobParameters(lastserv,
new JabaPreset(lastserv, pr));
- JFrame jf = new JFrame("Parameters for "
- + lastserv.getActionText());
+ JFrame jf = new JFrame(MessageManager
+ .formatMessage("label.ws_parameters_for", new String[]
+ { lastserv.getActionText() }));
JPanel cont = new JPanel(new BorderLayout());
pgui.validate();
cont.setPreferredSize(pgui.getPreferredSize());
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
public boolean isServiceDefaults()
{
- return (!isModified() && (lastParmSet != null && lastParmSet
- .equals(SVC_DEF)));
+ return (!isModified()
+ && (lastParmSet != null && lastParmSet.equals(SVC_DEF)));
}
public List<ArgumentI> getJobParams()
SetNamePanel.validate();
validate();
settingDialog = false;
+ }
+ /**
+ * Rebuild the AlignFrame web service menus (after add/delete of a preset
+ * option).
+ */
+ protected void updateWebServiceMenus()
+ {
+ for (AlignFrame alignFrame : Desktop.getAlignFrames())
+ {
+ alignFrame.BuildWebServiceMenu();
+ }
}
String curSetName = null;
+ @Override
public void itemStateChanged(ItemEvent e)
{
if (e.getSource() == setName && e.getStateChange() == e.SELECTED)
}
javax.swing.SwingUtilities.invokeLater(new Runnable()
{
+ @Override
public void run()
{
doPreferenceComboStateChange(setname);
}
settingDialog = true;
System.out.println("Prompting to save " + lsetname);
- if (javax.swing.JOptionPane
- .showConfirmDialog(
- this,
- "Parameter set '"
- + lsetname
- + "' is modifed, and your changes will be lost.\nReally change preset ?",
- "Warning: Unsaved Changes",
- javax.swing.JOptionPane.OK_CANCEL_OPTION) != JOptionPane.OK_OPTION)
+ 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)
{
// revert the combobox to the current item
settingDialog = true;
*/
String lastDescrText = null;
+ @Override
public void actionPerformed(ActionEvent e)
{
if (e.getSource() instanceof Component)
if (src.getParent() == setName)
{
// rename any existing records we know about for this set.
- String newname = (String) e.getActionCommand().trim();
+ String newname = e.getActionCommand().trim();
String msg = null;
if (isServicePreset(newname))
{
settingDialog = false;
javax.swing.SwingUtilities.invokeLater(new Runnable()
{
+ @Override
public void run()
{
- JOptionPane.showMessageDialog(ourframe,
- "Invalid name - preset already exists.",
- "Invalid name", JOptionPane.WARNING_MESSAGE);
+ JvOptionPane.showMessageDialog(ourframe,
+ MessageManager.getString(
+ "label.invalid_name_preset_exists"),
+ MessageManager.getString("label.invalid_name"),
+ JvOptionPane.WARNING_MESSAGE);
}
});
if (!settingDialog)
{
- argSetModified(
- setDescr,
- (lastDescrText == null ? setDescr.getText().trim().length() > 0
+ argSetModified(setDescr,
+ (lastDescrText == null
+ ? setDescr.getText().trim().length() > 0
: !setDescr.getText().equals(lastDescrText)));
}
}
+ @Override
public void insertUpdate(DocumentEvent e)
{
checkDescrModified();
}
+ @Override
public void removeUpdate(DocumentEvent e)
{
checkDescrModified();
}
+ @Override
public void changedUpdate(DocumentEvent e)
{
checkDescrModified();