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
EBI web service interface update (and SequenceFetcher bugfix)
[jalview.git]
/
src
/
jalview
/
bin
/
Jalview.java
diff --git
a/src/jalview/bin/Jalview.java
b/src/jalview/bin/Jalview.java
index
5bc98b1
..
1116fe4
100755
(executable)
--- a/
src/jalview/bin/Jalview.java
+++ b/
src/jalview/bin/Jalview.java
@@
-280,13
+280,15
@@
public class Jalview
\r
if (file.endsWith(".jar"))
\r
{
\r
\r
if (file.endsWith(".jar"))
\r
{
\r
- new Jalview2XML().LoadJalviewAlign(file);
\r
+ format = "Jalview";
\r
}
\r
else
\r
{
\r
format = new jalview.io.IdentifyFile().Identify(file, protocol);
\r
}
\r
else
\r
{
\r
format = new jalview.io.IdentifyFile().Identify(file, protocol);
\r
- new jalview.io.FileLoader().LoadFile(file, protocol, format);
\r
}
\r
}
\r
+
\r
+ fileLoader.LoadFile(file, protocol, format);
\r
+
\r
}
\r
}
\r
}
\r
}
\r
}
\r
}
\r