git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into releases/Release_2_11_3_Branch
[jalview.git]
/
src
/
jalview
/
io
/
HtmlSvgOutput.java
diff --git
a/src/jalview/io/HtmlSvgOutput.java
b/src/jalview/io/HtmlSvgOutput.java
index
81773bc
..
7b661f3
100644
(file)
--- a/
src/jalview/io/HtmlSvgOutput.java
+++ b/
src/jalview/io/HtmlSvgOutput.java
@@
-20,23
+20,24
@@
*/
package jalview.io;
*/
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.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 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)
public class HtmlSvgOutput extends HTMLOutput
{
public HtmlSvgOutput(AlignmentPanel ap)
@@
-58,8
+59,8
@@
public class HtmlSvgOutput extends HTMLOutput
return ap.printWrappedAlignment(pwidth, pheight, pi, pg[0]);
}
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");
{
StringBuilder htmlSvg = new StringBuilder();
htmlSvg.append("<html>\n");
@@
-188,8
+189,8
@@
public class HtmlSvgOutput extends HTMLOutput
@Override
public boolean isEmbedData()
{
@Override
public boolean isEmbedData()
{
- return Boolean.valueOf(
- Cache.getDefault("EXPORT_EMBBED_BIOJSON", "true"));
+ return Boolean
+ .valueOf(Cache.getDefault("EXPORT_EMBBED_BIOJSON", "true"));
}
@Override
}
@Override
@@
-201,40
+202,39
@@
public class HtmlSvgOutput extends HTMLOutput
@Override
public void run()
{
@Override
public void run()
{
+ run(null);
+ }
+
+ @Override
+ public void run(String renderer)
+ {
try
{
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(
AtomicBoolean textOption = new AtomicBoolean(
- !"Lineart".equals(renderStyle));
+ !"lineart".equals(renderStyle.toLowerCase(Locale.ROOT)));
/*
* configure the action to run on OK in the dialog
*/
/*
* 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
*/
};
/*
* 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);
{
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();
});
svgOption.setResponseAction(0, okAction);
svgOption.showDialog();
@@
-278,11
+278,9
@@
public class HtmlSvgOutput extends HTMLOutput
aDimension.getWidth(), aDimension.getHeight());
if (!textCharacters) // Lineart selected
{
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);
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())
SVGHints.VALUE_DRAW_STRING_TYPE_VECTOR);
}
if (ap.av.getWrapAlignment())
@@
-292,15
+290,15
@@
public class HtmlSvgOutput extends HTMLOutput
}
else
{
}
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 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();
FileOutputStream out = new FileOutputStream(generatedFile);
out.write(htmlData.getBytes());
out.flush();