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-2774 Fixed merge issues
[jalview.git]
/
src
/
jalview
/
workers
/
AnnotationWorker.java
diff --git
a/src/jalview/workers/AnnotationWorker.java
b/src/jalview/workers/AnnotationWorker.java
index
4d81307
..
8f37f15
100644
(file)
--- a/
src/jalview/workers/AnnotationWorker.java
+++ b/
src/jalview/workers/AnnotationWorker.java
@@
-47,11
+47,11
@@
class AnnotationWorker extends AlignCalcWorker
* @param af
* @param counter
*/
* @param af
* @param counter
*/
- public AnnotationWorker(AlignViewportI viewport,
- AlignmentViewPanel panel, AnnotationProviderI counter)
+ public AnnotationWorker(AlignViewportI viewport, AlignmentViewPanel panel,
+ AnnotationProviderI counter)
{
super(viewport, panel);
{
super(viewport, panel);
- ourAnnots = new ArrayList<AlignmentAnnotation>();
+ ourAnnots = new ArrayList<>();
this.counter = counter;
calcMan.registerWorker(this);
}
this.counter = counter;
calcMan.registerWorker(this);
}
@@
-121,7
+121,10
@@
class AnnotationWorker extends AlignCalcWorker
if (ap != null)
{
ap.adjustAnnotationHeight();
if (ap != null)
{
ap.adjustAnnotationHeight();
- ap.paintAlignment(true);
+ // TODO: only need to update colour and geometry if panel height changes
+ // and view is coloured by annotation, and the annotation is actually
+ // changed!
+ ap.paintAlignment(true, true);
}
}
}
}