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-3436 fix for reload not reloading files
[jalview.git]
/
src
/
jalview
/
gui
/
AlignFrame.java
diff --git
a/src/jalview/gui/AlignFrame.java
b/src/jalview/gui/AlignFrame.java
index
0271506
..
0c25262
100644
(file)
--- a/
src/jalview/gui/AlignFrame.java
+++ b/
src/jalview/gui/AlignFrame.java
@@
-1053,6
+1053,7
@@
public class AlignFrame extends GAlignFrame
@Override
public void reload_actionPerformed(ActionEvent e)
{
@Override
public void reload_actionPerformed(ActionEvent e)
{
+ System.out.println("AlignFrame.reload " + fileName);
if (fileName != null)
{
// TODO: JAL-1108 - ensure all associated frames are closed regardless of
if (fileName != null)
{
// TODO: JAL-1108 - ensure all associated frames are closed regardless of
@@
-1084,7
+1085,9
@@
public class AlignFrame extends GAlignFrame
DataSourceType protocol = fileName.startsWith("http:")
? DataSourceType.URL
: DataSourceType.FILE;
DataSourceType protocol = fileName.startsWith("http:")
? DataSourceType.URL
: DataSourceType.FILE;
- loader.loadFile(viewport, fileName, protocol, currentFileFormat);
+ loader.loadFile(viewport,
+ (fileObject == null ? fileName : fileObject), protocol,
+ currentFileFormat);
}
else
{
}
else
{