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-1483 formatting
[jalview.git]
/
src
/
jalview
/
workers
/
StrucConsensusThread.java
diff --git
a/src/jalview/workers/StrucConsensusThread.java
b/src/jalview/workers/StrucConsensusThread.java
index
72d26ff
..
3230a36
100644
(file)
--- a/
src/jalview/workers/StrucConsensusThread.java
+++ b/
src/jalview/workers/StrucConsensusThread.java
@@
-20,8
+20,6
@@
*/
package jalview.workers;
*/
package jalview.workers;
-import java.util.Hashtable;
-
import jalview.analysis.StructureFrequency;
import jalview.api.AlignCalcWorkerI;
import jalview.api.AlignViewportI;
import jalview.analysis.StructureFrequency;
import jalview.api.AlignCalcWorkerI;
import jalview.api.AlignViewportI;
@@
-31,6
+29,8
@@
import jalview.datamodel.AlignmentI;
import jalview.datamodel.Annotation;
import jalview.datamodel.SequenceI;
import jalview.datamodel.Annotation;
import jalview.datamodel.SequenceI;
+import java.util.Hashtable;
+
public class StrucConsensusThread extends AlignCalcWorker implements
AlignCalcWorkerI
{
public class StrucConsensusThread extends AlignCalcWorker implements
AlignCalcWorkerI
{
@@
-74,6
+74,7
@@
public class StrucConsensusThread extends AlignCalcWorker implements
if (alignViewport.isClosed())
{
abortAndDestroy();
if (alignViewport.isClosed())
{
abortAndDestroy();
+ return;
}
AlignmentI alignment = alignViewport.getAlignment();
}
AlignmentI alignment = alignViewport.getAlignment();