From: gmungoc Date: Mon, 23 Mar 2015 14:41:57 +0000 (+0000) Subject: JAL-1681 (import reorder only) X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;ds=inline;h=bb074f6d0c036c1b7754d83fe4dbd9f00e95fe72;p=jalview.git JAL-1681 (import reorder only) --- diff --git a/src/jalview/workers/ComplementConsensusThread.java b/src/jalview/workers/ComplementConsensusThread.java index fcc5a82..2e4424e 100644 --- a/src/jalview/workers/ComplementConsensusThread.java +++ b/src/jalview/workers/ComplementConsensusThread.java @@ -1,5 +1,7 @@ package jalview.workers; +import java.util.Hashtable; + import jalview.analysis.AAFrequency; import jalview.api.AlignViewportI; import jalview.api.AlignmentViewPanel; @@ -7,8 +9,6 @@ import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.AlignmentI; import jalview.datamodel.SequenceI; -import java.util.Hashtable; - /** * A thread to recompute the consensus of the cDNA complement for a linked * protein alignment. diff --git a/src/jalview/workers/ConsensusThread.java b/src/jalview/workers/ConsensusThread.java index fbc2d59..f244242 100644 --- a/src/jalview/workers/ConsensusThread.java +++ b/src/jalview/workers/ConsensusThread.java @@ -20,6 +20,8 @@ */ package jalview.workers; +import java.util.Hashtable; + import jalview.analysis.AAFrequency; import jalview.api.AlignCalcWorkerI; import jalview.api.AlignViewportI; @@ -30,8 +32,6 @@ import jalview.datamodel.Annotation; import jalview.datamodel.SequenceI; import jalview.schemes.ColourSchemeI; -import java.util.Hashtable; - public class ConsensusThread extends AlignCalcWorker implements AlignCalcWorkerI { @@ -87,11 +87,10 @@ public class ConsensusThread extends AlignCalcWorker implements calcMan.workerComplete(this); return; } + eraseConsensus(aWidth); - // long now = System.currentTimeMillis(); computeConsensus(alignment); updateResultAnnotation(true); - // System.out.println(System.currentTimeMillis() - now); if (ap != null) {