Merge branch 'develop' into features/filetypeEnum

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

diff --git a/src/jalview/io/HtmlSvgOutput.java b/src/jalview/io/HtmlSvgOutput.java
index 4e1b261..0acddfd 100644 (file)
--- a/src/jalview/io/HtmlSvgOutput.java
+++ b/src/jalview/io/HtmlSvgOutput.java
@@ -22,6 +22,7 @@ package jalview.io;
 
 import jalview.api.AlignExportSettingI;
 import jalview.api.FeatureRenderer;
+import jalview.bin.Cache;
 import jalview.datamodel.AlignmentExportData;
 import jalview.datamodel.SequenceI;
 import jalview.gui.AlignViewport;
@@ -30,6 +31,7 @@ import jalview.gui.HTMLOptions;
 import jalview.gui.IProgressIndicator;
 import jalview.gui.OOMWarning;
 import jalview.math.AlignmentDimension;
+import jalview.util.ImageMaker;
 import jalview.util.MessageManager;
 
 import java.awt.Color;
@@ -114,8 +116,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(),
@@ -200,10 +201,10 @@ public class HtmlSvgOutput
 
             };
             AlignmentExportData exportData = jalview.gui.AlignFrame
-                    .getAlignmentForExport(JSONFile.FILE_DESC, av,
+                    .getAlignmentForExport(FileFormat.Json, av,
                             exportSettings);
             jsonData = new FormatAdapter(ap, exportData.getSettings())
-                    .formatSequences(JSONFile.FILE_DESC,
+                    .formatSequences(FileFormat.Json,
                             exportData.getAlignment(),
                             exportData.getOmitHidden(),
                             exportData.getStartEndPostions(),
@@ -252,11 +253,9 @@ public class HtmlSvgOutput
 
   static JalviewFileChooser getHTMLChooser()
   {
-    return new jalview.io.JalviewFileChooser(
-            jalview.bin.Cache.getProperty("LAST_DIRECTORY"),
-            new String[] { "html" },
-            new String[] { "Hypertext Markup Language" },
-            "Hypertext Markup Language");
+    return new JalviewFileChooser(Cache.getProperty("LAST_DIRECTORY"),
+            ImageMaker.HTML_EXTENSION, ImageMaker.HTML_EXTENSION,
+            ImageMaker.HTML_EXTENSION);
   }
 
   public int printUnwrapped(int pwidth, int pheight, int pi, Graphics... pg)