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-1424 streamlined message checker, corrected applet lookup keys
[jalview.git]
/
src
/
jalview
/
io
/
IdentifyFile.java
diff --git
a/src/jalview/io/IdentifyFile.java
b/src/jalview/io/IdentifyFile.java
index
8fa76ec
..
b312474
100755
(executable)
--- a/
src/jalview/io/IdentifyFile.java
+++ b/
src/jalview/io/IdentifyFile.java
@@
-165,16
+165,16
@@
public class IdentifyFile
if (source.inFile != null)
{
String fileStr = source.inFile.getName();
if (source.inFile != null)
{
String fileStr = source.inFile.getName();
- // possibly a Jalview archive.
- if (fileStr.lastIndexOf(".jar") > -1
- || fileStr.lastIndexOf(".zip") > -1)
+ if (fileStr.contains(".jar")
+ || fileStr.contains(".zip") || fileStr.contains(".jvp"))
{
{
+ // possibly a Jalview archive (but check further)
reply = FileFormat.Jalview;
}
}
if (!lineswereskipped && data.startsWith("PK"))
{
reply = FileFormat.Jalview;
}
}
if (!lineswereskipped && data.startsWith("PK"))
{
- reply = FileFormat.Jalview; // archive.
+ reply = FileFormat.Jalview; // archive
break;
}
}
break;
}
}
@@
-452,6
+452,11
@@
public class IdentifyFile
return true;
}
return true;
}
+ /**
+ *
+ * @param args
+ * @j2sIgnore
+ */
public static void main(String[] args)
{
for (int i = 0; args != null && i < args.length; i++)
public static void main(String[] args)
{
for (int i = 0; args != null && i < args.length; i++)