X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FHTMLOutput.java;h=711c46588159abc563486352a0db455d2d0e3f14;hb=94ca0419cc7afa75b3c51917a8beaf46a7c05540;hp=2745420dad918866a53f4a7af65388f1620e5c97;hpb=1128674a17df402a2219d278ab332c291cb93443;p=jalview.git

diff --git a/src/jalview/io/HTMLOutput.java b/src/jalview/io/HTMLOutput.java
index 2745420..711c465 100644
--- a/src/jalview/io/HTMLOutput.java
+++ b/src/jalview/io/HTMLOutput.java
@@ -34,6 +34,9 @@ import jalview.datamodel.AlignExportSettingsAdapter;
 import jalview.datamodel.AlignmentExportData;
 import jalview.gui.AlignmentPanel;
 import jalview.gui.IProgressIndicator;
+import jalview.io.exceptions.ImageOutputException;
+import jalview.util.IdUtils;
+import jalview.util.IdUtils.IdType;
 import jalview.util.MessageManager;
 
 public abstract class HTMLOutput implements Runnable
@@ -67,7 +70,7 @@ public abstract class HTMLOutput implements Runnable
     this.ap = ap;
     this.pIndicator = ap.alignFrame;
     this.description = desc;
-    this.pSessionId = System.currentTimeMillis();
+    this.pSessionId = IdUtils.newId(IdType.PROGRESS);
   }
 
   /**
@@ -238,7 +241,7 @@ public abstract class HTMLOutput implements Runnable
     }
     else
     {
-      System.out.println(message);
+      jalview.bin.Console.outPrintln(message);
     }
   }
 
@@ -302,7 +305,13 @@ 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 +341,7 @@ public abstract class HTMLOutput implements Runnable
     }
     if (Jalview.isHeadlessMode())
     {
-      this.run();
+      this.run(renderer);
     }
     else
     {
@@ -351,4 +360,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