git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
10eedfb
)
JAL-2465 Improvement to re-instate storing recently opened URLs for alignments loaded...
author
tcofoegbu
<tcnofoegbu@dundee.ac.uk>
Fri, 26 May 2017 14:27:16 +0000
(15:27 +0100)
committer
tcofoegbu
<tcnofoegbu@dundee.ac.uk>
Fri, 26 May 2017 14:27:16 +0000
(15:27 +0100)
src/jalview/io/FileLoader.java
patch
|
blob
|
history
diff --git
a/src/jalview/io/FileLoader.java
b/src/jalview/io/FileLoader.java
index
bd8bc53
..
b7629c4
100755
(executable)
--- a/
src/jalview/io/FileLoader.java
+++ b/
src/jalview/io/FileLoader.java
@@
-345,12
+345,16
@@
public class FileLoader implements Runnable
String tempStructureFileStr = createNamedJvTempFile(
urlLeafName, structExt);
UrlDownloadClient.download(file, tempStructureFileStr);
String tempStructureFileStr = createNamedJvTempFile(
urlLeafName, structExt);
UrlDownloadClient.download(file, tempStructureFileStr);
- file = tempStructureFileStr;
- protocol = DataSourceType.FILE;
+ al = fa.readFile(tempStructureFileStr, DataSourceType.FILE,
+ format);
+ source = fa.getAlignFile();
+ }
+ else
+ {
+ al = fa.readFile(file, protocol, format);
+ source = fa.getAlignFile(); // keep reference for later if
+ // necessary.
}
}
- al = fa.readFile(file, protocol, format);
- source = fa.getAlignFile(); // keep reference for later if
- // necessary.
}
} catch (java.io.IOException ex)
{
}
} catch (java.io.IOException ex)
{