X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fio%2FHTMLOutput.java;h=02d46e71744a11e597245995c720cb9ff48d458c;hb=ae3fad8019274ca3ab1258a480ba15dd9adac1e9;hp=2745420dad918866a53f4a7af65388f1620e5c97;hpb=1128674a17df402a2219d278ab332c291cb93443;p=jalview.git diff --git a/src/jalview/io/HTMLOutput.java b/src/jalview/io/HTMLOutput.java index 2745420..02d46e7 100644 --- a/src/jalview/io/HTMLOutput.java +++ b/src/jalview/io/HTMLOutput.java @@ -34,6 +34,7 @@ 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 @@ -238,7 +239,7 @@ public abstract class HTMLOutput implements Runnable } else { - System.out.println(message); + jalview.bin.Console.outPrintln(message); } } @@ -302,7 +303,12 @@ public abstract class HTMLOutput implements Runnable 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())); @@ -332,7 +338,7 @@ public abstract class HTMLOutput implements Runnable } if (Jalview.isHeadlessMode()) { - this.run(); + this.run(renderer); } else { @@ -351,4 +357,7 @@ public abstract class HTMLOutput implements Runnable { 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