Merge branch 'develop' into update_212_Dec_merge_with_21125_chamges

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

diff --git a/src/jalview/io/BackupFiles.java b/src/jalview/io/BackupFiles.java
index 2039d3c..828bd0d 100644 (file)
--- a/src/jalview/io/BackupFiles.java
+++ b/src/jalview/io/BackupFiles.java
@@ -633,12 +633,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]);
@@ -662,14 +662,11 @@ 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
@@ -703,7 +700,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"),
@@ -806,7 +803,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"),