From 0c0bbd65f29e9dcd63ec0f37427b6000fa1999f8 Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Fri, 6 Jun 2014 15:13:20 +0100 Subject: [PATCH] JAL-1520 fix unicode translation errors. --- src/jalview/datamodel/AlignmentAnnotation.java | 5 ++--- src/jalview/renderer/AnnotationRenderer.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/jalview/datamodel/AlignmentAnnotation.java b/src/jalview/datamodel/AlignmentAnnotation.java index 989d62a..9659cd7 100755 --- a/src/jalview/datamodel/AlignmentAnnotation.java +++ b/src/jalview/datamodel/AlignmentAnnotation.java @@ -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 != '>' diff --git a/src/jalview/renderer/AnnotationRenderer.java b/src/jalview/renderer/AnnotationRenderer.java index 4c3711d..06014c5 100644 --- a/src/jalview/renderer/AnnotationRenderer.java +++ b/src/jalview/renderer/AnnotationRenderer.java @@ -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; -- 1.7.10.2