X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fworkers%2FAlignCalcWorker.java;h=566891f5801b8909db8f79fb643ba08e005a88f1;hb=cebd1eaa580d3d1a08360d0d71661e7c5437918c;hp=50be3e4abda6f034b4618be57d5f8339e40b0a79;hpb=285069b142906cbc1bd18b09b61ddb996aeb1617;p=jalview.git
diff --git a/src/jalview/workers/AlignCalcWorker.java b/src/jalview/workers/AlignCalcWorker.java
index 50be3e4..566891f 100644
--- a/src/jalview/workers/AlignCalcWorker.java
+++ b/src/jalview/workers/AlignCalcWorker.java
@@ -1,5 +1,22 @@
-/**
+/*
+ * 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.
+ *
+ * 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 .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.workers;
@@ -10,11 +27,13 @@ import jalview.api.AlignCalcWorkerI;
import jalview.api.AlignViewportI;
import jalview.api.AlignmentViewPanel;
import jalview.datamodel.AlignmentAnnotation;
+import jalview.datamodel.AlignmentI;
/**
- * Base class for alignment calculation workers
+ * Base class for alignment calculation workers
+ *
* @author jimp
- *
+ *
*/
public abstract class AlignCalcWorker implements AlignCalcWorkerI
{
@@ -22,30 +41,58 @@ public abstract class AlignCalcWorker implements AlignCalcWorkerI
* manager and data source for calculations
*/
protected AlignViewportI alignViewport;
+
protected AlignCalcManagerI calcMan;
+
protected AlignmentViewPanel ap;
- protected List ourAnnots=null;
-
+
+ protected List ourAnnots = null;
+
public AlignCalcWorker(AlignViewportI alignViewport,
AlignmentViewPanel alignPanel)
{
this.alignViewport = alignViewport;
- calcMan=alignViewport.getCalcManager();
- ap = alignPanel;
+ calcMan = alignViewport.getCalcManager();
+ ap = alignPanel;
}
+
protected void abortAndDestroy()
{
- if (calcMan!=null) {
+ if (calcMan != null)
+ {
calcMan.workerComplete(this);
}
- alignViewport=null;
- calcMan=null;
- ap=null;
-
+ alignViewport = null;
+ calcMan = null;
+ ap = null;
+
}
+
public boolean involves(AlignmentAnnotation i)
{
- return ourAnnots!=null && ourAnnots.contains(i);
+ return ourAnnots != null && ourAnnots.contains(i);
+ }
+
+ /**
+ * permanently remove from the alignment all annotation rows managed by this
+ * worker
+ */
+ @Override
+ public void removeOurAnnotation()
+ {
+ if (ourAnnots != null && alignViewport != null)
+ {
+ AlignmentI alignment = alignViewport.getAlignment();
+ synchronized (ourAnnots)
+ {
+ for (AlignmentAnnotation aa : ourAnnots)
+ {
+ alignment.deleteAnnotation(aa, true);
+ }
+ }
+ }
}
+ // TODO: allow GUI to query workers associated with annotation to add items to
+ // annotation label panel popup menu
}