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 'doc/JAL-4090_Release_2_11_3_0' into develop
[jalview.git]
/
src
/
jalview
/
gui
/
ImageExporter.java
diff --git
a/src/jalview/gui/ImageExporter.java
b/src/jalview/gui/ImageExporter.java
index
4ea30d9
..
457ea1f
100644
(file)
--- a/
src/jalview/gui/ImageExporter.java
+++ b/
src/jalview/gui/ImageExporter.java
@@
-34,6
+34,7
@@
import jalview.util.ImageMaker;
import jalview.util.ImageMaker.TYPE;
import jalview.util.MessageManager;
import jalview.util.Platform;
import jalview.util.ImageMaker.TYPE;
import jalview.util.MessageManager;
import jalview.util.Platform;
+import jalview.util.StringUtils;
import jalview.util.imagemaker.BitmapImageSizing;
/**
import jalview.util.imagemaker.BitmapImageSizing;
/**
@@
-107,11
+108,12
@@
public class ImageExporter
String imageSource) throws ImageOutputException
{
doExport(file, parent, width, height, imageSource, null,
String imageSource) throws ImageOutputException
{
doExport(file, parent, width, height, imageSource, null,
- BitmapImageSizing.nullBitmapImageSizing());
+ BitmapImageSizing.defaultBitmapImageSizing());
}
public void doExport(File file, Component parent, int width, int height,
}
public void doExport(File file, Component parent, int width, int height,
- String imageSource, String renderer, BitmapImageSizing userBis) throws ImageOutputException
+ String imageSource, String renderer, BitmapImageSizing userBis)
+ throws ImageOutputException
{
final long messageId = System.currentTimeMillis();
setStatus(
{
final long messageId = System.currentTimeMillis();
setStatus(
@@
-126,8
+128,9
@@
public class ImageExporter
{
if (Desktop.instance.isInBatchMode())
{
{
if (Desktop.instance.isInBatchMode())
{
- // defensive error report - we could wait for user input.. I guess ?
- throw(new ImageOutputException("Need an output file to render to when exporting images in batch mode!"));
+ // defensive error report - we could wait for user input.. I guess ?
+ throw (new ImageOutputException(
+ "Need an output file to render to when exporting images in batch mode!"));
}
JalviewFileChooser chooser = imageType.getFileChooser();
chooser.setFileView(new JalviewFileView());
}
JalviewFileChooser chooser = imageType.getFileChooser();
chooser.setFileView(new JalviewFileView());
@@
-164,9
+167,9
@@
public class ImageExporter
renderStyle = "Text";
}
AtomicBoolean textSelected = new AtomicBoolean(
renderStyle = "Text";
}
AtomicBoolean textSelected = new AtomicBoolean(
- !"Lineart".equals(renderStyle));
- if ((imageType == TYPE.EPS || imageType == TYPE.SVG)
- && LineartOptions.PROMPT_EACH_TIME.equals(renderStyle)
+ !StringUtils.equalsIgnoreCase("lineart", renderStyle));
+ if ((imageType == TYPE.EPS || imageType == TYPE.SVG) && StringUtils
+ .equalsIgnoreCase(LineartOptions.PROMPT_EACH_TIME, renderStyle)
&& !Jalview.isHeadlessMode())
{
final File chosenFile = file;
&& !Jalview.isHeadlessMode())
{
final File chosenFile = file;
@@
-188,8
+191,8
@@
public class ImageExporter
else
{
/*
else
{
/*
- * character rendering not required, or preference already set
- * - just do the export
+ * character rendering not required, or preference already set
+ * or we're in headless mode - just do the export
*/
exportImage(file, !textSelected.get(), width, height, messageId,
userBis);
*/
exportImage(file, !textSelected.get(), width, height, messageId,
userBis);
@@
-226,8
+229,8
@@
public class ImageExporter
messageId);
} catch (Exception e)
{
messageId);
} catch (Exception e)
{
- jalview.bin.Console.error(String.format("Error creating %s file: %s", type,
- e.toString()),e);
+ jalview.bin.Console.error(String.format("Error creating %s file: %s",
+ type, e.toString()), e);
setStatus(MessageManager.formatMessage("info.error_creating_file",
type), messageId);
}
setStatus(MessageManager.formatMessage("info.error_creating_file",
type), messageId);
}