Merge branch 'develop' into features/JAL-2446NCList

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

diff --git a/src/jalview/io/JnetAnnotationMaker.java b/src/jalview/io/JnetAnnotationMaker.java
index 7764958..2a8a00f 100755 (executable)
--- a/src/jalview/io/JnetAnnotationMaker.java
+++ b/src/jalview/io/JnetAnnotationMaker.java
@@ -59,7 +59,7 @@ public class JnetAnnotationMaker
     // in the future we could search for the query
     // sequence in the alignment before calling this function.
     SequenceI seqRef = al.getSequenceAt(firstSeq);
-    int width = preds[0].getSequence().length;
+    int width = preds[0].getLength();
     int[] gapmap = al.getSequenceAt(firstSeq).gapMap();
     if ((delMap != null && delMap.length > width)
             || (delMap == null && gapmap.length != width))
@@ -68,8 +68,7 @@ public class JnetAnnotationMaker
               MessageManager
                       .formatMessage(
                               "exception.number_of_residues_in_query_sequence_differ_from_prediction",
-                              new String[]
-                              {
+                              new String[] {
                                   (delMap == null ? "" : MessageManager
                                           .getString("label.mapped")),
                                   al.getSequenceAt(firstSeq).getName(),
@@ -103,7 +102,7 @@ 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);
@@ -193,13 +192,13 @@ public class JnetAnnotationMaker
           if (id.equals("JNETCONF"))
           {
             annot = new AlignmentAnnotation(preds[i].getName(),
-                    "JNet Output", annotations, 0f, 10f,
+                    "JPred Output", annotations, 0f, 10f,
                     AlignmentAnnotation.BAR_GRAPH);
           }
           else
           {
             annot = new AlignmentAnnotation(preds[i].getName(),
-                    "JNet Output", annotations);
+                    "JPred Output", annotations);
           }
 
           if (seqRef != null)