From: Ben Soares <bsoares@dundee.ac.uk>
Date: Fri, 22 Feb 2019 09:19:53 +0000 (+0000)
Subject: JAL-3141 improved message for asking whether to delete files (file modification time... 
X-Git-Tag: Release_2_11_0~17^2~97^2
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=92dc8d4272d82842b62132f21e543e38c97e150f

JAL-3141 improved message for asking whether to delete files (file modification time and size added to info to help user decide
---

diff --git a/resources/lang/Messages.properties b/resources/lang/Messages.properties
index d751266..4ad76a0 100644
--- a/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@ -1407,4 +1407,5 @@ label.newerdelete_line = Backup file\n''{0}''\t(modified {2}, size {4})\nis to b
 label.confirm_deletion = Confirm deletion of ''{0}''?
 label.delete = Delete
 label.rename = Rename
-label.keep = Keep
\ No newline at end of file
+label.keep = Keep
+label.file_info = (modified {0}, size {1})
\ No newline at end of file
diff --git a/resources/lang/Messages_es.properties b/resources/lang/Messages_es.properties
index ba50577..86f60f9 100644
--- a/resources/lang/Messages_es.properties
+++ b/resources/lang/Messages_es.properties
@@ -1408,4 +1408,5 @@ label.newerdelete_line = El archivo de respaldo\n''{0}''\t(modificado {2}, tama
 label.confirm_delete = Confirmar eliminar ''{0}''?
 label.delete = Borrar
 label.rename = Cambiar
-label.keep = Mantener
\ No newline at end of file
+label.keep = Mantener
+label.file_info = (modificado {0}, tamaño {1})
\ No newline at end of file
diff --git a/src/jalview/io/BackupFiles.java b/src/jalview/io/BackupFiles.java
index bd23a2d..dbda022 100644
--- a/src/jalview/io/BackupFiles.java
+++ b/src/jalview/io/BackupFiles.java
@@ -566,8 +566,7 @@ public class BackupFiles
     }
 
 
-    // return should be TRUE if file is to be deleted (added to the deleteFiles
-    // list)
+    // return should be TRUE if file is to be deleted
     return (confirmButton == JvOptionPane.YES_OPTION);
   }
 
@@ -587,6 +586,11 @@ public class BackupFiles
           File df = deleteFiles.get(i);
           messageSB.append("\n");
           messageSB.append(df.getName());
+          messageSB.append(" ");
+          messageSB.append(MessageManager.formatMessage("label.file_info",
+                  new String[]
+                  { sdf.format(df.lastModified()),
+                      Long.toString(df.length()) }));
         }
 
         int confirmButton = JvOptionPane.showConfirmDialog(Desktop.desktop,