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
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
[jalview.git]
/
src
/
jalview
/
workers
/
AlignCalcWorker.java
diff --git
a/src/jalview/workers/AlignCalcWorker.java
b/src/jalview/workers/AlignCalcWorker.java
index
566891f
..
48e3604
100644
(file)
--- a/
src/jalview/workers/AlignCalcWorker.java
+++ b/
src/jalview/workers/AlignCalcWorker.java
@@
-20,8
+20,6
@@
*/
package jalview.workers;
*/
package jalview.workers;
-import java.util.List;
-
import jalview.api.AlignCalcManagerI;
import jalview.api.AlignCalcWorkerI;
import jalview.api.AlignViewportI;
import jalview.api.AlignCalcManagerI;
import jalview.api.AlignCalcWorkerI;
import jalview.api.AlignViewportI;
@@
-29,6
+27,8
@@
import jalview.api.AlignmentViewPanel;
import jalview.datamodel.AlignmentAnnotation;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.AlignmentAnnotation;
import jalview.datamodel.AlignmentI;
+import java.util.List;
+
/**
* Base class for alignment calculation workers
*
/**
* Base class for alignment calculation workers
*
@@
-46,7
+46,7
@@
public abstract class AlignCalcWorker implements AlignCalcWorkerI
protected AlignmentViewPanel ap;
protected AlignmentViewPanel ap;
- protected List<AlignmentAnnotation> ourAnnots = null;
+ protected List<AlignmentAnnotation> ourAnnots;
public AlignCalcWorker(AlignViewportI alignViewport,
AlignmentViewPanel alignPanel)
public AlignCalcWorker(AlignViewportI alignViewport,
AlignmentViewPanel alignPanel)
@@
-68,17
+68,18
@@
public abstract class AlignCalcWorker implements AlignCalcWorkerI
}
}
+ @Override
public boolean involves(AlignmentAnnotation i)
{
return ourAnnots != null && ourAnnots.contains(i);
}
/**
public boolean involves(AlignmentAnnotation i)
{
return ourAnnots != null && ourAnnots.contains(i);
}
/**
- * permanently remove from the alignment all annotation rows managed by this
+ * Permanently removes from the alignment all annotation rows managed by this
* worker
*/
@Override
* worker
*/
@Override
- public void removeOurAnnotation()
+ public void removeAnnotation()
{
if (ourAnnots != null && alignViewport != null)
{
{
if (ourAnnots != null && alignViewport != null)
{
@@
-90,6
+91,7
@@
public abstract class AlignCalcWorker implements AlignCalcWorkerI
alignment.deleteAnnotation(aa, true);
}
}
alignment.deleteAnnotation(aa, true);
}
}
+ ourAnnots.clear();
}
}
// TODO: allow GUI to query workers associated with annotation to add items to
}
}
// TODO: allow GUI to query workers associated with annotation to add items to