X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FJnetAnnotationMaker.java;h=c9f1fcf7defd1489d50188909e1b785a63f154af;hb=7047b076a62df177047ceb16c3611efe020bdd76;hp=f97cd9661aa164e2deccedcb96b1db16865bc012;hpb=919d9bab3912813d1032e10265b59b5b83a693aa;p=jalview.git
diff --git a/src/jalview/io/JnetAnnotationMaker.java b/src/jalview/io/JnetAnnotationMaker.java
index f97cd96..c9f1fcf 100755
--- a/src/jalview/io/JnetAnnotationMaker.java
+++ b/src/jalview/io/JnetAnnotationMaker.java
@@ -59,17 +59,19 @@ 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))
{
- throw (new Exception(MessageManager.formatMessage("exception.number_of_residues_in_query_sequence_differ_from_prediction", new String[]{
- (delMap == null ? "" : MessageManager.getString("label.mapped")),
- al.getSequenceAt(firstSeq).getName(),
- al.getSequenceAt(firstSeq).getSequenceAsString(),
- Integer.valueOf(width).toString()
- })));
+ throw (new Exception(MessageManager.formatMessage(
+ "exception.number_of_residues_in_query_sequence_differ_from_prediction",
+ new String[]
+ { (delMap == null ? ""
+ : MessageManager.getString("label.mapped")),
+ al.getSequenceAt(firstSeq).getName(),
+ al.getSequenceAt(firstSeq).getSequenceAsString(),
+ Integer.valueOf(width).toString() })));
}
AlignmentAnnotation annot;
@@ -93,17 +95,18 @@ public class JnetAnnotationMaker
{
if (id.startsWith("JNETSOL"))
{
- float amnt = (id.endsWith("25") ? 3f : id.endsWith("5") ? 6f : 9f);
+ float amnt = (id.endsWith("25") ? 3f
+ : id.endsWith("5") ? 6f : 9f);
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;
}
@@ -187,13 +190,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)
@@ -217,8 +220,7 @@ public class JnetAnnotationMaker
if (!firstsol)
{
// add the solvent accessibility
- annot = new AlignmentAnnotation(
- "Jnet Burial",
+ annot = new AlignmentAnnotation("Jnet Burial",
"Prediction of Solvent Accessibility
levels are