git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-1894 update year/version in copyright
[jalview.git]
/
src
/
jalview
/
io
/
JPredFile.java
diff --git
a/src/jalview/io/JPredFile.java
b/src/jalview/io/JPredFile.java
index
28f777f
..
591c37c
100755
(executable)
--- 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.9.0b1)
+ * Copyright (C) 2015 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
*
* 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.
*
* 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.
*/
/**
* PredFile.java
*/
/**
* PredFile.java
@@
-22,10
+25,16
@@
*/
package jalview.io;
*/
package jalview.io;
-import java.io.*;
-import java.util.*;
+import jalview.datamodel.Alignment;
+import jalview.datamodel.AlignmentAnnotation;
+import jalview.datamodel.Sequence;
+import jalview.datamodel.SequenceI;
+import jalview.util.MessageManager;
-import jalview.datamodel.*;
+import java.io.IOException;
+import java.util.Hashtable;
+import java.util.StringTokenizer;
+import java.util.Vector;
/**
* Parser for the JPred/JNet concise format. This is a series of CSV lines, each
/**
* Parser for the JPred/JNet concise format. This is a series of CSV lines, each
@@
-207,8
+216,8
@@
public class JPredFile extends AlignFile
for (int j = 0; j < i; j++)
{
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);
}
scores.addElement((Object) ascore);
@@
-290,14
+299,15
@@
public class JPredFile extends AlignFile
if (maxLength != seq_entries.elementAt(i).toString().length())
{
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()
}
if ((newSeq.getName().startsWith("QUERY") || newSeq.getName()
- .startsWith("align;"))
- && (QuerySeqPosition == -1))
+ .startsWith("align;")) && (QuerySeqPosition == -1))
{
QuerySeqPosition = seqs.size();
}
{
QuerySeqPosition = seqs.size();
}
@@
-318,8
+328,10
@@
public class JPredFile extends AlignFile
{
tal = null;
IOException ex = new IOException(
{
tal = null;
IOException ex = new IOException(
- "Couldn't parse concise annotation for prediction profile.\n"
- + e);
+ 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;
e.printStackTrace(); // java 1.1 does not have :
// ex.setStackTrace(e.getStackTrace());
throw ex;