Merge branch 'develop' into spike/JAL-4047/JAL-4048_columns_in_sequenceID

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

diff --git a/src/jalview/io/ClustalFile.java b/src/jalview/io/ClustalFile.java
index a37afd9..a71e6e8 100755 (executable)
--- a/src/jalview/io/ClustalFile.java
+++ b/src/jalview/io/ClustalFile.java
@@ -77,7 +77,9 @@ public class ClustalFile extends AlignFile
         {
           top = true;
         }
-        if (line.indexOf(" ") != 0)
+        boolean isConservation = line.startsWith(SPACE)
+                || line.startsWith(TAB);
+        if (!isConservation)
         {
           str = new StringTokenizer(line);
 
@@ -138,7 +140,7 @@ public class ClustalFile extends AlignFile
       }
     } catch (IOException e)
     {
-      System.err.println("Exception parsing clustal file " + e);
+      jalview.bin.Console.errPrintln("Exception parsing clustal file " + e);
       e.printStackTrace();
     }
 
@@ -166,7 +168,7 @@ public class ClustalFile extends AlignFile
         }
         else
         {
-          System.err.println("Clustal File Reader: Can't find sequence for "
+          jalview.bin.Console.errPrintln("Clustal File Reader: Can't find sequence for "
                   + headers.elementAt(i));
         }
       }