X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fio%2FJPredFile.java;h=ca74f2c426f9da50fdfa9768bdabcca8f4af2f8f;hb=9d139ca8d1af8f0f2d78193d418ae9e9168a3e8a;hp=28f777f7ef841f696ad6a4f31ea42fd3dfd5f15c;hpb=d423f22792e47dbc800ae220a58677f988971d06;p=jalview.git
diff --git a/src/jalview/io/JPredFile.java b/src/jalview/io/JPredFile.java
index 28f777f..ca74f2c 100755
--- a/src/jalview/io/JPredFile.java
+++ b/src/jalview/io/JPredFile.java
@@ -1,19 +1,22 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
- * 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 .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
/**
* PredFile.java
@@ -26,6 +29,7 @@ import java.io.*;
import java.util.*;
import jalview.datamodel.*;
+import jalview.util.MessageManager;
/**
* Parser for the JPred/JNet concise format. This is a series of CSV lines, each
@@ -207,8 +211,8 @@ public class JPredFile extends AlignFile
for (int j = 0; j < i; j++)
{
- scores.setElementAt((Object) ((Float) scores.elementAt(j))
- .toString(), j);
+ scores.setElementAt(
+ (Object) ((Float) scores.elementAt(j)).toString(), j);
}
scores.addElement((Object) ascore);
@@ -290,14 +294,11 @@ public class JPredFile extends AlignFile
if (maxLength != seq_entries.elementAt(i).toString().length())
{
- throw new IOException("JPredConcise: Entry ("
- + ids.elementAt(i).toString()
- + ") has an unexpected number of columns");
+ throw new IOException(MessageManager.formatMessage("exception.jpredconcide_entry_has_unexpected_number_of_columns", new String[]{ids.elementAt(i).toString()}));
}
if ((newSeq.getName().startsWith("QUERY") || newSeq.getName()
- .startsWith("align;"))
- && (QuerySeqPosition == -1))
+ .startsWith("align;")) && (QuerySeqPosition == -1))
{
QuerySeqPosition = seqs.size();
}
@@ -317,9 +318,7 @@ public class JPredFile extends AlignFile
} catch (Exception e)
{
tal = null;
- IOException ex = new IOException(
- "Couldn't parse concise annotation for prediction profile.\n"
- + e);
+ IOException ex = new IOException(MessageManager.formatMessage("exception.couldnt_parse_concise_annotation_for_prediction", new String[]{e.getMessage()}));
e.printStackTrace(); // java 1.1 does not have :
// ex.setStackTrace(e.getStackTrace());
throw ex;