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 update_212_Dec_merge_with_21125_chamges
[jalview.git]
/
src
/
jalview
/
io
/
IdentifyFile.java
diff --git
a/src/jalview/io/IdentifyFile.java
b/src/jalview/io/IdentifyFile.java
index
3024039
..
c666bb0
100755
(executable)
--- a/
src/jalview/io/IdentifyFile.java
+++ b/
src/jalview/io/IdentifyFile.java
@@
-32,12
+32,14
@@
import java.io.IOException;
*/
public class IdentifyFile
{
*/
public class IdentifyFile
{
-
- public FileFormatI identify(Object file, DataSourceType protocol) throws FileFormatException
+
+ public FileFormatI identify(Object file, DataSourceType protocol)
+ throws FileFormatException
{
// BH 2018
{
// BH 2018
- return (file instanceof File ? identify((File) file, protocol) : identify((String) file, protocol));
-
+ return (file instanceof File ? identify((File) file, protocol)
+ : identify((String) file, protocol));
+
}
public FileFormatI identify(File file, DataSourceType sourceType)
}
public FileFormatI identify(File file, DataSourceType sourceType)
@@
-166,8
+168,8
@@
public class IdentifyFile
if (source.inFile != null)
{
String fileStr = source.inFile.getName();
if (source.inFile != null)
{
String fileStr = source.inFile.getName();
- if (fileStr.contains(".jar")
- || fileStr.contains(".zip") || fileStr.contains(".jvp"))
+ if (fileStr.contains(".jar") || fileStr.contains(".zip")
+ || fileStr.contains(".jvp"))
{
// possibly a Jalview archive (but check further)
reply = FileFormat.Jalview;
{
// possibly a Jalview archive (but check further)
reply = FileFormat.Jalview;
@@
-504,5
+506,4
@@
public class IdentifyFile
}
}
}
}
-
}
}