// dan changed! dan test. comment out if conditional
// if (alignFrame.getViewport().getAlignment().isNucleotide())
// {
- // JOptionPane.showMessageDialog(Desktop.desktop, sh.serviceType
+ // JvOptionPane.showMessageDialog(Desktop.desktop, sh.serviceType
// + " can only be used\nfor amino acid alignments.",
- // "Wrong type of sequences!", JOptionPane.WARNING_MESSAGE);
+ // "Wrong type of sequences!", JvOptionPane.WARNING_MESSAGE);
// return;
//
// }
try
{
worker = (AbstractJabaCalcWorker) (clientClass
- .getConstructor(new Class[] { Jws2Instance.class,
- AlignFrame.class, WsParamSetI.class, List.class })
- .newInstance(new Object[] { sh, alignFrame, this.preset,
- paramset }));
+ .getConstructor(new Class[]
+ { Jws2Instance.class, AlignFrame.class, WsParamSetI.class,
+ List.class })
+ .newInstance(new Object[]
+ { sh, alignFrame, this.preset, paramset }));
} catch (Exception x)
{
x.printStackTrace();
throw new Error(
- MessageManager.getString("error.implementation_error"), x);
+ MessageManager.getString("error.implementation_error"),
+ x);
}
alignFrame.getViewport().getCalcManager().registerWorker(worker);
alignFrame.getViewport().getCalcManager().startWorker(worker);
worker.updateParameters(this.preset, paramset);
}
}
- if (sh.action.toLowerCase().contains("disorder"))
+ if (sh.getAction().toLowerCase().contains("disorder"))
{
// build IUPred style client. take sequences, returns annotation per
// sequence.
return;
}
- alignFrame
- .getViewport()
- .getCalcManager()
- .startWorker(
- new AADisorderClient(sh, alignFrame, preset, paramset));
+ alignFrame.getViewport().getCalcManager().startWorker(
+ new AADisorderClient(sh, alignFrame, preset, paramset));
}
}
* @see jalview.ws.jws2.Jws2Client#attachWSMenuEntry(javax.swing.JMenu,
* jalview.ws.jws2.jabaws2.Jws2Instance, jalview.gui.AlignFrame)
*/
+ @Override
public void attachWSMenuEntry(JMenu wsmenu, final Jws2Instance service,
final AlignFrame alignFrame)
{
}
boolean hasparams = service.hasParameters();
// Assume name ends in WS
- String calcName = service.serviceType.substring(0,
- service.serviceType.length() - 2);
+ String calcName = service.getName().substring(0,
+ service.getName().length() - 2);
JMenuItem annotservice = new JMenuItem(MessageManager.formatMessage(
- "label.calcname_with_default_settings",
- new String[] { calcName }));
+ "label.calcname_with_default_settings", new String[]
+ { calcName }));
annotservice.addActionListener(new ActionListener()
{
// arguments
annotservice = new JMenuItem(
MessageManager.getString("label.edit_settings_and_run"));
- annotservice
- .setToolTipText(MessageManager
- .getString("label.view_and_change_parameters_before_running_calculation"));
+ annotservice.setToolTipText(MessageManager.getString(
+ "label.view_and_change_parameters_before_running_calculation"));
annotservice.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
new SequenceAnnotationWSClient(service, alignFrame, null, true);
List<WsParamSetI> presets = service.getParamStore().getPresets();
if (presets != null && presets.size() > 0)
{
- JMenu presetlist = new JMenu(MessageManager.formatMessage(
- "label.run_with_preset", new String[] { calcName }));
+ JMenu presetlist = new JMenu(MessageManager
+ .formatMessage("label.run_with_preset", new String[]
+ { calcName }));
for (final WsParamSetI preset : presets)
{
final JMenuItem methodR = new JMenuItem(preset.getName());
- methodR.setToolTipText(JvSwingUtils.wrapTooltip(
- true,
- "<strong>"
- + (preset.isModifiable() ? MessageManager
- .getString("label.user_preset")
- : MessageManager
- .getString("label.service_preset"))
- + "</strong><br/>" + preset.getDescription()));
+ methodR.setToolTipText(JvSwingUtils.wrapTooltip(true, "<strong>"
+ + (preset.isModifiable()
+ ? MessageManager.getString("label.user_preset")
+ : MessageManager
+ .getString("label.service_preset"))
+ + "</strong><br/>" + preset.getDescription()));
methodR.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
new SequenceAnnotationWSClient(service, alignFrame, preset,
Desktop.instance.showUrl(service.docUrl);
}
});
- annotservice.setToolTipText(JvSwingUtils.wrapTooltip(true,
- MessageManager.formatMessage("label.view_service_doc_url",
- new String[] { service.docUrl, service.docUrl })));
+ annotservice.setToolTipText(
+ JvSwingUtils.wrapTooltip(true, MessageManager.formatMessage(
+ "label.view_service_doc_url", new String[]
+ { service.docUrl, service.docUrl })));
wsmenu.add(annotservice);
}
}