import jalview.util.MessageManager;
import jalview.ws.api.ServiceWithParameters;
import jalview.ws.jws2.dm.AAConSettings;
-import jalview.ws.jws2.jabaws2.Jws2Instance;
+import jalview.ws.params.AutoCalcSetting;
import jalview.ws.uimodel.AlignAnalysisUIText;
import java.awt.event.ActionEvent;
static boolean registerAAConWSInstance(final JMenu wsmenu,
final ServiceWithParameters service, final AlignFrame alignFrame)
{
- Jws2Instance jaba_service = (Jws2Instance) service;
- final AlignAnalysisUIText aaui = jaba_service.getAlignAnalysisUI(); // null
+ final AlignAnalysisUIText aaui = service.getAlignAnalysisUI(); // null
// ; //
// AlignAnalysisUIText.aaConGUI.get(service.serviceType.toString());
if (aaui == null)
.getRegisteredWorkersOfClass(aaui.getClient());
if (aaconClient != null && aaconClient.size() > 0)
{
- AbstractJabaCalcWorker worker = (AbstractJabaCalcWorker) aaconClient
+ SeqAnnotationServiceCalcWorker worker = (SeqAnnotationServiceCalcWorker) aaconClient
.get(0);
if (!worker.service.getHostURL().equals(service.getHostURL()))
{
// public void run()
{
removeCurrentAAConWorkerFor(aaui, alignFrame);
- buildCurrentAAConWorkerFor(aaui, alignFrame, jaba_service);
+ buildCurrentAAConWorkerFor(aaui, alignFrame, service);
}
} // );
}
{
aaConEnabled.setEnabled(false);
modifyParams.setEnabled(false);
+ return;
}
List<AlignCalcWorkerI> aaconClient = alignFrame.getViewport()
- .getCalcManager()
- .getRegisteredWorkersOfClass(aaui.getClient());
- if (aaconClient != null && aaconClient.size() > 0)
- {
- aaConEnabled.setSelected(true);
- }
- else
+ .getCalcManager().getRegisteredWorkersOfClass(
+ SeqAnnotationServiceCalcWorker.class);
+
+ boolean serviceEnabled = false;
+ if (aaconClient != null)
{
- aaConEnabled.setSelected(false);
+ for (AlignCalcWorkerI _worker : aaconClient)
+ {
+ SeqAnnotationServiceCalcWorker worker = (SeqAnnotationServiceCalcWorker) _worker;
+ // this could be cleaner ?
+ if (worker.hasService()
+ && aaui.getClient()
+ .equals(worker.getService().getClass()))
+ {
+ serviceEnabled = true;
+ }
+ }
}
+ aaConEnabled.setSelected(serviceEnabled);
}
@Override
* AACon server to use What parameters to use
*/
// could actually do a class search for this too
- AAConSettings fave = (AAConSettings) alignFrame.getViewport()
+ AutoCalcSetting fave = alignFrame.getViewport()
.getCalcIdSettingsFor(aaui.getCalcId());
if (fave == null)
{
private static void buildCurrentAAConWorkerFor(
final AlignAnalysisUIText aaui, AlignFrame alignFrame,
- Jws2Instance service)
+ ServiceWithParameters service)
{
/*
* preferred settings Whether AACon is automatically recalculated Which
* AACon server to use What parameters to use
*/
- AAConSettings fave = (AAConSettings) alignFrame.getViewport()
+ AutoCalcSetting fave = alignFrame.getViewport()
.getCalcIdSettingsFor(aaui.getCalcId());
if (fave == null)
{
new SequenceAnnotationWSClient(fave, alignFrame, false);
}
- private static AAConSettings createDefaultAAConSettings(
+ private static AutoCalcSetting createDefaultAAConSettings(
AlignAnalysisUIText aaui)
{
return createDefaultAAConSettings(aaui, null);
}
- private static AAConSettings createDefaultAAConSettings(
- AlignAnalysisUIText aaui, Jws2Instance service)
+ private static AutoCalcSetting createDefaultAAConSettings(
+ AlignAnalysisUIText aaui, ServiceWithParameters service)
{
if (service != null)
{
- if (!service.getServiceType()
- .equals(compbio.ws.client.Services.AAConWS.toString()))
- {
- Cache.log.warn(
- "Ignoring invalid preferred service for AACon calculations (service type was "
- + service.getServiceType() + ")");
- service = null;
- }
- else
+ // if (!service.getServiceType()
+ // .equals(compbio.ws.client.Services.AAConWS.toString()))
+ // {
+ // Cache.log.warn(
+ // "Ignoring invalid preferred service for AACon calculations (service
+ // type was "
+ // + service.getServiceType() + ")");
+ // service = null;
+ // }
+ // else
{
// check service is actually in the list of currently avaialable
// services
- if (!Jws2Discoverer.getDiscoverer().getServices().contains(service))
+ if (!PreferredServiceRegistry.getRegistry().contains(service))
{
// it isn't ..
service = null;
if (service == null)
{
// get the default service for AACon
- service = Jws2Discoverer.getDiscoverer().getPreferredServiceFor(null,
+ service = PreferredServiceRegistry.getRegistry().getPreferredServiceFor(null,
aaui.getServiceType());
}
if (service == null)