JAL-3628 Fixed oddly worded and non-formatted error popups when saving fails

[jalview.git] / src / jalview / gui / AlignFrame.java

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 79c67ac..99580ae 100644 (file)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -1170,7 +1170,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
 
       statusBar.setText(MessageManager.formatMessage(
               "label.successfully_saved_to_file_in_format", new Object[]
-              { fileName, format }));
+              { file, format }));
 
     }
     else
@@ -1204,12 +1204,13 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
 
         try
         {
-          Cache.log.debug("ALIGNFRAME setting PrintWriter");
-          PrintWriter out = new PrintWriter(
-                  new FileWriter(backupfiles.getTempFilePath()));
+          String tempFilePath = backupfiles.getTempFilePath();
+          Cache.log.debug(
+                  "ALIGNFRAME setting PrintWriter to " + tempFilePath);
+          PrintWriter out = new PrintWriter(new FileWriter(tempFilePath));
 
-          Cache.log.debug("ALIGNFRAME about to write to temp file "
-                  + backupfiles.getTempFilePath());
+          Cache.log.debug(
+                  "ALIGNFRAME about to write to temp file " + tempFilePath);
 
           out.print(output);
           Cache.log.debug("ALIGNFRAME about to close file");
@@ -1218,14 +1219,14 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
           this.setTitle(file);
           statusBar.setText(MessageManager.formatMessage(
                   "label.successfully_saved_to_file_in_format", new Object[]
-                  { fileName, format.getName() }));
+                  { file, format.getName() }));
         } catch (IOException e)
         {
           success = false;
           Cache.log.error(
                   "ALIGNFRAME Something happened writing the temp file");
           Cache.log.error(e.getMessage());
-          Cache.log.debug(e.getStackTrace());
+          Cache.log.debug(Cache.getStackTraceString(e));
 
         } catch (Exception ex)
         {
@@ -1233,7 +1234,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
           Cache.log.error(
                   "ALIGNFRAME Something else happened writing the temp file");
           Cache.log.error(ex.getMessage());
-          Cache.log.debug(ex.getStackTrace());
+          Cache.log.debug(Cache.getStackTraceString(ex));
         }
 
         backupfiles.setWriteSuccess(success);
@@ -1254,7 +1255,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
       {
         JvOptionPane.showInternalMessageDialog(this, MessageManager
                 .formatMessage("label.couldnt_save_file", new Object[]
-                { fileName }),
+                { file }),
                 MessageManager.getString("label.error_saving_file"),
                 JvOptionPane.WARNING_MESSAGE);
       }