git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c8d7bf9
)
JAL-3285 code changes to AnnotationLabels not included in the merge
author
tva
<tva@10.205.251.175>
Wed, 5 Jun 2019 12:32:15 +0000
(13:32 +0100)
committer
tva
<tva@10.205.251.175>
Wed, 5 Jun 2019 12:32:15 +0000
(13:32 +0100)
src/jalview/gui/AnnotationLabels.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/AnnotationLabels.java
b/src/jalview/gui/AnnotationLabels.java
index
8aac7dc
..
bf3ecf2
100755
(executable)
--- a/
src/jalview/gui/AnnotationLabels.java
+++ b/
src/jalview/gui/AnnotationLabels.java
@@
-366,9
+366,9
@@
public class AnnotationLabels extends JPanel
// JAL-1264 hide all sequence-specific annotations of this type
if (selectedRow < aa.length)
{
// JAL-1264 hide all sequence-specific annotations of this type
if (selectedRow < aa.length)
{
- if (isSequenceAnnotation)
+ if (aa[selectedRow].sequenceRef != null)
{
{
- final String label = ann.label;
+ final String label = aa[selectedRow].label;
JMenuItem hideType = new JMenuItem();
String text = MessageManager.getString("label.hide_all") + " "
+ label;
JMenuItem hideType = new JMenuItem();
String text = MessageManager.getString("label.hide_all") + " "
+ label;
@@
-403,17
+403,17
@@
public class AnnotationLabels extends JPanel
// property methods
if (selectedRow < aa.length)
{
// property methods
if (selectedRow < aa.length)
{
- final String label = ann.label;
- if (!(ann.autoCalculated)
+ final String label = aa[selectedRow].label;
+ if (!(aa[selectedRow].autoCalculated)
&& !(InformationThread.HMM_CALC_ID.equals(ann.getCalcId())))
{
&& !(InformationThread.HMM_CALC_ID.equals(ann.getCalcId())))
{
- if (ann.graph == AlignmentAnnotation.NO_GRAPH)
+ if (aa[selectedRow].graph == AlignmentAnnotation.NO_GRAPH)
{
// display formatting settings for this row.
pop.addSeparator();
// av and sequencegroup need to implement same interface for
item = new JCheckBoxMenuItem(TOGGLE_LABELSCALE,
{
// display formatting settings for this row.
pop.addSeparator();
// av and sequencegroup need to implement same interface for
item = new JCheckBoxMenuItem(TOGGLE_LABELSCALE,
- ann.scaleColLabel);
+ aa[selectedRow].scaleColLabel);
item.addActionListener(this);
pop.add(item);
}
item.addActionListener(this);
pop.add(item);
}