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 commit 'alpha/update_2_12_for_2_11_2_series_merge^2' into HEAD
[jalview.git]
/
src
/
jalview
/
io
/
AppletFormatAdapter.java
diff --git
a/src/jalview/io/AppletFormatAdapter.java
b/src/jalview/io/AppletFormatAdapter.java
index
e9c9ce2
..
245984f
100755
(executable)
--- a/
src/jalview/io/AppletFormatAdapter.java
+++ b/
src/jalview/io/AppletFormatAdapter.java
@@
-160,11
+160,7
@@
public class AppletFormatAdapter
{
this.selectedFile = selectedFile;
{
this.selectedFile = selectedFile;
- if (selectedFile != null)
- {
- this.inFile = selectedFile.getPath();
- }
- this.inFile = file;
+ inFile = (selectedFile == null ? file : selectedFile.getPath());
try
{
if (fileFormat.isStructureFile())
try
{
if (fileFormat.isStructureFile())