From: tcofoegbu Date: Fri, 21 Aug 2015 09:47:43 +0000 (+0100) Subject: clean up X-Git-Tag: Release_2_10_0~527 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=ec275757158b87105d9a374a2c4136e7f21903f1;p=jalview.git clean up --- diff --git a/src/jalview/gui/AlignExportSettings.java b/src/jalview/gui/AlignExportSettings.java index 02eea9f..0856365 100644 --- a/src/jalview/gui/AlignExportSettings.java +++ b/src/jalview/gui/AlignExportSettings.java @@ -26,6 +26,7 @@ public class AlignExportSettings extends GAlignExportSettings implements super(hasHiddenSeq, hasHiddenCols, alignFileFormat); if (!Jalview.isHeadlessMode() && isShowDialog()) { + JOptionPane pane = new JOptionPane(null, JOptionPane.DEFAULT_OPTION, JOptionPane.DEFAULT_OPTION, null, new Object[] { this }); diff --git a/src/jalview/jbgui/GAlignExportSettings.java b/src/jalview/jbgui/GAlignExportSettings.java index 25e5290..58005e8 100644 --- a/src/jalview/jbgui/GAlignExportSettings.java +++ b/src/jalview/jbgui/GAlignExportSettings.java @@ -125,15 +125,17 @@ public abstract class GAlignExportSettings extends JPanel complexExportPanel.add(chkExportGrps, BorderLayout.SOUTH); actionPanel.add(chkAll); - if (hasHiddenSeq || hasHiddenCols) - { - optionsPanel.add(hiddenRegionConfPanel); - } if (this.isComplexAlignFile) { optionsPanel.add(complexExportPanel); } + + if (hasHiddenSeq || hasHiddenCols) + { + optionsPanel.add(hiddenRegionConfPanel); + } + actionPanel.add(btnCancel); actionPanel.add(btnOk);