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-2236 fixes for desktop and applet implementation of 'append seqname'
[jalview.git]
/
src
/
jalview
/
gui
/
AnnotationRowFilter.java
diff --git
a/src/jalview/gui/AnnotationRowFilter.java
b/src/jalview/gui/AnnotationRowFilter.java
index
17298ba
..
8335042
100644
(file)
--- a/
src/jalview/gui/AnnotationRowFilter.java
+++ b/
src/jalview/gui/AnnotationRowFilter.java
@@
-161,11
+161,19
@@
public abstract class AnnotationRowFilter extends JPanel
enableSeqAss = true;
}
String label = av.getAlignment().getAlignmentAnnotation()[i].label;
enableSeqAss = true;
}
String label = av.getAlignment().getAlignmentAnnotation()[i].label;
+ // add associated sequence ID if available
+ if (av.getAlignment().getAlignmentAnnotation()[i].sequenceRef != null)
+ {
+ label = label
+ + "_"
+ + av.getAlignment().getAlignmentAnnotation()[i].sequenceRef
+ .getName();
+ }
+ // make label unique
if (!list.contains(label))
{
anmap[list.size()] = i;
list.add(label);
if (!list.contains(label))
{
anmap[list.size()] = i;
list.add(label);
-
}
else
{
}
else
{
@@
-257,11
+265,11
@@
public abstract class AnnotationRowFilter extends JPanel
protected void populateThresholdComboBox(JComboBox<String> threshold)
{
threshold.addItem(MessageManager
protected void populateThresholdComboBox(JComboBox<String> threshold)
{
threshold.addItem(MessageManager
- .getString("label.threshold_feature_no_thereshold"));
+ .getString("label.threshold_feature_no_threshold"));
threshold.addItem(MessageManager
threshold.addItem(MessageManager
- .getString("label.threshold_feature_above_thereshold"));
+ .getString("label.threshold_feature_above_threshold"));
threshold.addItem(MessageManager
threshold.addItem(MessageManager
- .getString("label.threshold_feature_below_thereshold"));
+ .getString("label.threshold_feature_below_threshold"));
}
protected void seqAssociated_actionPerformed(ActionEvent arg0,
}
protected void seqAssociated_actionPerformed(ActionEvent arg0,