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
Further tweaks to get tests passing
[jalview.git]
/
src
/
jalview
/
io
/
IdentifyFile.java
diff --git
a/src/jalview/io/IdentifyFile.java
b/src/jalview/io/IdentifyFile.java
index
89fc3cd
..
f8d8415
100755
(executable)
--- a/
src/jalview/io/IdentifyFile.java
+++ b/
src/jalview/io/IdentifyFile.java
@@
-30,8
+30,6
@@
import java.io.IOException;
*/
public class IdentifyFile
{
*/
public class IdentifyFile
{
- public static final String FeaturesFile = "GFF or Jalview features";
-
/**
* Identify a datasource's file content.
*
/**
* Identify a datasource's file content.
*
@@
-74,6
+72,13
@@
public class IdentifyFile
// preserves original behaviour prior to version 2.3
}
// preserves original behaviour prior to version 2.3
}
+ public FileFormatI identify(AlignmentFileI file, boolean closeSource)
+ throws IOException
+ {
+ FileParse fp = new FileParse(file.getInFile(), file.getDataSourceType());
+ return identify(fp, closeSource);
+ }
+
/**
* Identify contents of source, closing it or resetting source to start
* afterwards.
/**
* Identify contents of source, closing it or resetting source to start
* afterwards.
@@
-343,6
+348,7
@@
public class IdentifyFile
.println("File Identification failed! - Empty file was read.");
throw new FileFormatException("EMPTY DATA FILE");
}
.println("File Identification failed! - Empty file was read.");
throw new FileFormatException("EMPTY DATA FILE");
}
+ System.out.println("File format identified as " + reply.toString());
return reply;
}
return reply;
}