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-3878 update branch from 2.12 merge from 2.11.2
[jalview.git]
/
src
/
jalview
/
workers
/
AlignCalcWorker.java
diff --git
a/src/jalview/workers/AlignCalcWorker.java
b/src/jalview/workers/AlignCalcWorker.java
index
0ad8726
..
16fc467
100644
(file)
--- a/
src/jalview/workers/AlignCalcWorker.java
+++ b/
src/jalview/workers/AlignCalcWorker.java
@@
-20,7
+20,7
@@
*/
package jalview.workers;
*/
package jalview.workers;
-import jalview.api.AlignCalcManagerI;
+import jalview.api.AlignCalcManagerI2;
import jalview.api.AlignCalcWorkerI;
import jalview.api.AlignViewportI;
import jalview.api.AlignmentViewPanel;
import jalview.api.AlignCalcWorkerI;
import jalview.api.AlignViewportI;
import jalview.api.AlignmentViewPanel;
@@
-43,7
+43,7
@@
public abstract class AlignCalcWorker implements AlignCalcWorkerI
*/
protected AlignViewportI alignViewport;
*/
protected AlignViewportI alignViewport;
- protected AlignCalcManagerI calcMan;
+ protected AlignCalcManagerI2 calcMan;
protected AlignmentViewPanel ap;
protected AlignmentViewPanel ap;
@@
-61,7
+61,8
@@
public abstract class AlignCalcWorker implements AlignCalcWorkerI
{
if (calcMan != null)
{
{
if (calcMan != null)
{
- calcMan.workerComplete(this);
+ calcMan.cancelWorker(this);
+ calcMan.removeWorker(this);
}
alignViewport = null;
calcMan = null;
}
alignViewport = null;
calcMan = null;
@@
-136,4
+137,8
@@
public abstract class AlignCalcWorker implements AlignCalcWorkerI
}
}
}
}
+ public AlignViewportI getAlignViewport()
+ {
+ return alignViewport;
+ }
}
}