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

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

diff --git a/src/jalview/gui/AlignExportSettings.java b/src/jalview/gui/AlignExportSettings.java
index fe7c940..40128af 100644 (file)
--- a/src/jalview/gui/AlignExportSettings.java
+++ b/src/jalview/gui/AlignExportSettings.java
@@ -1,14 +1,14 @@
 package jalview.gui;
 
+import jalview.api.AlignExportSettingI;
+import jalview.jbgui.GAlignExportSettings;
+
 import java.awt.event.ActionEvent;
 
 import javax.swing.JDialog;
 import javax.swing.JInternalFrame;
 import javax.swing.JOptionPane;
 
-import jalview.api.AlignExportSettingI;
-import jalview.jbgui.GAlignExportSettings;
-
 @SuppressWarnings("serial")
 public class AlignExportSettings extends GAlignExportSettings implements
         AlignExportSettingI
@@ -17,52 +17,25 @@ public class AlignExportSettings extends GAlignExportSettings implements
 
   boolean cancelled = false;
 
-  private int width = 450;
-
-  private int height = 200;
-
   JDialog dialog;
 
   public AlignExportSettings(boolean hasHiddenSeq, boolean hasHiddenCols,
           String alignFileFormat)
   {
     super(hasHiddenSeq, hasHiddenCols, alignFileFormat);
-
-    // frame = new JInternalFrame();
-    // frame.setContentPane(this);
-    // frame.setLayer(JLayeredPane.PALETTE_LAYER);
-    // Desktop.addInternalFrame(frame, "Export Settings", width, height);
-
-    JOptionPane pane = new JOptionPane(null, JOptionPane.DEFAULT_OPTION,
-            JOptionPane.DEFAULT_OPTION, null, new Object[]
-            { this });
-    dialog = pane.createDialog(Desktop.desktop, "Export Settings");
-
-    // dialog = new JDialog(Desktop.instance, true);
-    // dialog.setTitle("Export Settings");
-
-    dialog.pack();
-    dialog.setVisible(true);
-
-    dialog.setContentPane(this);
-    dialog.validate();
-
+    if (isShowDialog())
+    {
+      JOptionPane pane = new JOptionPane(null, JOptionPane.DEFAULT_OPTION,
+              JOptionPane.DEFAULT_OPTION, null, new Object[]
+              { this });
+      dialog = pane.createDialog(Desktop.desktop, "Export Settings");
+      dialog.pack();
+      dialog.setVisible(true);
+      dialog.setContentPane(this);
+      dialog.validate();
+    }
   }
 
-  // public static void main(String[] args)
-  // {
-  // new AlignExportSettings(false, false, false);
-  // }
-
-  // public void cancel_actionPerformed(ActionEvent e)
-  // {
-    // try
-    // {
-    // frame.setClosed(true);
-    // } catch (Exception ex)
-    // {
-    // }
-  // }
 
   public void ok_actionPerformed(ActionEvent e)
   {
@@ -106,7 +79,6 @@ public class AlignExportSettings extends GAlignExportSettings implements
     return chkExportGrps.isSelected();
   }
 
-  @Override
   public boolean isCancelled()
   {
     return cancelled;