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 'feature/JAL-3063jaxbNoCastor' into feature/JAL-3141_Create_a_backup_whe...
[jalview.git]
/
src
/
jalview
/
io
/
JalviewFileChooser.java
diff --git
a/src/jalview/io/JalviewFileChooser.java
b/src/jalview/io/JalviewFileChooser.java
index
90a3cc0
..
192948d
100755
(executable)
--- a/
src/jalview/io/JalviewFileChooser.java
+++ b/
src/jalview/io/JalviewFileChooser.java
@@
-336,10
+336,13
@@
public class JalviewFileChooser extends JFileChooser
setSelectedFile(ourselectedFile);
}
}
setSelectedFile(ourselectedFile);
}
}
+
// TODO: ENSURE THAT FILES SAVED WITH A ':' IN THE NAME ARE REFUSED AND THE
// TODO: ENSURE THAT FILES SAVED WITH A ':' IN THE NAME ARE REFUSED AND THE
- // USER PROMPTED FOR A NEW FILENAME
+ // USER PROMPTED FOR A NEW FILENAME.
+ // DO NOT need to confirm file overwrite if using backup files (the files
+ // aren't being overwritten!)
if ((ret == JalviewFileChooser.APPROVE_OPTION)
if ((ret == JalviewFileChooser.APPROVE_OPTION)
- && ourselectedFile.exists())
+ && ourselectedFile.exists() && (!BackupFiles.getEnabled()))
{
int confirm = JvOptionPane.showConfirmDialog(parent,
MessageManager.getString("label.overwrite_existing_file"),
{
int confirm = JvOptionPane.showConfirmDialog(parent,
MessageManager.getString("label.overwrite_existing_file"),
@@
-351,7
+354,6
@@
public class JalviewFileChooser extends JFileChooser
ret = JalviewFileChooser.CANCEL_OPTION;
}
ret = JalviewFileChooser.CANCEL_OPTION;
}
- // not happening here now rollBackupFiles(ourselectedFile);
}
return ret;
}
return ret;