}
}
- for (ServiceWithParameters svc : SlivkaWSDiscoverer.getServices())
+ for (ServiceWithParameters svc : SlivkaWSDiscoverer.getInstance()
+ .getServices())
{
if (svc.getNameURI().toLowerCase().contains("aacon"))
{
SeqAnnotationServiceCalcWorker aaconClient = new SeqAnnotationServiceCalcWorker(
aacon, af, null,
null);
- long current = System.currentTimeMillis(), limit = 5;
+ long current = System.currentTimeMillis(), limit = 15;
af.getViewport().getCalcManager().startWorker(aaconClient);
do
{
} while (af.getViewport().getCalcManager().isWorking());
AlignmentI orig_alig = af.getViewport().getAlignment();
boolean foundShenkin = false;
- for (AlignmentAnnotation aa : orig_alig
- .findAnnotation(aacon.getAlignAnalysisUI().getCalcId()))
+ Iterable<AlignmentAnnotation> _aa=orig_alig
+ .findAnnotation(aacon.getAlignAnalysisUI().getCalcId());
+ assertTrue("No annotation from service",
+ _aa != null && _aa.iterator().hasNext());
+
+ for (AlignmentAnnotation aa : _aa)
{
assertTrue("AACon annotation not marked as autocalculated!",
aa.autoCalculated);