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' into spike/javier_noseqhack
[jalview.git]
/
src
/
jalview
/
gui
/
AnnotationRowFilter.java
diff --git
a/src/jalview/gui/AnnotationRowFilter.java
b/src/jalview/gui/AnnotationRowFilter.java
index
8b2486f
..
f13cb10
100644
(file)
--- a/
src/jalview/gui/AnnotationRowFilter.java
+++ b/
src/jalview/gui/AnnotationRowFilter.java
@@
-80,7
+80,7
@@
public abstract class AnnotationRowFilter extends JPanel
*/
protected boolean sliderDragging = false;
*/
protected boolean sliderDragging = false;
- protected JComboBox<String> threshold = new JComboBox<String>();
+ protected JComboBox<String> threshold = new JComboBox<>();
protected JComboBox<String> annotations;
protected JComboBox<String> annotations;
@@
-172,12
+172,7
@@
public abstract class AnnotationRowFilter extends JPanel
@Override
public void mouseReleased(MouseEvent evt)
{
@Override
public void mouseReleased(MouseEvent evt)
{
- if (sliderDragging)
- {
- sliderDragging = false;
- valueChanged(true);
- }
- ap.paintAlignment(true);
+ sliderDragReleased();
}
});
}
}
});
}
@@
-192,9
+187,9
@@
public abstract class AnnotationRowFilter extends JPanel
*/
public Vector<String> getAnnotationItems(boolean isSeqAssociated)
{
*/
public Vector<String> getAnnotationItems(boolean isSeqAssociated)
{
- annotationLabels = new HashMap<AlignmentAnnotation, String>();
+ annotationLabels = new HashMap<>();
- Vector<String> list = new Vector<String>();
+ Vector<String> list = new Vector<>();
int index = 1;
int[] anmap = new int[av.getAlignment()
.getAlignmentAnnotation().length];
int index = 1;
int[] anmap = new int[av.getAlignment()
.getAlignmentAnnotation().length];
@@
-271,7
+266,7
@@
public abstract class AnnotationRowFilter extends JPanel
public void cancel_actionPerformed()
{
reset();
public void cancel_actionPerformed()
{
reset();
- ap.paintAlignment(true);
+ ap.paintAlignment(true, true);
try
{
frame.setClosed(true);
try
{
frame.setClosed(true);
@@
-413,6
+408,11
@@
public abstract class AnnotationRowFilter extends JPanel
this.currentAnnotation = annotation;
}
this.currentAnnotation = annotation;
}
+ /**
+ * update associated view model and trigger any necessary repaints.
+ *
+ * @param updateAllAnnotation
+ */
protected abstract void valueChanged(boolean updateAllAnnotation);
protected abstract void updateView();
protected abstract void valueChanged(boolean updateAllAnnotation);
protected abstract void updateView();
@@
-519,4
+519,13
@@
public abstract class AnnotationRowFilter extends JPanel
{
this.annotations = anns;
}
{
this.annotations = anns;
}
+
+ protected void sliderDragReleased()
+ {
+ if (sliderDragging)
+ {
+ sliderDragging = false;
+ valueChanged(true);
+ }
+ }
}
}