X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fio%2FAnnotationFile.java;h=d004c1af0dfb429f97414e3a878d053a4bbaaf62;hb=4f24ef0848cf3c43ba0467f31fce1baa5c57aad5;hp=e427605e5d2bad69e86a7463fab5ec6990f4e125;hpb=9922c9eec14599f6b141a8db8a3859cab7227ce0;p=jalview.git

diff --git a/src/jalview/io/AnnotationFile.java b/src/jalview/io/AnnotationFile.java
index e427605..d004c1a 100755
--- a/src/jalview/io/AnnotationFile.java
+++ b/src/jalview/io/AnnotationFile.java
@@ -63,17 +63,18 @@ public class AnnotationFile
       }
 
 
-      switch( row.graph )
+      if( row.graph == AlignmentAnnotation.NO_GRAPH)
       {
-        case AlignmentAnnotation.NO_GRAPH:
           text.append("NO_GRAPH\t");
-          break;
-        case AlignmentAnnotation.BAR_GRAPH:
+      }
+      else
+      {
+        if( row.graph == AlignmentAnnotation.BAR_GRAPH)
           text.append("BAR_GRAPH\t");
-        case AlignmentAnnotation.LINE_GRAPH:
+        else if(row.graph == AlignmentAnnotation.LINE_GRAPH)
           text.append("LINE_GRAPH\t");
 
-          if(row.getThreshold()!=null)
+        if(row.getThreshold()!=null)
             graphLine.append("GRAPHLINE\t"
                              + row.label + "\t"
                              + row.getThreshold().value + "\t"
@@ -321,8 +322,8 @@ public class AnnotationFile
       if(!parsedValue)
       {
         try{
-          value = new Float(token).floatValue();
           displayChar = token;
+          value = new Float(token).floatValue();
           parsedValue = true;
         }catch(NumberFormatException ex){}
       }
@@ -332,6 +333,8 @@ public class AnnotationFile
         // Either this character represents a helix or sheet
         // or an integer which can be displayed
         ss = token.charAt(0);
+        if(displayChar.equals(token.substring(0,1)))
+          displayChar = "";
       }
       else if(desc.length()<1)
         desc = token;