JAL-1483 cut and paste from SW score model to allow scores based on sequences to...

[jalview.git] / src / jalview / ws / jws2 / RNAalifoldClient.java

diff --git a/src/jalview/ws/jws2/RNAalifoldClient.java b/src/jalview/ws/jws2/RNAalifoldClient.java
index ec40552..c7d8efd 100644 (file)
--- a/src/jalview/ws/jws2/RNAalifoldClient.java
+++ b/src/jalview/ws/jws2/RNAalifoldClient.java
@@ -198,7 +198,7 @@ public class RNAalifoldClient extends JabawsAlignCalcWorker implements
   private AlignmentAnnotation constructAnnotationFromScoreHolder(
           AlignmentAnnotation annotation, String struct, TreeSet<Score> data)
   {
-    Annotation[] anns = new Annotation[struct.length()];
+    Annotation[] anns = new Annotation[gapMap!= null ? gapMap.length+1 : struct.length()];
 
     if (data != null
             && data.size() > 1
@@ -261,10 +261,14 @@ public class RNAalifoldClient extends JabawsAlignCalcWorker implements
         if (gapMap!=null)
         {
           // skip any gapped columns in the input data
-          while (!gapMap[ri])
+          while (!gapMap[ri] && ri<gapMap.length)
           {
             ri++;
           }
+          if (ri==gapMap.length)
+          {
+            break;
+          }
         }
         anns[ri] = new Annotation(struct.substring(i, i + 1), "",
                 isSS(struct.charAt(i)), Float.NaN);