Merge branch 'features/JAL-1641_JSON_' into develop

diff --git a/src/jalview/io/JnetAnnotationMaker.java b/src/jalview/io/JnetAnnotationMaker.java
index c5320f1..e944720 100755 (executable)
--- a/src/jalview/io/JnetAnnotationMaker.java
+++ b/src/jalview/io/JnetAnnotationMaker.java
@@ -103,13 +103,13 @@ public class JnetAnnotationMaker
           for (int spos = 0; spos < width; spos++)
           {
             int sposw = (delMap == null) ? gapmap[spos]
-                    : delMap[gapmap[spos]];
+                    : gapmap[delMap[spos]];
             if (firstsol)
             {
               sol[sposw] = new Annotation(0f);
             }
             if (preds[i].getCharAt(spos) == 'B'
-                    && (sol[spos].value == 0f || sol[spos].value < amnt))
+                    && (sol[sposw].value == 0f || sol[sposw].value < amnt))
             {
               sol[sposw].value = amnt;
             }