X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FSeqAnnotationServiceCalcWorker.java;fp=src%2Fjalview%2Fws%2Fjws2%2FSeqAnnotationServiceCalcWorker.java;h=81dfa30cfd276e9205f1aa8db43aff10fb98c71f;hb=748f62fced3e8af2337d502129a2735ed4f6020b;hp=661bdf7228c31a05929d3fcffe1b06f694a01e6b;hpb=53c7ffa049dd10ce2c67f100d788c0d07e3fcb11;p=jalview.git diff --git a/src/jalview/ws/jws2/SeqAnnotationServiceCalcWorker.java b/src/jalview/ws/jws2/SeqAnnotationServiceCalcWorker.java index 661bdf7..81dfa30 100644 --- a/src/jalview/ws/jws2/SeqAnnotationServiceCalcWorker.java +++ b/src/jalview/ws/jws2/SeqAnnotationServiceCalcWorker.java @@ -424,6 +424,24 @@ public class SeqAnnotationServiceCalcWorker extends AlignCalcWorker // sequence, excluding regions not annotated due to gapMap/column // visibility + // update calcId if it is not already set on returned annotation + if (returnedAnnot != null) + { + for (AlignmentAnnotation aa : returnedAnnot) + { + // assume that any CalcIds already set + if (getCalcId() != null && aa.getCalcId() == null + || "".equals(aa.getCalcId())) + { + aa.setCalcId(getCalcId()); + } + // autocalculated annotation are created by interactive alignment + // analysis services + aa.autoCalculated = service.isAlignmentAnalysis() + && service.isInteractiveUpdate(); + } + } + running.setAnnotation(returnedAnnot); if (running.hasResults())