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
insignificant test file changes
[jalview.git]
/
src
/
jalview
/
io
/
BackupFiles.java
diff --git
a/src/jalview/io/BackupFiles.java
b/src/jalview/io/BackupFiles.java
index
bd23a2d
..
c697a99
100644
(file)
--- a/
src/jalview/io/BackupFiles.java
+++ b/
src/jalview/io/BackupFiles.java
@@
-4,6
+4,7
@@
import jalview.bin.Cache;
import jalview.gui.Desktop;
import jalview.gui.JvOptionPane;
import jalview.util.MessageManager;
import jalview.gui.Desktop;
import jalview.gui.JvOptionPane;
import jalview.util.MessageManager;
+import jalview.util.Platform;
import java.io.File;
import java.io.IOException;
import java.io.File;
import java.io.IOException;
@@
-144,7
+145,7
@@
public class BackupFiles
public static void classInit()
{
public static void classInit()
{
- setEnabled(Cache.getDefault(ENABLED, true));
+ setEnabled(Cache.getDefault(ENABLED, !Platform.isJS()));
setConfirmDelete(Cache.getDefault(CONFIRM_DELETE_OLD, true));
}
setConfirmDelete(Cache.getDefault(CONFIRM_DELETE_OLD, true));
}
@@
-538,7
+539,7
@@
public class BackupFiles
MessageManager.getString("label.delete"),
MessageManager.getString("label.rename") };
MessageManager.getString("label.delete"),
MessageManager.getString("label.rename") };
- confirmButton = JvOptionPane.showOptionDialog(Desktop.desktop,
+ confirmButton = JvOptionPane.showOptionDialog(Desktop.getDesktopPane(),
messageSB.toString(),
MessageManager.getString("label.backupfiles_confirm_delete"),
JvOptionPane.YES_NO_OPTION, JvOptionPane.WARNING_MESSAGE,
messageSB.toString(),
MessageManager.getString("label.backupfiles_confirm_delete"),
JvOptionPane.YES_NO_OPTION, JvOptionPane.WARNING_MESSAGE,
@@
-558,7
+559,7
@@
public class BackupFiles
MessageManager.getString("label.delete"),
MessageManager.getString("label.keep") };
MessageManager.getString("label.delete"),
MessageManager.getString("label.keep") };
- confirmButton = JvOptionPane.showOptionDialog(Desktop.desktop,
+ confirmButton = JvOptionPane.showOptionDialog(Desktop.getDesktopPane(),
messageSB.toString(),
MessageManager.getString("label.backupfiles_confirm_delete"),
JvOptionPane.YES_NO_OPTION, JvOptionPane.WARNING_MESSAGE,
messageSB.toString(),
MessageManager.getString("label.backupfiles_confirm_delete"),
JvOptionPane.YES_NO_OPTION, JvOptionPane.WARNING_MESSAGE,
@@
-566,8
+567,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);
}
return (confirmButton == JvOptionPane.YES_OPTION);
}
@@
-587,9
+587,14
@@
public class BackupFiles
File df = deleteFiles.get(i);
messageSB.append("\n");
messageSB.append(df.getName());
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,
+ int confirmButton = JvOptionPane.showConfirmDialog(Desktop.getDesktopPane(),
messageSB.toString(),
MessageManager
.getString("label.backupfiles_confirm_delete"),
messageSB.toString(),
MessageManager
.getString("label.backupfiles_confirm_delete"),
@@
-678,7
+683,7
@@
public class BackupFiles
"label.backupfiles_confirm_save_new_saved_file_not_ok"));
}
"label.backupfiles_confirm_save_new_saved_file_not_ok"));
}
- int confirmButton = JvOptionPane.showConfirmDialog(Desktop.desktop,
+ int confirmButton = JvOptionPane.showConfirmDialog(Desktop.getDesktopPane(),
messageSB.toString(),
MessageManager
.getString("label.backupfiles_confirm_save_file"),
messageSB.toString(),
MessageManager
.getString("label.backupfiles_confirm_save_file"),