git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2183 don't open two free text panels; give input field focus
[jalview.git]
/
src
/
jalview
/
workers
/
ConsensusThread.java
diff --git
a/src/jalview/workers/ConsensusThread.java
b/src/jalview/workers/ConsensusThread.java
index
f244242
..
5f0ec84
100644
(file)
--- a/
src/jalview/workers/ConsensusThread.java
+++ b/
src/jalview/workers/ConsensusThread.java
@@
-20,10
+20,7
@@
*/
package jalview.workers;
*/
package jalview.workers;
-import java.util.Hashtable;
-
import jalview.analysis.AAFrequency;
import jalview.analysis.AAFrequency;
-import jalview.api.AlignCalcWorkerI;
import jalview.api.AlignViewportI;
import jalview.api.AlignmentViewPanel;
import jalview.datamodel.AlignmentAnnotation;
import jalview.api.AlignViewportI;
import jalview.api.AlignmentViewPanel;
import jalview.datamodel.AlignmentAnnotation;
@@
-32,8
+29,9
@@
import jalview.datamodel.Annotation;
import jalview.datamodel.SequenceI;
import jalview.schemes.ColourSchemeI;
import jalview.datamodel.SequenceI;
import jalview.schemes.ColourSchemeI;
-public class ConsensusThread extends AlignCalcWorker implements
- AlignCalcWorkerI
+import java.util.Hashtable;
+
+public class ConsensusThread extends AlignCalcWorker
{
public ConsensusThread(AlignViewportI alignViewport,
AlignmentViewPanel alignPanel)
{
public ConsensusThread(AlignViewportI alignViewport,
AlignmentViewPanel alignPanel)
@@
-98,7
+96,7
@@
public class ConsensusThread extends AlignCalcWorker implements
}
} catch (OutOfMemoryError error)
{
}
} catch (OutOfMemoryError error)
{
- calcMan.workerCannotRun(this);
+ calcMan.disableWorker(this);
ap.raiseOOMWarning("calculating consensus", error);
} finally
{
ap.raiseOOMWarning("calculating consensus", error);
} finally
{
@@
-130,8
+128,7
@@
public class ConsensusThread extends AlignCalcWorker implements
Hashtable[] hconsensus = new Hashtable[alignment.getWidth()];
SequenceI[] aseqs = getSequences();
Hashtable[] hconsensus = new Hashtable[alignment.getWidth()];
SequenceI[] aseqs = getSequences();
- AAFrequency.calculate(aseqs, 0, alignment.getWidth(), hconsensus,
- true);
+ AAFrequency.calculate(aseqs, 0, alignment.getWidth(), hconsensus, true);
alignViewport.setSequenceConsensusHash(hconsensus);
setColourSchemeConsensus(hconsensus);
alignViewport.setSequenceConsensusHash(hconsensus);
setColourSchemeConsensus(hconsensus);