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
formatting
[jalview.git]
/
src
/
jalview
/
schemes
/
AnnotationColourGradient.java
diff --git
a/src/jalview/schemes/AnnotationColourGradient.java
b/src/jalview/schemes/AnnotationColourGradient.java
index
78e850b
..
b31eabc
100755
(executable)
--- a/
src/jalview/schemes/AnnotationColourGradient.java
+++ b/
src/jalview/schemes/AnnotationColourGradient.java
@@
-108,13
+108,16
@@
public class AnnotationColourGradient extends ResidueColourScheme
{
// TODO Auto-generated method stub
super.alignmentChanged(alignment, hiddenReps);
{
// TODO Auto-generated method stub
super.alignmentChanged(alignment, hiddenReps);
-
+
if (seqAssociated && annotation.getCalcId() != null)
{
if (seqAssociated && annotation.getCalcId() != null)
{
- if (seqannot!=null) {
+ if (seqannot != null)
+ {
seqannot.clear();
seqannot.clear();
- } else {
- seqannot=new IdentityHashMap<SequenceI, AlignmentAnnotation>();
+ }
+ else
+ {
+ seqannot = new IdentityHashMap<SequenceI, AlignmentAnnotation>();
}
for (AlignmentAnnotation alan : alignment.findAnnotation(annotation
.getCalcId()))
}
for (AlignmentAnnotation alan : alignment.findAnnotation(annotation
.getCalcId()))
@@
-193,8
+196,9
@@
public class AnnotationColourGradient extends ResidueColourScheme
public Color findColour(char c, int j, SequenceI seq)
{
Color currentColour = Color.white;
public Color findColour(char c, int j, SequenceI seq)
{
Color currentColour = Color.white;
- AlignmentAnnotation annotation=(seqAssociated ? seqannot.get(seq):this.annotation);
- if (annotation==null)
+ AlignmentAnnotation annotation = (seqAssociated ? seqannot.get(seq)
+ : this.annotation);
+ if (annotation == null)
{
return currentColour;
}
{
return currentColour;
}