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-3750 parse protocol before checking if argument to -open can be opened as a file
[jalview.git]
/
src
/
jalview
/
bin
/
Jalview.java
diff --git
a/src/jalview/bin/Jalview.java
b/src/jalview/bin/Jalview.java
index
341bcba
..
613cc02
100755
(executable)
--- a/
src/jalview/bin/Jalview.java
+++ b/
src/jalview/bin/Jalview.java
@@
-451,7
+451,11
@@
public class Jalview
}
System.out.println("CMD [-open " + file + "] executed successfully!");
}
System.out.println("CMD [-open " + file + "] executed successfully!");
- if (!file.startsWith("http://"))
+
+
+ protocol = AppletFormatAdapter.checkProtocol(file);
+
+ if (protocol == DataSourceType.FILE)
{
if (!(new File(file)).exists())
{
{
if (!(new File(file)).exists())
{
@@
-463,8
+467,6
@@
public class Jalview
}
}
}
}
- protocol = AppletFormatAdapter.checkProtocol(file);
-
try
{
format = new IdentifyFile().identify(file, protocol);
try
{
format = new IdentifyFile().identify(file, protocol);