JAL-3026-JAL-3063-JAXB swingjs/ upgrade

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

diff --git a/src/jalview/io/HtmlSvgOutput.java b/src/jalview/io/HtmlSvgOutput.java
index 30c40a9..a943a81 100644 (file)
--- a/src/jalview/io/HtmlSvgOutput.java
+++ b/src/jalview/io/HtmlSvgOutput.java
@@ -21,7 +21,6 @@
 package jalview.io;
 
 import jalview.bin.Cache;
-import jalview.exceptions.NoFileSelectedException;
 import jalview.gui.AlignmentPanel;
 import jalview.gui.LineartOptions;
 import jalview.gui.OOMWarning;
@@ -43,7 +42,6 @@ import org.jfree.graphics2d.svg.SVGHints;
 
 public class HtmlSvgOutput extends HTMLOutput
 {
-
   public HtmlSvgOutput(AlignmentPanel ap)
   {
     super(ap);
@@ -58,13 +56,14 @@ public class HtmlSvgOutput extends HTMLOutput
       if (outputFile == null)
       {
         outputFile = getOutputFile();
+        if (outputFile == null)
+        {
+          setProgressMessage(MessageManager.formatMessage(
+                  "status.cancelled_image_export_operation", "HTML"));
+          return;
+        }
       }
       generatedFile = new File(outputFile);
-    } catch (NoFileSelectedException e)
-    {
-      setProgressMessage(MessageManager.formatMessage(
-              "status.cancelled_image_export_operation", "HTML"));
-      return;
     } catch (Exception e)
     {
       setProgressMessage(MessageManager
@@ -230,19 +229,13 @@ public class HtmlSvgOutput extends HTMLOutput
   }
 
   @Override
-  public File getExportedFile()
-  {
-    return generatedFile;
-  }
-
-  @Override
   public void run()
   {
     try
     {
       setProgressMessage(null);
       setProgressMessage(MessageManager.formatMessage(
-              "status.exporting_alignment_as_x_file", "HTML"));
+              "status.exporting_alignment_as_x_file", getDescription()));
 
       String renderStyle = Cache.getDefault("HTML_RENDERING",
               "Prompt each time");
@@ -266,15 +259,15 @@ public class HtmlSvgOutput extends HTMLOutput
        */
       if (renderStyle.equalsIgnoreCase("Prompt each time") && !isHeadless())
       {
-        LineartOptions svgOption = new LineartOptions("HTML_RENDERING",
-                "HTML", textOption);
+        LineartOptions svgOption = new LineartOptions("HTML", textOption);
         svgOption.setResponseAction(new RunResponse(JOptionPane.NO_OPTION)
         {
           @Override
           public void run()
           {
             setProgressMessage(MessageManager.formatMessage(
-                    "status.cancelled_image_export_operation", "HTML"));
+                    "status.cancelled_image_export_operation",
+                    getDescription()));
           }
         });
         svgOption.setResponseAction(okAction);
@@ -297,7 +290,7 @@ public class HtmlSvgOutput extends HTMLOutput
     {
       e.printStackTrace();
       setProgressMessage(MessageManager
-              .formatMessage("info.error_creating_file", "HTML"));
+              .formatMessage("info.error_creating_file", getDescription()));
     }
   }
 
@@ -347,13 +340,19 @@ public class HtmlSvgOutput extends HTMLOutput
       out.flush();
       out.close();
       setProgressMessage(MessageManager
-              .formatMessage("status.export_complete", "HTML"));
+              .formatMessage("status.export_complete", getDescription()));
       exportCompleted();
     } catch (Exception e)
     {
       e.printStackTrace();
       setProgressMessage(MessageManager
-              .formatMessage("info.error_creating_file", "HTML"));
+              .formatMessage("info.error_creating_file", getDescription()));
     }
   }
+
+  @Override
+  protected String getDescription()
+  {
+    return "HTML";
+  }
 }