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 features/JAL-2094_colourInterface
[jalview.git]
/
src
/
jalview
/
schemes
/
RNAHelicesColourChooser.java
diff --git
a/src/jalview/schemes/RNAHelicesColourChooser.java
b/src/jalview/schemes/RNAHelicesColourChooser.java
index
1a13bbe
..
b1b3c5a
100644
(file)
--- a/
src/jalview/schemes/RNAHelicesColourChooser.java
+++ b/
src/jalview/schemes/RNAHelicesColourChooser.java
@@
-22,6
+22,7
@@
package jalview.schemes;
import jalview.api.AlignViewportI;
import jalview.api.AlignmentViewPanel;
import jalview.api.AlignViewportI;
import jalview.api.AlignmentViewPanel;
+import jalview.datamodel.AlignmentAnnotation;
import jalview.datamodel.SequenceGroup;
import java.awt.event.ActionEvent;
import jalview.datamodel.SequenceGroup;
import java.awt.event.ActionEvent;
@@
-77,16
+78,20
@@
public class RNAHelicesColourChooser
adjusting = true;
Vector list = new Vector();
int index = 1;
adjusting = true;
Vector list = new Vector();
int index = 1;
- for (int i = 0; i < av.getAlignment().getAlignmentAnnotation().length; i++)
+ AlignmentAnnotation[] anns = av.getAlignment().getAlignmentAnnotation();
+ if (anns != null)
{
{
- String label = av.getAlignment().getAlignmentAnnotation()[i].label;
- if (!list.contains(label))
+ for (int i = 0; i < anns.length; i++)
{
{
- list.addElement(label);
- }
- else
- {
- list.addElement(label + "_" + (index++));
+ String label = anns[i].label;
+ if (!list.contains(label))
+ {
+ list.addElement(label);
+ }
+ else
+ {
+ list.addElement(label + "_" + (index++));
+ }
}
}
}
}