X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fworkers%2FAlignCalcManager.java;h=10637063e3217a8448315cde0a4b2b9be2773bdb;hb=be32c14cd8e48fe0a207cd7030cb9cd46f894678;hp=dd255936064009475bfe2276c4d408e765bc9317;hpb=ad15cff29620f960119f80176f1fd443da9f6763;p=jalview.git diff --git a/src/jalview/workers/AlignCalcManager.java b/src/jalview/workers/AlignCalcManager.java index dd25593..1063706 100644 --- a/src/jalview/workers/AlignCalcManager.java +++ b/src/jalview/workers/AlignCalcManager.java @@ -20,6 +20,10 @@ */ package jalview.workers; +import jalview.api.AlignCalcManagerI; +import jalview.api.AlignCalcWorkerI; +import jalview.datamodel.AlignmentAnnotation; + import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; @@ -28,10 +32,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import jalview.api.AlignCalcManagerI; -import jalview.api.AlignCalcWorkerI; -import jalview.datamodel.AlignmentAnnotation; - public class AlignCalcManager implements AlignCalcManagerI { private volatile List restartable = Collections @@ -256,10 +256,12 @@ public class AlignCalcManager implements AlignCalcManagerI for (List workers : updating.values()) { for (AlignCalcWorkerI worker : workers) + { if (worker.involves(alignmentAnnotation)) { return true; } + } } } return false; @@ -291,7 +293,7 @@ public class AlignCalcManager implements AlignCalcManagerI AlignCalcWorkerI[] workers; synchronized (canUpdate) { - workers = canUpdate.toArray(new AlignCalcWorkerI[0]); + workers = canUpdate.toArray(new AlignCalcWorkerI[canUpdate.size()]); } for (AlignCalcWorkerI worker : workers) {