Merge commit 'alpha/update_2_12_for_2_11_2_series_merge^2' into HEAD

[jalview.git] / src / jalview / io / BackupFiles.java

diff --git a/src/jalview/io/BackupFiles.java b/src/jalview/io/BackupFiles.java
index 2b6147f..c8d1359 100644 (file)
--- a/src/jalview/io/BackupFiles.java
+++ b/src/jalview/io/BackupFiles.java
@@ -20,6 +20,7 @@
  */
 package jalview.io;
 
+
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -37,7 +38,6 @@ import jalview.gui.Desktop;
 import jalview.gui.JvOptionPane;
 import jalview.util.MessageManager;
 import jalview.util.Platform;
-
 /*
  * BackupFiles used for manipulating (naming rolling/deleting) backup/version files when an alignment or project file is saved.
  * User configurable options are:
@@ -103,7 +103,6 @@ public class BackupFiles
   private static final String newTempFileSuffix = "_newfile";
 
   private static final String oldTempFileSuffix = "_oldfile_tobedeleted";
-
   public BackupFiles(String filename)
   {
     this(new File(filename));
@@ -262,7 +261,6 @@ public class BackupFiles
     }
 
     Cache.trace("BACKUPFILES rollBackupFiles starting");
-
     String dir = "";
     File dirFile;
     try
@@ -310,6 +308,7 @@ public class BackupFiles
       if (reverseOrder)
       {
         // backup style numbering
+
         Cache.trace("BACKUPFILES rolling files in reverse order");
 
         int tempMax = noMax ? -1 : max;
@@ -327,7 +326,6 @@ public class BackupFiles
             tempMax = i;
           }
         }
-
         File previousFile = null;
         File fileToBeDeleted = null;
         for (int n = tempMax; n > 0; n--)
@@ -362,7 +360,6 @@ public class BackupFiles
             {
               File oldestTempFile = nextTempFile(fileToBeDeleted.getName(),
                       dirFile);
-
               if (fileToBeDeletedLMT > replacementFileLMT)
               {
                 String fileToBeDeletedLMTString = sdf
@@ -484,7 +481,6 @@ public class BackupFiles
             boolean delete = true;
 
             Cache.trace("BACKUPFILES fileToBeDeleted: " + fileToBeDeleted);
-
             boolean newer = false;
             if (replacementFile != null)
             {
@@ -552,6 +548,7 @@ public class BackupFiles
     ret = ret & moveFileToFile(file, new File(latestBackupFilename));
     Cache.debug("BACKUPFILES moving " + file + " to " + latestBackupFilename
             + " was " + (ret ? "" : "NOT ") + "successful");
+
     if (tidyUp)
     {
       Cache.debug("BACKUPFILES tidying up files");
@@ -630,12 +627,12 @@ public class BackupFiles
           MessageManager.getString("label.delete"),
           MessageManager.getString("label.rename") };
 
+      // TODO enable JvOptionPane to behave appropriately when batch/headless
       confirmButton = Platform.isHeadless() ? JvOptionPane.YES_OPTION
-              : JvOptionPane.showOptionDialog(Desktop.desktop,
+              : JvOptionPane.showOptionDialog(Desktop.getDesktopPane(),
                       messageSB.toString(),
                       MessageManager.getString(
                               "label.backupfiles_confirm_delete"),
-                      // "Confirm delete"
                       JvOptionPane.YES_NO_OPTION,
                       JvOptionPane.WARNING_MESSAGE, null, options,
                       options[0]);
@@ -659,16 +656,14 @@ public class BackupFiles
           MessageManager.getString("label.keep") };
 
       confirmButton = Platform.isHeadless() ? JvOptionPane.YES_OPTION
-              : JvOptionPane.showOptionDialog(Desktop.desktop,
-                      messageSB.toString(),
-                      MessageManager.getString(
-                              "label.backupfiles_confirm_delete"),
-                      // "Confirm delete"
-                      JvOptionPane.YES_NO_OPTION,
-                      JvOptionPane.WARNING_MESSAGE, null, options,
-                      options[0]);
+              : JvOptionPane.showOptionDialog(Desktop.getDesktopPane(),
+              messageSB.toString(),
+              MessageManager.getString("label.backupfiles_confirm_delete"),
+              JvOptionPane.YES_NO_OPTION, JvOptionPane.WARNING_MESSAGE,
+              null, options, options[0]);
     }
 
+
     // return should be TRUE if file is to be deleted
     return (confirmButton == JvOptionPane.YES_OPTION);
   }
@@ -700,7 +695,7 @@ public class BackupFiles
         }
 
         int confirmButton = Platform.isHeadless() ? JvOptionPane.YES_OPTION
-                : JvOptionPane.showConfirmDialog(Desktop.desktop,
+                : JvOptionPane.showConfirmDialog(Desktop.getDesktopPane(),
                         messageSB.toString(),
                         MessageManager.getString(
                                 "label.backupfiles_confirm_delete"),
@@ -803,7 +798,7 @@ public class BackupFiles
               .append(MessageManager.getString("label.continue_operation"));
 
       int confirmButton = Platform.isHeadless() ? JvOptionPane.OK_OPTION
-              : JvOptionPane.showConfirmDialog(Desktop.desktop,
+              : JvOptionPane.showConfirmDialog(Desktop.getDesktopPane(),
                       messageSB.toString(),
                       MessageManager.getString(
                               "label.backupfiles_confirm_save_file"),