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:
e8df2dd
)
fix null annotation values
author
jprocter
<Jim Procter>
Fri, 20 Apr 2007 15:34:06 +0000
(15:34 +0000)
committer
jprocter
<Jim Procter>
Fri, 20 Apr 2007 15:34:06 +0000
(15:34 +0000)
src/jalview/datamodel/AlignmentAnnotation.java
patch
|
blob
|
history
diff --git
a/src/jalview/datamodel/AlignmentAnnotation.java
b/src/jalview/datamodel/AlignmentAnnotation.java
index
27ccd4c
..
81ea36f
100755
(executable)
--- a/
src/jalview/datamodel/AlignmentAnnotation.java
+++ b/
src/jalview/datamodel/AlignmentAnnotation.java
@@
-132,32
+132,34
@@
public class AlignmentAnnotation
padGaps = false;
continue;
}
padGaps = false;
continue;
}
-
if (annotations[i].secondaryStructure == 'H' ||
annotations[i].secondaryStructure == 'E')
{
if (annotations[i].secondaryStructure == 'H' ||
annotations[i].secondaryStructure == 'E')
{
- hasIcons = true;
+ hasIcons = true;
}
}
- if (annotations[i].displayCharacter.length() == 1
+ if (annotations[i].displayCharacter!=null)
+ {
+ if (annotations[i].displayCharacter.length() == 1
&& !annotations[i].displayCharacter.equals("H")
&& !annotations[i].displayCharacter.equals("E")
&& !annotations[i].displayCharacter.equals("-")
&& !annotations[i].displayCharacter.equals("."))
&& !annotations[i].displayCharacter.equals("H")
&& !annotations[i].displayCharacter.equals("E")
&& !annotations[i].displayCharacter.equals("-")
&& !annotations[i].displayCharacter.equals("."))
- {
- if (jalview.schemes.ResidueProperties.aaIndex
- [annotations[i].displayCharacter.charAt(0)] < 23)
{
{
- nonSSLabel = true;
+ if (jalview.schemes.ResidueProperties.aaIndex
+ [annotations[i].displayCharacter.charAt(0)] < 23)
+ {
+ nonSSLabel = true;
+ }
}
}
- }
- if (annotations[i].displayCharacter.length() > 0)
- {
- hasText = true;
+ if (annotations[i].displayCharacter.length() > 0)
+ {
+ hasText = true;
+ }
+ else
+ padGaps = false;
}
}
- else
- padGaps = false;
}
}
@@
-226,7
+228,7
@@
public class AlignmentAnnotation
continue;
}
continue;
}
- if (drawValues && annotations[i].displayCharacter.length() > 1)
+ if (drawValues && annotations[i].displayCharacter!=null && annotations[i].displayCharacter.length() > 1)
{
drawValues = false;
}
{
drawValues = false;
}