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-3446 from applet -- reload; also fixes some repaint issues
[jalview.git]
/
src
/
jalview
/
io
/
JPredFile.java
diff --git
a/src/jalview/io/JPredFile.java
b/src/jalview/io/JPredFile.java
index
026c879
..
6af92b7
100755
(executable)
--- a/
src/jalview/io/JPredFile.java
+++ b/
src/jalview/io/JPredFile.java
@@
-68,6
+68,8
@@
public class JPredFile extends AlignFile
/**
* Creates a new JPredFile object.
*
/**
* Creates a new JPredFile object.
*
+ * BH allows File or String
+ *
* @param inFile
* DOCUMENT ME!
* @param sourceType
* @param inFile
* DOCUMENT ME!
* @param sourceType
@@
-76,7
+78,7
@@
public class JPredFile extends AlignFile
* @throws IOException
* DOCUMENT ME!
*/
* @throws IOException
* DOCUMENT ME!
*/
- public JPredFile(String inFile, DataSourceType sourceType)
+ public JPredFile(Object inFile, DataSourceType sourceType)
throws IOException
{
super(inFile, sourceType);
throws IOException
{
super(inFile, sourceType);
@@
-207,7
+209,7
@@
public class JPredFile extends AlignFile
{
ascore = symbols.nextToken();
{
ascore = symbols.nextToken();
- Float score = new Float(ascore);
+ Float score = Float.valueOf(ascore);
scores.addElement(score);
}
scores.addElement(score);
}
@@
-283,7
+285,7
@@
public class JPredFile extends AlignFile
seq_entries.addElement(newseq.toString());
ids.addElement(id);
seq_entries.addElement(newseq.toString());
ids.addElement(id);
- Symscores.put(id, new Integer(ids.size() - 1));
+ Symscores.put(id, Integer.valueOf(ids.size() - 1));
}
}
}
}
}
}
@@
-361,10
+363,9
@@
public class JPredFile extends AlignFile
}
/**
}
/**
- * DOCUMENT ME!
*
* @param args
*
* @param args
- * DOCUMENT ME!
+ * @j2sIgnore
*/
public static void main(String[] args)
{
*/
public static void main(String[] args)
{