import jalview.gui.WebserviceInfo;
import jalview.gui.WsJobParameters;
import jalview.util.MessageManager;
+import jalview.ws.api.UIinfo;
import jalview.ws.jws2.dm.AAConSettings;
import jalview.ws.jws2.dm.JabaWsParamSet;
import jalview.ws.jws2.jabaws2.Jws2Instance;
// anonymous constructor - used for headless method calls only
}
- protected WebserviceInfo setWebService(Jws2Instance serv, boolean b)
+ protected WebserviceInfo setWebService(UIinfo serv, boolean b)
{
- // serviceHandle = serv;
- String serviceInstance = serv.action; // serv.service.getClass().getName();
- WebServiceName = serv.serviceType;
+ // TODO pullup
+ WebServiceName = serv.getName();
WebServiceJobTitle = serv.getActionText();
- WsURL = serv.hosturl;
+ WsURL = serv.getHostURL();
if (!b)
{
return new WebserviceInfo(WebServiceJobTitle,
WebServiceJobTitle + " using service hosted at "
- + serv.hosturl + "\n"
- + (serv.description != null ? serv.description : ""),
+ + WsURL + "\n"
+ + (serv.getDescription() != null
+ ? serv.getDescription()
+ : ""),
false);
}
return null;
abstract void attachWSMenuEntry(JMenu wsmenu, final Jws2Instance service,
final AlignFrame alignFrame);
- protected boolean registerAAConWSInstance(final JMenu wsmenu,
+ static boolean registerAAConWSInstance(final JMenu wsmenu,
final Jws2Instance service, final AlignFrame alignFrame)
{
final AlignAnalysisUIText aaui = service.getAlignAnalysisUI(); // null ; //
{
AbstractJabaCalcWorker worker = (AbstractJabaCalcWorker) aaconClient
.get(0);
- if (!worker.service.hosturl.equals(service.hosturl))
+ if (!worker.service.getHostURL().equals(service.getHostURL()))
{
// javax.swing.SwingUtilities.invokeLater(new Runnable()
{
else
{
if (service != null
- && !fave.getService().hosturl.equals(service.hosturl))
+ && !fave.getService().getHostURL()
+ .equals(service.getHostURL()))
{
- Cache.log.debug("Changing AACon service to " + service.hosturl
- + " from " + fave.getService().hosturl);
+ Cache.log.debug("Changing AACon service to " + service.getHostURL()
+ + " from " + fave.getService().getHostURL());
fave.setService(service);
}
}
{
if (service != null)
{
- if (!service.serviceType.toString()
+ if (!service.getServiceType()
.equals(compbio.ws.client.Services.AAConWS.toString()))
{
Cache.log.warn(
"Ignoring invalid preferred service for AACon calculations (service type was "
- + service.serviceType + ")");
+ + service.getServiceType() + ")");
service = null;
}
else