JAL-2599 .hmm parser should now accept older .hmm files

diff --git a/src/jalview/io/HMMFile.java b/src/jalview/io/HMMFile.java
index a7a0a0c..95e2017 100644 (file)
--- a/src/jalview/io/HMMFile.java
+++ b/src/jalview/io/HMMFile.java
@@ -249,25 +249,36 @@ public class HMMFile extends AlignFile
       scanner.next();
     }
 
-    char consensusR;
-    consensusR = charValue(scanner.next());
-    hmm.getNodes().get(index).setConsensusResidue(consensusR);
+    if (scanner.hasNext())
+    {
+      char consensusR;
+      consensusR = charValue(scanner.next());
+      hmm.getNodes().get(index).setConsensusResidue(consensusR);
+    }
 
+    if (scanner.hasNext())
+    {
       char reference;
       reference = charValue(scanner.next());
       hmm.getNodes().get(index).setReferenceAnnotation(reference);
+    }
 
-
+    if (scanner.hasNext())
+    {
       char value;
       value = charValue(scanner.next());
       hmm.getNodes().get(index).setMaskValue(value);
-
-    char consensusS;
-    consensusS = charValue(scanner.next());
-    hmm.getNodes().get(index).setConsensusStructure(consensusS);
+    }
+    if (scanner.hasNext())
+    {
+      char consensusS;
+      consensusS = charValue(scanner.next());
+      hmm.getNodes().get(index).setConsensusStructure(consensusS);
+    }
   }
 
 
+
   /**
    * Fills a list of doubles based on an input line.
    *