From: Ben Soares Date: Sun, 20 Jan 2019 00:03:26 +0000 (+0000) Subject: JAL-3141 Re-added some changes in Jalview2XML missed in the merge X-Git-Tag: Release_2_11_0~17^2~97^2~28 X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=d9a4775abc320c59c605b143c665ff0fede7783d JAL-3141 Re-added some changes in Jalview2XML missed in the merge --- diff --git a/src/jalview/project/Jalview2XML.java b/src/jalview/project/Jalview2XML.java index 9980e04..7b23c8d 100644 --- a/src/jalview/project/Jalview2XML.java +++ b/src/jalview/project/Jalview2XML.java @@ -551,24 +551,19 @@ public class Jalview2XML public void saveState(File statefile) { FileOutputStream fos = null; - // create backupfiles object and get new temp filename destination - BackupFiles backupfiles = new BackupFiles(statefile); try { - fos = new FileOutputStream(backupfiles.getTempFilePath()); + fos = new FileOutputStream(statefile); JarOutputStream jout = new JarOutputStream(fos); saveState(jout); fos.close(); - backupfiles.setWriteSuccess(true); - backupfiles.rollBackupsAndRenameTempFile(); } catch (Exception e) { - Cache.log.error("Couln't write Jalview state to " + statefile - + ". Temporary file is at: " + backupfiles.getTempFile(), e); + Cache.log.error("Couln't write Jalview state to " + statefile, e); // TODO: inform user of the problem - they need to know if their data was // not saved ! if (errorMessage == null) @@ -579,8 +574,7 @@ public class Jalview2XML else { errorMessage += "(Didn't write Jalview Archive to output file '" - + statefile + "\nTemporary file is at: " - + backupfiles.getTempFile() + ")"; + + statefile + ")"; } e.printStackTrace(); } finally