git://source.jalview.org / jalview.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'features/r2_11_2_alphafold/JAL-629' into features/JAL-3858_PAEsInProjects
[jalview.git] / src / jalview / io / HtmlSvgOutput.java
diff --git a/src/jalview/io/HtmlSvgOutput.java b/src/jalview/io/HtmlSvgOutput.java
index a943a81..9fb3720 100644 (file)
--- a/src/jalview/io/HtmlSvgOutput.java
+++ b/src/jalview/io/HtmlSvgOutput.java
@@ -20,58 +20,29 @@
  */
 package jalview.io;
 
-import jalview.bin.Cache;
-import jalview.gui.AlignmentPanel;
-import jalview.gui.LineartOptions;
-import jalview.gui.OOMWarning;
-import jalview.math.AlignmentDimension;
-import jalview.util.MessageManager;
-import jalview.util.dialogrunner.RunResponse;
-
 import java.awt.Graphics;
 import java.awt.print.PrinterException;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.util.concurrent.Callable;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import javax.swing.JOptionPane;
-
 import org.jfree.graphics2d.svg.SVGGraphics2D;
 import org.jfree.graphics2d.svg.SVGHints;
 
+import jalview.bin.Cache;
+import jalview.gui.AlignmentPanel;
+import jalview.gui.LineartOptions;
+import jalview.gui.OOMWarning;
+import jalview.math.AlignmentDimension;
+import jalview.util.MessageManager;
+
 public class HtmlSvgOutput extends HTMLOutput
 {
   public HtmlSvgOutput(AlignmentPanel ap)
   {
-    super(ap);
-  }
-
-  @Override
-  public void exportHTML(String outputFile)
-  {
-    exportStarted();
-    try
-    {
-      if (outputFile == null)
-      {
-        outputFile = getOutputFile();
-        if (outputFile == null)
-        {
-          setProgressMessage(MessageManager.formatMessage(
-                  "status.cancelled_image_export_operation", "HTML"));
-          return;
-        }
-      }
-      generatedFile = new File(outputFile);
-    } catch (Exception e)
-    {
-      setProgressMessage(MessageManager
-              .formatMessage("info.error_creating_file", "HTML"));
-      e.printStackTrace();
-      return;
-    }
-    new Thread(this).start();
+    super(ap, "HTML");
   }
 
   public int printUnwrapped(int pwidth, int pheight, int pi,
@@ -88,8 +59,8 @@ public class HtmlSvgOutput extends HTMLOutput
     return ap.printWrappedAlignment(pwidth, pheight, pi, pg[0]);
   }
 
-  String getHtml(String titleSvg, String alignmentSvg,
-          String jsonData, boolean wrapped)
+  String getHtml(String titleSvg, String alignmentSvg, String jsonData,
+          boolean wrapped)
   {
     StringBuilder htmlSvg = new StringBuilder();
     htmlSvg.append("<html>\n");
@@ -218,8 +189,8 @@ public class HtmlSvgOutput extends HTMLOutput
   @Override
   public boolean isEmbedData()
   {
-    return Boolean.valueOf(
-            jalview.bin.Cache.getDefault("EXPORT_EMBBED_BIOJSON", "true"));
+    return Boolean
+            .valueOf(Cache.getDefault("EXPORT_EMBBED_BIOJSON", "true"));
   }
 
   @Override
@@ -233,10 +204,6 @@ public class HtmlSvgOutput extends HTMLOutput
   {
     try
     {
-      setProgressMessage(null);
-      setProgressMessage(MessageManager.formatMessage(
-              "status.exporting_alignment_as_x_file", getDescription()));
-
       String renderStyle = Cache.getDefault("HTML_RENDERING",
               "Prompt each time");
       AtomicBoolean textOption = new AtomicBoolean(
@@ -245,13 +212,9 @@ public class HtmlSvgOutput extends HTMLOutput
       /*
        * configure the action to run on OK in the dialog
        */
-      RunResponse okAction = new RunResponse(JOptionPane.OK_OPTION)
-      {
-        @Override
-        public void run()
-        {
-          doOutput(textOption.get());
-        }
+      Callable<Void> okAction = () -> {
+        doOutput(textOption.get());
+        return null;
       };
 
       /*
@@ -260,17 +223,13 @@ public class HtmlSvgOutput extends HTMLOutput
       if (renderStyle.equalsIgnoreCase("Prompt each time") && !isHeadless())
       {
         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",
-                    getDescription()));
-          }
+        svgOption.setResponseAction(1, () -> {
+          setProgressMessage(MessageManager.formatMessage(
+                  "status.cancelled_image_export_operation",
+                  getDescription()));
+          return null;
         });
-        svgOption.setResponseAction(okAction);
+        svgOption.setResponseAction(0, okAction);
         svgOption.showDialog();
         /* no code here - JalviewJS cannot execute it */
       }
@@ -312,11 +271,9 @@ public class HtmlSvgOutput extends HTMLOutput
               aDimension.getWidth(), aDimension.getHeight());
       if (!textCharacters) // Lineart selected
       {
-        idPanelGraphics.setRenderingHint(
-                SVGHints.KEY_DRAW_STRING_TYPE,
+        idPanelGraphics.setRenderingHint(SVGHints.KEY_DRAW_STRING_TYPE,
                 SVGHints.VALUE_DRAW_STRING_TYPE_VECTOR);
-        alignPanelGraphics.setRenderingHint(
-                SVGHints.KEY_DRAW_STRING_TYPE,
+        alignPanelGraphics.setRenderingHint(SVGHints.KEY_DRAW_STRING_TYPE,
                 SVGHints.VALUE_DRAW_STRING_TYPE_VECTOR);
       }
       if (ap.av.getWrapAlignment())
@@ -326,15 +283,15 @@ public class HtmlSvgOutput extends HTMLOutput
       }
       else
       {
-        printUnwrapped(aDimension.getWidth(), aDimension.getHeight(),
-                0, idPanelGraphics, alignPanelGraphics);
+        printUnwrapped(aDimension.getWidth(), aDimension.getHeight(), 0,
+                idPanelGraphics, alignPanelGraphics);
       }
 
       String idPanelSvgData = idPanelGraphics.getSVGDocument();
       String alignPanelSvgData = alignPanelGraphics.getSVGDocument();
       String jsonData = getBioJSONData();
-      String htmlData = getHtml(idPanelSvgData, alignPanelSvgData,
-              jsonData, ap.av.getWrapAlignment());
+      String htmlData = getHtml(idPanelSvgData, alignPanelSvgData, jsonData,
+              ap.av.getWrapAlignment());
       FileOutputStream out = new FileOutputStream(generatedFile);
       out.write(htmlData.getBytes());
       out.flush();
@@ -349,10 +306,4 @@ public class HtmlSvgOutput extends HTMLOutput
               .formatMessage("info.error_creating_file", getDescription()));
     }
   }
-
-  @Override
-  protected String getDescription()
-  {
-    return "HTML";
-  }
 }