JAL-1780 improvement to ensure export settings dialog is not invoked if there's notin...

[jalview.git] / src / jalview / jbgui / GAlignExportSettings.java

diff --git a/src/jalview/jbgui/GAlignExportSettings.java b/src/jalview/jbgui/GAlignExportSettings.java
index 2583b6b..15498c6 100644 (file)
--- a/src/jalview/jbgui/GAlignExportSettings.java
+++ b/src/jalview/jbgui/GAlignExportSettings.java
@@ -44,9 +44,8 @@ public abstract class GAlignExportSettings extends JPanel
 
   JButton btnCancel = new JButton("Cancel");
 
-  private boolean hasHiddenSeq, hasHiddenCols, isComplexAlignFile;
-
-  boolean isComplexFormat = false;
+  private boolean hasHiddenSeq, hasHiddenCols, isComplexAlignFile,
+          showDialog;
 
   public GAlignExportSettings(boolean hasHiddenSeq, boolean hasHiddenCols,
           String alignFileFormat)
@@ -64,7 +63,10 @@ public abstract class GAlignExportSettings extends JPanel
         break;
       }
     }
-
+    if (this.hasHiddenCols || this.hasHiddenSeq || this.isComplexAlignFile)
+    {
+      this.showDialog = true;
+    }
     init();
   }
 
@@ -113,7 +115,7 @@ public abstract class GAlignExportSettings extends JPanel
       optionsPanel.add(hiddenRegionConfPanel);
     }
 
-    if (isComplexAlignFile)
+    if (this.isComplexAlignFile)
     {
       optionsPanel.add(complexExportPanel);
     }
@@ -124,8 +126,6 @@ public abstract class GAlignExportSettings extends JPanel
     add(actionPanel, BorderLayout.SOUTH);
 
   }
-
-
   
   private void checkAllAction()
   {
@@ -140,6 +140,16 @@ public abstract class GAlignExportSettings extends JPanel
             && chkExportGrps.isEnabled() && isSelected);
   }
 
+  public boolean isShowDialog()
+  {
+    return showDialog;
+  }
+
+  public void setShowDialog(boolean showDialog)
+  {
+    this.showDialog = showDialog;
+  }
+
   public abstract void ok_actionPerformed(ActionEvent e);
 
   public abstract void cancel_actionPerformed(ActionEvent e);