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
Merge branch 'develop' into trialMerge
[jalview.git]
/
src
/
jalview
/
io
/
FeaturesFile.java
diff --git
a/src/jalview/io/FeaturesFile.java
b/src/jalview/io/FeaturesFile.java
index
12ad0d4
..
d51da33
100755
(executable)
--- a/
src/jalview/io/FeaturesFile.java
+++ b/
src/jalview/io/FeaturesFile.java
@@
-105,11
+105,11
@@
public class FeaturesFile extends AlignFile implements FeaturesSourceI
/**
* Constructor which does not parse the file immediately
*
/**
* Constructor which does not parse the file immediately
*
- * @param file
+ * @param file File or String filename
* @param paste
* @throws IOException
*/
* @param paste
* @throws IOException
*/
- public FeaturesFile(String file, DataSourceType paste)
+ public FeaturesFile(Object file, DataSourceType paste)
throws IOException
{
super(false, file, paste);
throws IOException
{
super(false, file, paste);
@@
-132,7
+132,7
@@
public class FeaturesFile extends AlignFile implements FeaturesSourceI
* @param type
* @throws IOException
*/
* @param type
* @throws IOException
*/
- public FeaturesFile(boolean parseImmediately, String file,
+ public FeaturesFile(boolean parseImmediately, Object file,
DataSourceType type) throws IOException
{
super(parseImmediately, file, type);
DataSourceType type) throws IOException
{
super(parseImmediately, file, type);