JAL-3253 preliminary static fixes for JavaScript

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

diff --git a/src/jalview/io/HTMLOutput.java b/src/jalview/io/HTMLOutput.java
index 54e7e4b..6b6dc24 100644 (file)
--- a/src/jalview/io/HTMLOutput.java
+++ b/src/jalview/io/HTMLOutput.java
@@ -22,6 +22,7 @@ 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;
@@ -231,7 +232,7 @@ public abstract class HTMLOutput implements Runnable
 
   protected void setProgressMessage(String message)
   {
-    if (pIndicator != null && !isHeadless())
+    if (pIndicator != null && !Jalview.isHeadlessMode())
     {
       pIndicator.setProgressBar(message, pSessionId);
     }
@@ -241,16 +242,16 @@ 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");
-  }
+  // /**
+  // * 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
@@ -259,7 +260,7 @@ public abstract class HTMLOutput implements Runnable
    */
   protected void exportCompleted()
   {
-    if (isLaunchInBrowserAfterExport() && !isHeadless())
+    if (isLaunchInBrowserAfterExport() && !Jalview.isHeadlessMode())
     {
       try
       {