git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ea976fa
)
JAL-3141 Re-added some changes in Jalview2XML missed in the merge
author
Ben Soares
<bsoares@dundee.ac.uk>
Sun, 20 Jan 2019 00:03:26 +0000
(
00:03
+0000)
committer
Ben Soares
<bsoares@dundee.ac.uk>
Sun, 20 Jan 2019 00:03:26 +0000
(
00:03
+0000)
src/jalview/project/Jalview2XML.java
patch
|
blob
|
history
diff --git
a/src/jalview/project/Jalview2XML.java
b/src/jalview/project/Jalview2XML.java
index
9980e04
..
7b23c8d
100644
(file)
--- 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;
public void saveState(File statefile)
{
FileOutputStream fos = null;
- // create backupfiles object and get new temp filename destination
- BackupFiles backupfiles = new BackupFiles(statefile);
try
{
try
{
- fos = new FileOutputStream(backupfiles.getTempFilePath());
+ fos = new FileOutputStream(statefile);
JarOutputStream jout = new JarOutputStream(fos);
saveState(jout);
fos.close();
JarOutputStream jout = new JarOutputStream(fos);
saveState(jout);
fos.close();
- backupfiles.setWriteSuccess(true);
- backupfiles.rollBackupsAndRenameTempFile();
} catch (Exception e)
{
} 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)
// 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 '"
else
{
errorMessage += "(Didn't write Jalview Archive to output file '"
- + statefile + "\nTemporary file is at: "
- + backupfiles.getTempFile() + ")";
+ + statefile + ")";
}
e.printStackTrace();
} finally
}
e.printStackTrace();
} finally