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 improvement/JAL-4111_suffixed_DEVELOP_channels
[jalview.git]
/
src
/
jalview
/
io
/
HtmlSvgOutput.java
diff --git
a/src/jalview/io/HtmlSvgOutput.java
b/src/jalview/io/HtmlSvgOutput.java
index
4b66f81
..
9fb3720
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.concurrent.Callable;
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)
@@
-211,13
+212,9
@@
public class HtmlSvgOutput extends HTMLOutput
/*
* 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());
- }
+ Callable<Void> okAction = () -> {
+ doOutput(textOption.get());
+ return null;
};
/*
};
/*
@@
-226,15
+223,11
@@
public class HtmlSvgOutput extends HTMLOutput
if (renderStyle.equalsIgnoreCase("Prompt each time") && !isHeadless())
{
LineartOptions svgOption = new LineartOptions("HTML", textOption);
if (renderStyle.equalsIgnoreCase("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()));
+ return null;
});
svgOption.setResponseAction(0, okAction);
svgOption.showDialog();
});
svgOption.setResponseAction(0, okAction);
svgOption.showDialog();