padGaps = false;
continue;
}
-
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("."))
- {
- 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;
}
continue;
}
- if (drawValues && annotations[i].displayCharacter.length() > 1)
+ if (drawValues && annotations[i].displayCharacter!=null && annotations[i].displayCharacter.length() > 1)
{
drawValues = false;
}