*/
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 java.awt.Graphics;
import java.awt.print.PrinterException;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.util.Locale;
import java.util.concurrent.atomic.AtomicBoolean;
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)
@Override
public void run()
{
+ run(null);
+ }
+
+ @Override
+ public void run(String renderer)
+ {
try
{
- String renderStyle = Cache.getDefault("HTML_RENDERING",
- "Prompt each time");
+ String renderStyle = renderer == null
+ ? Cache.getDefault("HTML_RENDERING",
+ LineartOptions.PROMPT_EACH_TIME)
+ : renderer;
AtomicBoolean textOption = new AtomicBoolean(
- !"Lineart".equals(renderStyle));
+ !"lineart".equals(renderStyle.toLowerCase(Locale.ROOT)));
/*
* configure the action to run on OK in the dialog
*/
- Runnable okAction = new Runnable()
- {
- @Override
- public void run()
- {
- doOutput(textOption.get());
- }
+ Runnable okAction = () -> {
+ doOutput(textOption.get());
};
/*
* Prompt for character rendering style if preference is not set
*/
- if (renderStyle.equalsIgnoreCase("Prompt each time") && !isHeadless())
+ if (renderStyle.equalsIgnoreCase(LineartOptions.PROMPT_EACH_TIME)
+ && !isHeadless())
{
LineartOptions svgOption = new LineartOptions("HTML", textOption);
- svgOption.setResponseAction(1, new Runnable()
- {
- @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()));
});
svgOption.setResponseAction(0, okAction);
svgOption.showDialog();
}
} catch (OutOfMemoryError err)
{
- System.out.println("########################\n" + "OUT OF MEMORY "
- + generatedFile + "\n" + "########################");
+ jalview.bin.Console
+ .outPrintln("########################\n" + "OUT OF MEMORY "
+ + generatedFile + "\n" + "########################");
new OOMWarning("Creating Image for " + generatedFile, err);
} catch (Exception e)
{