git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'patch/JAL-4345_pae_epas1_doubleclick' into develop
[jalview.git]
/
src
/
jalview
/
gui
/
AlignExportOptions.java
diff --git
a/src/jalview/gui/AlignExportOptions.java
b/src/jalview/gui/AlignExportOptions.java
index
08ff021
..
6ca21c7
100644
(file)
--- a/
src/jalview/gui/AlignExportOptions.java
+++ b/
src/jalview/gui/AlignExportOptions.java
@@
-20,11
+20,6
@@
*/
package jalview.gui;
*/
package jalview.gui;
-import jalview.api.AlignExportSettingsI;
-import jalview.api.AlignViewportI;
-import jalview.io.FileFormatI;
-import jalview.util.MessageManager;
-
import java.awt.BorderLayout;
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.BorderLayout;
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
@@
-35,6
+30,12
@@
import java.awt.event.ItemListener;
import javax.swing.JCheckBox;
import javax.swing.JPanel;
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;
+
/**
* A dialog that allows the user to specify whether to include hidden columns or
* sequences in an alignment export, and possibly features, annotations and
/**
* A dialog that allows the user to specify whether to include hidden columns or
* sequences in an alignment export, and possibly features, annotations and
@@
-72,12
+73,9
@@
public class AlignExportOptions extends JPanel
public static boolean isNeeded(AlignViewportI viewport,
FileFormatI format)
{
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());
}
/**
}
/**