X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fworkers%2FConservationThread.java;h=5c303fd4449dd8aa1b2c3f08df1fc4c79f94d974;hb=19f8ee5562523508666b4472ad624b9e549a3cea;hp=a8bc268d429a42222564e24d49b32a27149d00ab;hpb=5a8a5d9b76313a49f9a3279b31e7201c0c63a675;p=jalview.git
diff --git a/src/jalview/workers/ConservationThread.java b/src/jalview/workers/ConservationThread.java
index a8bc268..5c303fd 100644
--- a/src/jalview/workers/ConservationThread.java
+++ b/src/jalview/workers/ConservationThread.java
@@ -1,35 +1,35 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
- * Copyright (C) 2014 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.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.workers;
-import java.util.ArrayList;
-import java.util.List;
-
import jalview.analysis.Conservation;
-import jalview.api.AlignCalcWorkerI;
-import jalview.api.AlignmentViewPanel;
import jalview.api.AlignViewportI;
+import jalview.api.AlignmentViewPanel;
import jalview.datamodel.AlignmentAnnotation;
import jalview.datamodel.AlignmentI;
-public class ConservationThread extends AlignCalcWorker implements
- AlignCalcWorkerI
+import java.util.ArrayList;
+import java.util.List;
+
+public class ConservationThread extends AlignCalcWorker
{
private int ConsPercGaps = 25; // JBPNote : This should be a configurable
@@ -72,6 +72,7 @@ public class ConservationThread extends AlignCalcWorker implements
if (alignViewport.isClosed())
{
abortAndDestroy();
+ return;
}
List ourAnnot = new ArrayList();
AlignmentI alignment = alignViewport.getAlignment();
@@ -107,7 +108,7 @@ public class ConservationThread extends AlignCalcWorker implements
} catch (OutOfMemoryError error)
{
ap.raiseOOMWarning("calculating conservation", error);
- calcMan.workerCannotRun(this);
+ calcMan.disableWorker(this);
// alignViewport.conservation = null;
// this.alignViewport.quality = null;