JAL-3210 Barebones gradle/buildship/eclipse. See README

[jalview.git] / src / jalview / io / HTMLOutput.java

diff --git a/src/jalview/io/HTMLOutput.java b/src/jalview/io/HTMLOutput.java
index e7054c7..54e7e4b 100644 (file)
--- a/src/jalview/io/HTMLOutput.java
+++ b/src/jalview/io/HTMLOutput.java
@@ -22,13 +22,11 @@ package jalview.io;
 
 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.util.MessageManager;
-import jalview.util.Platform;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -233,7 +231,7 @@ public abstract class HTMLOutput implements Runnable
 
   protected void setProgressMessage(String message)
   {
-    if (pIndicator != null && !Jalview.isHeadlessMode())
+    if (pIndicator != null && !isHeadless())
     {
       pIndicator.setProgressBar(message, pSessionId);
     }
@@ -244,17 +242,29 @@ public abstract class HTMLOutput implements Runnable
   }
 
   /**
+   * Answers true if HTML export is invoke in headless mode or false otherwise
+   * 
+   * @return
+   */
+  protected boolean isHeadless()
+  {
+    return System.getProperty("java.awt.headless") != null
+            && System.getProperty("java.awt.headless").equals("true");
+  }
+
+  /**
    * 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.
    */
   protected void exportCompleted()
   {
-    if (isLaunchInBrowserAfterExport() && !Jalview.isHeadlessMode())
+    if (isLaunchInBrowserAfterExport() && !isHeadless())
     {
       try
       {
-        Platform.openURL("file:///" + getExportedFile());
+        jalview.util.BrowserLauncher
+                .openURL("file:///" + getExportedFile());
       } catch (IOException e)
       {
         e.printStackTrace();