JAL-2089 patch broken merge to master for Release 2.10.0b1

[jalview.git] / src / jalview / io / HtmlSvgOutput.java

diff --git a/src/jalview/io/HtmlSvgOutput.java b/src/jalview/io/HtmlSvgOutput.java
index c9deb85..68173ff 100644 (file)
--- a/src/jalview/io/HtmlSvgOutput.java
+++ b/src/jalview/io/HtmlSvgOutput.java
@@ -57,7 +57,6 @@ public class HtmlSvgOutput
 
   private boolean headless;
 
-
   public HtmlSvgOutput(File file, AlignmentPanel ap)
   {
     this.av = ap.av;
@@ -100,7 +99,10 @@ public class HtmlSvgOutput
       }
     } catch (Exception e)
     {
+      pIndicator.setProgressBar(MessageManager.formatMessage(
+              "info.error_creating_file", "HTML"), pSessionId);
       e.printStackTrace();
+      return;
     }
     final File fileX = file;
     new Thread()
@@ -111,8 +113,7 @@ public class HtmlSvgOutput
         try
         {
           setProgressMessage(null);
-          setProgressMessage(MessageManager
-.formatMessage(
+          setProgressMessage(MessageManager.formatMessage(
                   "status.exporting_alignment_as_x_file", "HTML"));
           AlignmentDimension aDimension = ap.getAlignmentDimension();
           SVGGraphics2D g1 = new SVGGraphics2D(aDimension.getWidth(),
@@ -134,6 +135,8 @@ public class HtmlSvgOutput
 
             if (renderStyle == null || svgOption.cancelled)
             {
+              setProgressMessage(MessageManager.formatMessage(
+                      "status.cancelled_image_export_operation", "HTML"));
               return;
             }
           }