JAL-1520 fix unicode translation errors.
authorJim Procter <jprocter@dundee.ac.uk>
Fri, 6 Jun 2014 14:13:20 +0000 (15:13 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Fri, 6 Jun 2014 14:13:20 +0000 (15:13 +0100)
src/jalview/datamodel/AlignmentAnnotation.java
src/jalview/renderer/AnnotationRenderer.java

index 989d62a..9659cd7 100755 (executable)
@@ -259,6 +259,7 @@ public class AlignmentAnnotation
       // Check for RNA secondary structure
       {
         // System.out.println(annotations[i].secondaryStructure);
+        // TODO: 2.8.2 should this ss symbol validation check be a function in RNA/ResidueProperties ?
         if (annotations[i].secondaryStructure == '('
                 || annotations[i].secondaryStructure == '['
                 || annotations[i].secondaryStructure == '<'
@@ -320,9 +321,7 @@ public class AlignmentAnnotation
                 // annotations[i].displayCharacter.charAt(0)==annotations[i].secondaryStructure
                 firstChar != ' '
                 && firstChar != '$'
-                && firstChar != '�' // JBPNote should explicitly express as
-                                    // unicode number to avoid source code
-                                    // translation problems
+                && firstChar != 0xCE
                 && firstChar != '('
                 && firstChar != '['
                 && firstChar != '>'
index 4c3711d..06014c5 100644 (file)
@@ -702,7 +702,7 @@ public class AnnotationRenderer
                           iconOffset, startRes, column, validRes, validEnd);
                   break;
 
-                case '�':
+                case 0xCE:
                   drawSheetAnnot(g, row_annotations, lastSSX, x, y,
                           iconOffset, startRes, column, validRes, validEnd);
                   break;