X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGAlignExportSettings.java;h=15498c6a6be490df050068883ed712d2f36a8b18;hb=1e0a944431b347efefe067fdecb6f28fe4c187a8;hp=2583b6ba0feef250e929fe49451236a32720fbd6;hpb=195524abaf46b6993e8ed348a2fa16fc3a60e742;p=jalview.git diff --git a/src/jalview/jbgui/GAlignExportSettings.java b/src/jalview/jbgui/GAlignExportSettings.java index 2583b6b..15498c6 100644 --- 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);