All or nothing drawing display char

[jalview.git] / src / jalview / io / AnnotationReader.java

diff --git a/src/jalview/io/AnnotationReader.java b/src/jalview/io/AnnotationReader.java
index d42167a..cd7abfd 100755 (executable)
--- a/src/jalview/io/AnnotationReader.java
+++ b/src/jalview/io/AnnotationReader.java
@@ -170,6 +170,7 @@ public class AnnotationReader
     String desc = "", displayChar="";\r
     char ss = ' '; // secondaryStructure\r
     float value = 0;\r
+    boolean parsedValue = false;\r
     StringTokenizer st = new StringTokenizer(string, ",");\r
     String token;\r
     while(st.hasMoreTokens())\r
@@ -178,29 +179,24 @@ public class AnnotationReader
       if(token.length()==0)\r
         continue;\r
 \r
-      if(value==0)\r
-      {  try{\r
-          value =  new Float(token).floatValue();\r
+      if(!parsedValue)\r
+      {\r
+        try{\r
+          value = new Float(token).floatValue();\r
+          displayChar = token;\r
+          parsedValue = true;\r
         }catch(NumberFormatException ex){}\r
       }\r
 \r
-      if(token.length()==1)\r
+      if(token.equals("H") || token.equals("E"))\r
       {\r
         // Either this character represents a helix or sheet\r
         // or an integer which can be displayed\r
-        if(token.equals("H") || token.equals("E"))\r
-        {\r
-          ss = token.charAt(0);\r
-        }\r
-        else //if(value!=0)\r
-        {\r
-          displayChar = token;\r
-        }\r
+        ss = token.charAt(0);\r
       }\r
       else if(desc.length()<1)\r
         desc = token;\r
-      else\r
-        displayChar = token;\r
+\r
     }\r
 \r
     return new Annotation(displayChar, desc, ss, value);\r