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-1622 code tidy only, no functional change
[jalview.git]
/
src
/
jalview
/
io
/
FileLoader.java
diff --git
a/src/jalview/io/FileLoader.java
b/src/jalview/io/FileLoader.java
index
cd9258c
..
6329f58
100755
(executable)
--- a/
src/jalview/io/FileLoader.java
+++ b/
src/jalview/io/FileLoader.java
@@
-296,7
+296,7
@@
public class FileLoader implements Runnable
// open a new source and read from it
FormatAdapter fa = new FormatAdapter();
al = fa.readFile(file, protocol, format);
// open a new source and read from it
FormatAdapter fa = new FormatAdapter();
al = fa.readFile(file, protocol, format);
- source = fa.afile; // keep reference for later if necessary.
+ source = fa.getAlignFile(); // keep reference for later if necessary.
}
} catch (java.io.IOException ex)
{
}
} catch (java.io.IOException ex)
{
@@
-348,11
+348,11
@@
public class FileLoader implements Runnable
}
if (source instanceof HtmlFile)
{
}
if (source instanceof HtmlFile)
{
- ((HtmlFile) source).LoadAlignmentFeatures(alignFrame);
+ ((HtmlFile) source).applySettingsToAlignFrame(alignFrame);
}
else if (source instanceof JSONFile)
{
}
else if (source instanceof JSONFile)
{
- ((JSONFile) source).LoadAlignmentFeatures(alignFrame);
+ ((JSONFile) source).applySettingsToAlignFrame(alignFrame);
}
if (raiseGUI)
}
if (raiseGUI)