X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FJnetAnnotationMaker.java;h=5c95a3faff1af687988c42a05b013df1ff2bf651;hb=e775f1627590b62ccad7cc5104667d347079497b;hp=d7e901e582e106897b3216b4155d3cd855619bdf;hpb=153dd62dc91da13ae732600e6ea55ddbe15eab39;p=jalview.git

diff --git a/src/jalview/io/JnetAnnotationMaker.java b/src/jalview/io/JnetAnnotationMaker.java
index d7e901e..5c95a3f 100755
--- a/src/jalview/io/JnetAnnotationMaker.java
+++ b/src/jalview/io/JnetAnnotationMaker.java
@@ -1,23 +1,27 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Copyright (C) 2014 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
  * Jalview is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- * 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
  * Jalview is distributed in the hope that it will be useful, but 
  * WITHOUT ANY WARRANTY; without even the implied warranty 
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
  * PURPOSE.  See the GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.io;
 
 import jalview.datamodel.*;
+import jalview.util.MessageManager;
 
 public class JnetAnnotationMaker
 {
@@ -57,13 +61,12 @@ public class JnetAnnotationMaker
     if ((delMap != null && delMap.length > width)
             || (delMap == null && gapmap.length != width))
     {
-      throw (new Exception("Number of residues in "
-              + (delMap == null ? "" : " mapped ")
-              + "supposed query sequence ('"
-              + al.getSequenceAt(firstSeq).getName() + "'\n"
-              + al.getSequenceAt(firstSeq).getSequenceAsString()
-              + ")\ndiffer from number of prediction sites in prediction ("
-              + 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()
+      })));
     }
 
     AlignmentAnnotation annot;
@@ -95,8 +98,8 @@ public class JnetAnnotationMaker
           {
             for (int j = 0; j < width; j++)
             {
-              annotations[gapmap[j]] = new Annotation("", "", preds[i]
-                      .getCharAt(j), 0);
+              annotations[gapmap[j]] = new Annotation("", "",
+                      preds[i].getCharAt(j), 0);
             }
           }
           else
@@ -126,9 +129,9 @@ public class JnetAnnotationMaker
             {
               float value = new Float(preds[i].getCharAt(j) + "")
                       .floatValue();
-              annotations[gapmap[delMap[j]]] = new Annotation(preds[i]
-                      .getCharAt(j)
-                      + "", "", preds[i].getCharAt(j), value);
+              annotations[gapmap[delMap[j]]] = new Annotation(
+                      preds[i].getCharAt(j) + "", "",
+                      preds[i].getCharAt(j), value);
             }
           }
         }
@@ -146,9 +149,8 @@ public class JnetAnnotationMaker
           {
             for (int j = 0; j < width; j++)
             {
-              annotations[gapmap[delMap[j]]] = new Annotation(preds[i]
-                      .getCharAt(j)
-                      + "", "", ' ', 0);
+              annotations[gapmap[delMap[j]]] = new Annotation(
+                      preds[i].getCharAt(j) + "", "", ' ', 0);
             }
           }
         }