X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FHTMLOutput.java;h=54e7e4b6c3012d5fbe286554b5a8048bad468b95;hb=c543db8bc1a31098d2c3ce464d21401fb7ff390f;hp=f7179cf0ac7a51e771dd490b3feffe9135a17051;hpb=80e3ac6ebcb27e0d13ce639d1c3105f7cd6f83fe;p=jalview.git diff --git a/src/jalview/io/HTMLOutput.java b/src/jalview/io/HTMLOutput.java index f7179cf..54e7e4b 100644 --- a/src/jalview/io/HTMLOutput.java +++ b/src/jalview/io/HTMLOutput.java @@ -39,23 +39,34 @@ public abstract class HTMLOutput implements Runnable { protected AlignmentPanel ap; + /* + * key for progress or status messages + */ protected long pSessionId; + /* + * (optional) place to write progress messages to + */ protected IProgressIndicator pIndicator; protected File generatedFile; String _bioJson = null; + private String description; + /** * Constructor given an alignment panel (which should not be null) * * @param ap + * @param desc */ - public HTMLOutput(AlignmentPanel ap) + public HTMLOutput(AlignmentPanel ap, String desc) { this.ap = ap; this.pIndicator = ap.alignFrame; + this.description = desc; + this.pSessionId = System.currentTimeMillis(); } /** @@ -243,16 +254,6 @@ public abstract class HTMLOutput implements Runnable /** * This method provides implementation of consistent behaviour which should - * occur before a HTML file export. It MUST be called at the start of the - * exportHTML() method implementation. - */ - protected void exportStarted() - { - pSessionId = System.currentTimeMillis(); - } - - /** - * This method provides implementation of consistent behaviour which should * occur after a HTML file export. It MUST be called at the end of the * exportHTML() method implementation. */ @@ -299,7 +300,8 @@ public abstract class HTMLOutput implements Runnable public void exportHTML(String outputFile) { - exportStarted(); + setProgressMessage(MessageManager.formatMessage( + "status.exporting_alignment_as_x_file", getDescription())); try { if (outputFile == null) @@ -334,5 +336,8 @@ public abstract class HTMLOutput implements Runnable * * @return */ - protected abstract String getDescription(); + protected final String getDescription() + { + return description; + } } \ No newline at end of file