Cache.log
.error("Could not create temp file to save to (IOException)");
Cache.log.error(e.getMessage());
- Cache.log.debug(e.getStackTrace());
+ Cache.log.debug(Cache.getStackTraceString(e));
} catch (Exception e)
{
Cache.log.error("Exception ctreating temp file for saving");
- Cache.log.debug(e.getStackTrace());
+ Cache.log.debug(Cache.getStackTraceString(e));
}
this.setTempFile(temp);
}
Cache.log.error(
"IOException when getting Canonical Path of temp file '"
+ this.getTempFile().getName() + "'");
- Cache.log.debug(e.getStackTrace());
+ Cache.log.debug(Cache.getStackTraceString(e));
}
return path;
}
Cache.log.error(
"Could not get canonical path for file '" + file + "'");
Cache.log.error(e.getMessage());
- Cache.log.debug(e.getStackTrace());
+ Cache.log.debug(Cache.getStackTraceString(e));
return false;
}
String filename = file.getName();
Cache.log.error(
"Error occurred, probably making new temp file for '"
+ fileToBeDeleted.getName() + "'");
- Cache.log.error(e.getStackTrace());
+ Cache.log.error(Cache.getStackTraceString(e));
}
// reset
{
if (previousFile != null)
{
- ret = ret && moveFileToFile(backupfile_n, previousFile);
+ // using boolean '&' instead of '&&' as don't want moveFileToFile
+ // attempt to be conditional (short-circuit)
+ ret = ret & moveFileToFile(backupfile_n, previousFile);
}
}
suffix, digits);
Cache.log.debug("BACKUPFILES Moving old file [" + file
+ "] to latestBackupFilename [" + latestBackupFilename + "]");
- ret |= moveFileToFile(file, new File(latestBackupFilename));
+ // using boolean '&' instead of '&&' as don't want moveFileToFile attempt to
+ // be conditional (short-circuit)
+ ret = ret & moveFileToFile(file, new File(latestBackupFilename));
Cache.log.debug(
"BACKUPFILES moving " + file + " to " + latestBackupFilename
+ " was " + (ret ? "" : "NOT ") + "successful");
boolean okay = roll && rename;
if (!okay)
{
- boolean yesno = false;
StringBuilder messageSB = new StringBuilder();
messageSB.append(MessageManager.getString(
"label.backupfiles_confirm_save_file_backupfiles_roll_wrong"));
"label.backupfiles_confirm_save_new_saved_file_not_ok"));
// "The new saved file might not be okay."
}
+ if (messageSB.length() > 0)
+ {
+ messageSB.append("\n");
+ }
+ messageSB
+ .append(MessageManager.getString("label.continue_operation"));
int confirmButton = Platform.isHeadless() ? JvOptionPane.OK_OPTION
: JvOptionPane.showConfirmDialog(Desktop.desktop,
Cache.log.warn("Could not move file '" + oldPath.toString() + "' to '"
+ newPath.toString() + "'");
Cache.log.error(e.getMessage());
- Cache.log.debug(e.getStackTrace());
+ Cache.log.debug(Cache.getStackTraceString(e));
ret = false;
} catch (Exception e)
{
Cache.log.error(e.getMessage());
- Cache.log.debug(e.getStackTrace());
+ Cache.log.debug(Cache.getStackTraceString(e));
ret = false;
}
return ret;