From: Jim Procter Date: Mon, 15 Jun 2015 16:06:51 +0000 (+0100) Subject: JAL-1775 patch regression bug when displayChar is null and secondaryStructure contain... X-Git-Tag: Release_2_10_0~606^2~1^2 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=d1f61dfcb459e538da2d2265f2dff9abf3ccf400;p=jalview.git JAL-1775 patch regression bug when displayChar is null and secondaryStructure contains secondary structure info --- diff --git a/src/jalview/datamodel/AlignmentAnnotation.java b/src/jalview/datamodel/AlignmentAnnotation.java index a7e635f..52779f7 100755 --- a/src/jalview/datamodel/AlignmentAnnotation.java +++ b/src/jalview/datamodel/AlignmentAnnotation.java @@ -502,9 +502,13 @@ public class AlignmentAnnotation public char charAt(int index) { return ((index + offset < 0) || (index + offset) >= max - || annotations[index + offset] == null || (annotations[index - + offset].secondaryStructure <= ' ') ? ' ' - : annotations[index + offset].displayCharacter.charAt(0)); + || annotations[index + offset] == null + || (annotations[index + offset].secondaryStructure <= ' ') ? ' ' + : annotations[index + offset].displayCharacter == null + || annotations[index + offset].displayCharacter + .length() == 0 ? annotations[index + offset].secondaryStructure + : annotations[index + offset].displayCharacter + .charAt(0)); } @Override @@ -516,7 +520,9 @@ public class AlignmentAnnotation for (int i = offset; i < mx; i++) { string[i] = (annotations[i] == null || (annotations[i].secondaryStructure <= 32)) ? ' ' - : annotations[i].displayCharacter.charAt(0); + : (annotations[i].displayCharacter == null + || annotations[i].displayCharacter.length() == 0 ? annotations[i].secondaryStructure + : annotations[i].displayCharacter.charAt(0)); } return new String(string); }