X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGAlignExportSettings.java;h=cfa57c8c89d26fd14cad9575e03bc81d7f9dc899;hb=refs%2Fheads%2FJalview-BH%2FJAL-3048_exportSettingsrefactor;hp=bf02e9ee54af22392eb6f35ab993ff070416e0e7;hpb=db4eacee27b836db4126dca551887bfc6652d72a;p=jalview.git

diff --git a/src/jalview/jbgui/GAlignExportSettings.java b/src/jalview/jbgui/GAlignExportSettings.java
index bf02e9e..cfa57c8 100644
--- a/src/jalview/jbgui/GAlignExportSettings.java
+++ b/src/jalview/jbgui/GAlignExportSettings.java
@@ -20,6 +20,7 @@
  */
 package jalview.jbgui;
 
+import jalview.io.FileFormatI;
 import jalview.util.MessageManager;
 
 import java.awt.BorderLayout;
@@ -61,28 +62,15 @@ public abstract class GAlignExportSettings extends JPanel
 
   protected JCheckBox chkExportGrps = new JCheckBox();
 
-  JButton btnOk = new JButton();
-
-  JButton btnCancel = new JButton();
-
   private boolean hasHiddenSeq, hasHiddenCols, isComplexAlignFile,
           showDialog;
 
   public GAlignExportSettings(boolean hasHiddenSeq, boolean hasHiddenCols,
-          String alignFileFormat)
+          FileFormatI format)
   {
     this.hasHiddenSeq = hasHiddenSeq;
     this.hasHiddenCols = hasHiddenCols;
-    String[] complexFormats = { "JSON", "HTML" };
-
-    for (String format : complexFormats)
-    {
-      if (format.equalsIgnoreCase(alignFileFormat))
-      {
-        this.isComplexAlignFile = true;
-        break;
-      }
-    }
+    this.isComplexAlignFile = format.isComplexAlignFile();
     if (this.hasHiddenCols || this.hasHiddenSeq || this.isComplexAlignFile)
     {
       this.showDialog = true;
@@ -92,17 +80,15 @@ public abstract class GAlignExportSettings extends JPanel
 
   public void init()
   {
-    chkHiddenSeqs.setText(MessageManager
-            .getString("action.export_hidden_sequences"));
-    chkHiddenCols.setText(MessageManager
-            .getString("action.export_hidden_columns"));
-    chkExportAnnots.setText(MessageManager
-            .getString("action.export_annotations"));
-    chkExportFeats.setText(MessageManager
-            .getString("action.export_features"));
+    chkHiddenSeqs.setText(
+            MessageManager.getString("action.export_hidden_sequences"));
+    chkHiddenCols.setText(
+            MessageManager.getString("action.export_hidden_columns"));
+    chkExportAnnots
+            .setText(MessageManager.getString("action.export_annotations"));
+    chkExportFeats
+            .setText(MessageManager.getString("action.export_features"));
     chkExportGrps.setText(MessageManager.getString("action.export_groups"));
-    btnOk.setText(MessageManager.getString("action.ok"));
-    btnCancel.setText(MessageManager.getString("action.cancel"));
     chkAll.setText(MessageManager.getString("action.select_all"));
 
     hiddenRegionConfPanel.setLayout(hiddenRegionLayout);
@@ -111,28 +97,13 @@ public abstract class GAlignExportSettings extends JPanel
 
     chkAll.addItemListener(new ItemListener()
     {
+      @Override
       public void itemStateChanged(ItemEvent e)
       {
         checkAllAction();
       }
     });
 
-    btnOk.addActionListener(new ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        ok_actionPerformed(e);
-      }
-    });
-
-    btnCancel.addActionListener(new ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        cancel_actionPerformed(e);
-      }
-    });
-
     // hiddenRegionConfPanel.add(chkAll, BorderLayout.NORTH);
     hiddenRegionConfPanel.add(chkHiddenSeqs, BorderLayout.CENTER);
     hiddenRegionConfPanel.add(chkHiddenCols, BorderLayout.SOUTH);
@@ -155,9 +126,6 @@ public abstract class GAlignExportSettings extends JPanel
       optionsPanel.add(hiddenRegionConfPanel);
     }
 
-    actionPanel.add(btnCancel);
-    actionPanel.add(btnOk);
-
     add(optionsPanel, BorderLayout.NORTH);
     add(actionPanel, BorderLayout.SOUTH);
 
@@ -170,10 +138,10 @@ public abstract class GAlignExportSettings extends JPanel
     chkHiddenCols.setSelected(chkHiddenCols.isEnabled() && isSelected);
     chkExportAnnots.setSelected(isComplexAlignFile
             && chkExportAnnots.isEnabled() && isSelected);
-    chkExportFeats.setSelected(isComplexAlignFile
-            && chkExportFeats.isEnabled() && isSelected);
-    chkExportGrps.setSelected(isComplexAlignFile
-            && chkExportGrps.isEnabled() && isSelected);
+    chkExportFeats.setSelected(
+            isComplexAlignFile && chkExportFeats.isEnabled() && isSelected);
+    chkExportGrps.setSelected(
+            isComplexAlignFile && chkExportGrps.isEnabled() && isSelected);
   }
 
   public boolean isShowDialog()