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-3858 minimum value for a range is used to shade ranges in PAE map
[jalview.git]
/
src
/
jalview
/
io
/
HTMLOutput.java
diff --git
a/src/jalview/io/HTMLOutput.java
b/src/jalview/io/HTMLOutput.java
index
eb44180
..
02d46e7
100644
(file)
--- a/
src/jalview/io/HTMLOutput.java
+++ b/
src/jalview/io/HTMLOutput.java
@@
-29,10
+29,12
@@
import java.util.Objects;
import jalview.api.AlignExportSettingsI;
import jalview.bin.Cache;
import jalview.api.AlignExportSettingsI;
import jalview.bin.Cache;
+import jalview.bin.Jalview;
import jalview.datamodel.AlignExportSettingsAdapter;
import jalview.datamodel.AlignmentExportData;
import jalview.gui.AlignmentPanel;
import jalview.gui.IProgressIndicator;
import jalview.datamodel.AlignExportSettingsAdapter;
import jalview.datamodel.AlignmentExportData;
import jalview.gui.AlignmentPanel;
import jalview.gui.IProgressIndicator;
+import jalview.io.exceptions.ImageOutputException;
import jalview.util.MessageManager;
public abstract class HTMLOutput implements Runnable
import jalview.util.MessageManager;
public abstract class HTMLOutput implements Runnable
@@
-237,7
+239,7
@@
public abstract class HTMLOutput implements Runnable
}
else
{
}
else
{
- System.out.println(message);
+ jalview.bin.Console.outPrintln(message);
}
}
}
}
@@
-301,7
+303,12
@@
public abstract class HTMLOutput implements Runnable
return generatedFile;
}
return generatedFile;
}
- public void exportHTML(String outputFile)
+ public void exportHTML(String outputFile) throws ImageOutputException
+ {
+ exportHTML(outputFile, null);
+ }
+
+ public void exportHTML(String outputFile, String renderer) throws ImageOutputException
{
setProgressMessage(MessageManager.formatMessage(
"status.exporting_alignment_as_x_file", getDescription()));
{
setProgressMessage(MessageManager.formatMessage(
"status.exporting_alignment_as_x_file", getDescription()));
@@
-329,7
+336,14
@@
public abstract class HTMLOutput implements Runnable
e.printStackTrace();
return;
}
e.printStackTrace();
return;
}
- new Thread(this).start();
+ if (Jalview.isHeadlessMode())
+ {
+ this.run(renderer);
+ }
+ else
+ {
+ new Thread(this).start();
+ }
}
}
@@
-343,4
+357,7
@@
public abstract class HTMLOutput implements Runnable
{
return description;
}
{
return description;
}
+
+ // used to pass an option such as render to run
+ public abstract void run(String string) throws ImageOutputException;
}
\ No newline at end of file
}
\ No newline at end of file