Merge branch 'develop' into documentation/JAL-2325_release2101

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

diff --git a/src/jalview/io/HTMLOutput.java b/src/jalview/io/HTMLOutput.java
index a422a38..d58bd67 100755 (executable)
--- a/src/jalview/io/HTMLOutput.java
+++ b/src/jalview/io/HTMLOutput.java
@@ -35,7 +35,7 @@ import java.net.URL;
 import java.util.Objects;
 
 
-public abstract class HTMLOutput
+public abstract class HTMLOutput implements Runnable
 {
   protected AlignmentPanel ap;
 
@@ -54,52 +54,58 @@ public abstract class HTMLOutput
     }
   }
 
-
   public String getBioJSONData()
   {
+    return getBioJSONData(null);
+  }
+
+  public String getBioJSONData(AlignExportSettingI exportSettings)
+  {
     if (!isEmbedData())
     {
       return null;
     }
-    AlignExportSettingI exportSettings = new AlignExportSettingI()
+    if (exportSettings == null)
     {
-      @Override
-      public boolean isExportHiddenSequences()
+      exportSettings = new AlignExportSettingI()
       {
-        return true;
-      }
-
-      @Override
-      public boolean isExportHiddenColumns()
-      {
-        return true;
-      }
+        @Override
+        public boolean isExportHiddenSequences()
+        {
+          return true;
+        }
 
-      @Override
-      public boolean isExportAnnotations()
-      {
-        return true;
-      }
+        @Override
+        public boolean isExportHiddenColumns()
+        {
+          return true;
+        }
 
-      @Override
-      public boolean isExportFeatures()
-      {
-        return true;
-      }
+        @Override
+        public boolean isExportAnnotations()
+        {
+          return true;
+        }
 
-      @Override
-      public boolean isExportGroups()
-      {
-        return true;
-      }
+        @Override
+        public boolean isExportFeatures()
+        {
+          return true;
+        }
 
-      @Override
-      public boolean isCancelled()
-      {
-        return false;
-      }
+        @Override
+        public boolean isExportGroups()
+        {
+          return true;
+        }
 
-    };
+        @Override
+        public boolean isCancelled()
+        {
+          return false;
+        }
+      };
+    }
     AlignmentExportData exportData = jalview.gui.AlignFrame
             .getAlignmentForExport(JSONFile.FILE_DESC,
                     ap.getAlignViewport(), exportSettings);
@@ -264,7 +270,7 @@ public abstract class HTMLOutput
     jvFileChooser.setFileView(new JalviewFileView());
 
     jvFileChooser.setDialogTitle(MessageManager
-            .getString("label.save_as_biojs_html"));
+            .getString("label.save_as_html"));
     jvFileChooser.setToolTipText(MessageManager.getString("action.save"));
 
     int fileChooserOpt = jvFileChooser.showSaveDialog(null);
@@ -276,9 +282,6 @@ public abstract class HTMLOutput
     }
     else
     {
-      pIndicator.setProgressBar(MessageManager.formatMessage(
-              "status.cancelled_image_export_operation", "BioJS"),
-              pSessionId);
       throw new NoFileSelectedException("No file was selected.");
     }
     return selectedFile;