X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FJalviewFileChooser.java;h=192948d551356b25930de886bf65eb65af92e285;hb=ea976fa3d06c5fa75d9b89dafe5560dbae7fdb1d;hp=90a3cc07c7fbadd2c6d551ad9294727f7badaaa8;hpb=5b4f0b77909420cfb2fe2a4b9b9724abdacf025d;p=jalview.git diff --git a/src/jalview/io/JalviewFileChooser.java b/src/jalview/io/JalviewFileChooser.java index 90a3cc0..192948d 100755 --- a/src/jalview/io/JalviewFileChooser.java +++ b/src/jalview/io/JalviewFileChooser.java @@ -336,10 +336,13 @@ public class JalviewFileChooser extends JFileChooser setSelectedFile(ourselectedFile); } } + // 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) - && ourselectedFile.exists()) + && ourselectedFile.exists() && (!BackupFiles.getEnabled())) { int confirm = JvOptionPane.showConfirmDialog(parent, MessageManager.getString("label.overwrite_existing_file"), @@ -351,7 +354,6 @@ public class JalviewFileChooser extends JFileChooser ret = JalviewFileChooser.CANCEL_OPTION; } - // not happening here now rollBackupFiles(ourselectedFile); } return ret;