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-2089 patch broken merge to master for Release 2.10.0b1
[jalview.git]
/
src
/
jalview
/
workers
/
ConsensusThread.java
diff --git
a/src/jalview/workers/ConsensusThread.java
b/src/jalview/workers/ConsensusThread.java
index
4539cce
..
5f0ec84
100644
(file)
--- a/
src/jalview/workers/ConsensusThread.java
+++ b/
src/jalview/workers/ConsensusThread.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
- * Copyright (C) 2015 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-21,7
+21,6
@@
package jalview.workers;
import jalview.analysis.AAFrequency;
package jalview.workers;
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
+31,7
@@
import jalview.schemes.ColourSchemeI;
import java.util.Hashtable;
import java.util.Hashtable;
-public class ConsensusThread extends AlignCalcWorker implements
- AlignCalcWorkerI
+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
{