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
Replaced image
[jalview.git]
/
src
/
jalview
/
bin
/
JalviewLite.java
diff --git
a/src/jalview/bin/JalviewLite.java
b/src/jalview/bin/JalviewLite.java
index
55d60a2
..
53d55f3
100755
(executable)
--- a/
src/jalview/bin/JalviewLite.java
+++ b/
src/jalview/bin/JalviewLite.java
@@
-295,7
+295,9
@@
public class JalviewLite extends Applet
currentAlignFrame.statusBar.setText("Successfully loaded file " + file);
\r
\r
\r
currentAlignFrame.statusBar.setText("Successfully loaded file " + file);
\r
\r
\r
- String treeFile = applet.getParameter("treeFile");
\r
+ String treeFile = applet.getParameter("tree");
\r
+ if(treeFile==null)
\r
+ applet.getParameter("treeFile");
\r
if (treeFile != null)
\r
{
\r
try
\r
if (treeFile != null)
\r
{
\r
try
\r
@@
-329,7
+331,7
@@
public class JalviewLite extends Applet
if( !inArchive(param) )
\r
param = addProtocol( param );
\r
\r
if( !inArchive(param) )
\r
param = addProtocol( param );
\r
\r
- currentAlignFrame.parseFeaturesFile(param);
\r
+ currentAlignFrame.parseFeaturesFile(param, protocol);
\r
}
\r
\r
param = getParameter("showFeatureSettings");
\r
}
\r
\r
param = getParameter("showFeatureSettings");
\r
@@
-344,7
+346,7
@@
public class JalviewLite extends Applet
if( !inArchive(param) )
\r
param = addProtocol( param );
\r
\r
if( !inArchive(param) )
\r
param = addProtocol( param );
\r
\r
- new AnnotationReader().readAnnotationFile(
\r
+ new AnnotationFile().readAnnotationFile(
\r
currentAlignFrame.viewport.getAlignment(),
\r
param);
\r
\r
currentAlignFrame.viewport.getAlignment(),
\r
param);
\r
\r