Changeset 3132

Timestamp:

03/02/10 14:16:10 (5 months ago)

Author:

martijn

Message:

Make visualization writing more robust,
by reporting an error when it fails,
and by writing to a tempory file, then renaming that file

Location:

trunk

Files:

• plugins/visualization/org/pathvisio/visualization/gui/VisualizationDialog.java (modified) (2 diffs)
• src/swing/org/pathvisio/visualization/VisualizationManager.java (modified) (6 diffs)

trunk/plugins/visualization/org/pathvisio/visualization/gui/VisualizationDialog.java

@@ -20 +20 @@
 import java.awt.Frame;
 
+import javax.swing.JOptionPane;
 import javax.swing.JScrollPane;
 
+import org.pathvisio.debug.Logger;
 import org.pathvisio.gui.swing.dialogs.OkCancelDialog;
 import org.pathvisio.visualization.Visualization;
@@ -62 +64 @@
 
         protected void okPressed() {
-                visMgr.saveXML(); //Save the settings
+                try
+                {
+                        visMgr.saveXML(); //Save the settings
+                }
+                catch (Exception ex)
+                {
+                        Logger.log.error ("Couldn't save visualization", ex);
+                        JOptionPane.showMessageDialog(this,"Couldn't write modifications to disk.\n" + ex.getMessage() + 
+                                        "\nSee error log for details.",  
+                                        "Couldn't save visualization", JOptionPane.ERROR_MESSAGE);
+                }
                 super.okPressed();
         }

trunk/src/swing/org/pathvisio/visualization/VisualizationManager.java

@@ -279 +279 @@
         public static final String ROOT_XML_ELEMENT = "expression-data-visualizations";
 
-        public  InputStream getXmlInput()
+        private InputStream getXmlInput()
         {
                 File xmlFile = new File(gexManager.getCurrentGex().getDbName() + ".xml");
@@ -293 +293 @@
         }
 
-        public  OutputStream getXmlOutput() {
-                try {
-                        File f = new File(gexManager.getCurrentGex().getDbName() + ".xml");
-                        Logger.log.trace("Visualization settings will be saved to: " + f);
-                        OutputStream out = new FileOutputStream(f);
-                        return out;
-                } catch(Exception e) {
-                        Logger.log.error("Unable to create visualization settings file", e);
-                        return null;
-                }
-        }
-
-        public  void saveXML() {
+        public void saveXML() throws IOException
+        {
                 if(!gexManager.isConnected()) return;
 
-                OutputStream out = getXmlOutput();
+                // write to a temporary file, rename to final file after write was successful.
+                File finalFile = new File(gexManager.getCurrentGex().getDbName() + ".xml");
+                File tempFile = File.createTempFile(finalFile.getName(), ".tmp", finalFile.getParentFile());
+                OutputStream out = new FileOutputStream(tempFile);
 
                 Logger.log.trace("Saving visualizations and color sets to xml: " + out);
@@ -318 +310 @@
 
                 Element vis = new Element(XML_ELEMENT);
-
                 for(Visualization v : getVisualizations()) {
                         vis.addContent(v.toXML());
@@ -325 +316 @@
 
                 XMLOutputter xmlOut = new XMLOutputter(Format.getPrettyFormat());
-
-                try {
-                        xmlOut.output(xmlDoc, out);
-                        out.close();
-                } catch(IOException e) {
-                        Logger.log.error("Unable to save visualization settings", e);
-                }
+                xmlOut.output(xmlDoc, out);
+                out.close();
+
+                if (finalFile.exists()) finalFile.delete();
+                if (!tempFile.renameTo(finalFile)) throw new IOException ("Couldn't rename temporary file");
         }
 
@@ -369 +358 @@
                         doc = parser.build(in);
                         in.close();
-
                         root = doc.getRootElement();
                 } catch(Exception e) {
@@ -375 +363 @@
                         root = new Element(ROOT_XML_ELEMENT);
                         doc.setRootElement(root);
-
                 }
                 return doc;