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
Merge branch 'features/JAL-1605_html-svg-export' into develop
[jalview.git]
/
src
/
jalview
/
io
/
FileLoader.java
diff --git
a/src/jalview/io/FileLoader.java
b/src/jalview/io/FileLoader.java
index
82b94c3
..
833f590
100755
(executable)
--- a/
src/jalview/io/FileLoader.java
+++ b/
src/jalview/io/FileLoader.java
@@
-152,6
+152,7
@@
public class FileLoader implements Runnable
public AlignFrame LoadFileWaitTillLoaded(FileParse source, String format)
{
this.source = source;
public AlignFrame LoadFileWaitTillLoaded(FileParse source, String format)
{
this.source = source;
+
file = source.getInFile();
protocol = source.type;
this.format = format;
file = source.getInFile();
protocol = source.type;
this.format = format;
@@
-352,6
+353,11
@@
public class FileLoader implements Runnable
{
alignFrame.setFileName(file, format);
}
{
alignFrame.setFileName(file, format);
}
+ if (source instanceof HtmlFile)
+ {
+ ((HtmlFile) source).LoadAlignmentFeatures(alignFrame);
+
+ }
if (raiseGUI)
{
// add the window to the GUI
if (raiseGUI)
{
// add the window to the GUI