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
Input Data...
[jalview.git]
/
src
/
jalview
/
bin
/
JalviewLite.java
diff --git
a/src/jalview/bin/JalviewLite.java
b/src/jalview/bin/JalviewLite.java
index
cd0b835
..
373e916
100755
(executable)
--- a/
src/jalview/bin/JalviewLite.java
+++ b/
src/jalview/bin/JalviewLite.java
@@
-329,7
+329,13
@@
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
+ if(param !=null && param.equalsIgnoreCase("true"))
\r
+ {
\r
+ currentAlignFrame.featureSettings_actionPerformed();
\r
}
\r
\r
param = getParameter("annotations");
\r
}
\r
\r
param = getParameter("annotations");
\r
@@
-338,7
+344,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