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 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git...
[jalview.git]
/
src
/
jalview
/
io
/
FeaturesFile.java
diff --git
a/src/jalview/io/FeaturesFile.java
b/src/jalview/io/FeaturesFile.java
index
99663c8
..
0b46197
100755
(executable)
--- a/
src/jalview/io/FeaturesFile.java
+++ b/
src/jalview/io/FeaturesFile.java
@@
-84,8
+84,6
@@
public class FeaturesFile extends AlignFile implements FeaturesSourceI
private static final String NOTE = "Note";
private static final String NOTE = "Note";
- protected static final String TAB = "\t";
-
protected static final String GFF_VERSION = "##gff-version";
private AlignmentI lastmatchedAl = null;
protected static final String GFF_VERSION = "##gff-version";
private AlignmentI lastmatchedAl = null;
@@
-106,11
+104,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);
@@
-133,7
+131,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);