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
JAL-4290 new CommandsTest.headlessOrGuiImageOutputTest - uses CommandLineOperations...
[jalview.git]
/
src
/
jalview
/
io
/
HtmlSvgOutput.java
diff --git
a/src/jalview/io/HtmlSvgOutput.java
b/src/jalview/io/HtmlSvgOutput.java
index
c5ce35b
..
4ea3000
100644
(file)
--- a/
src/jalview/io/HtmlSvgOutput.java
+++ b/
src/jalview/io/HtmlSvgOutput.java
@@
-26,7
+26,6
@@
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Locale;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Locale;
-import java.util.concurrent.Callable;
import java.util.concurrent.atomic.AtomicBoolean;
import org.jfree.graphics2d.svg.SVGGraphics2D;
import java.util.concurrent.atomic.AtomicBoolean;
import org.jfree.graphics2d.svg.SVGGraphics2D;
@@
-221,9
+220,8
@@
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
*/
- Callable<Void> okAction = () -> {
+ Runnable okAction = () -> {
doOutput(textOption.get());
doOutput(textOption.get());
- return null;
};
/*
};
/*
@@
-237,7
+235,6
@@
public class HtmlSvgOutput extends HTMLOutput
setProgressMessage(MessageManager.formatMessage(
"status.cancelled_image_export_operation",
getDescription()));
setProgressMessage(MessageManager.formatMessage(
"status.cancelled_image_export_operation",
getDescription()));
- return null;
});
svgOption.setResponseAction(0, okAction);
svgOption.showDialog();
});
svgOption.setResponseAction(0, okAction);
svgOption.showDialog();
@@
-252,8
+249,9
@@
public class HtmlSvgOutput extends HTMLOutput
}
} catch (OutOfMemoryError err)
{
}
} 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)
{
new OOMWarning("Creating Image for " + generatedFile, err);
} catch (Exception e)
{