Merge branch 'develop' into spike/JAL-4047/JAL-4048_columns_in_sequenceID

[jalview.git] / src / jalview / gui / AlignExportOptions.java

diff --git a/src/jalview/gui/AlignExportOptions.java b/src/jalview/gui/AlignExportOptions.java
index a23cbfa..6ca21c7 100644 (file)
--- a/src/jalview/gui/AlignExportOptions.java
+++ b/src/jalview/gui/AlignExportOptions.java
@@ -26,13 +26,13 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
-import java.util.concurrent.Callable;
 
 import javax.swing.JCheckBox;
 import javax.swing.JPanel;
 
 import jalview.api.AlignExportSettingsI;
 import jalview.api.AlignViewportI;
+import jalview.bin.Jalview;
 import jalview.io.FileFormatI;
 import jalview.util.MessageManager;
 
@@ -73,12 +73,9 @@ public class AlignExportOptions extends JPanel
   public static boolean isNeeded(AlignViewportI viewport,
           FileFormatI format)
   {
-    if (viewport.hasHiddenColumns() || viewport.hasHiddenRows()
-            || format.isComplexAlignFile())
-    {
-      return true;
-    }
-    return false;
+    return !Jalview.getInstance().isHeadlessMode()
+            && (viewport.hasHiddenColumns() || viewport.hasHiddenRows()
+                    || format.isComplexAlignFile());
   }
 
   /**
@@ -120,7 +117,7 @@ public class AlignExportOptions extends JPanel
    * 
    * @param action
    */
-  public void setResponseAction(Object response, Callable action)
+  public void setResponseAction(Object response, Runnable action)
   {
     dialog.setResponseHandler(response, action);
   }