JAL-3048 revised AlignExportSettings dialog with response action

[jalview.git] / src / jalview / io / JSONFile.java

diff --git a/src/jalview/io/JSONFile.java b/src/jalview/io/JSONFile.java
index f957e06..7071a9d 100644 (file)
--- a/src/jalview/io/JSONFile.java
+++ b/src/jalview/io/JSONFile.java
@@ -21,7 +21,7 @@
 
 package jalview.io;
 
-import jalview.api.AlignExportSettingI;
+import jalview.api.AlignExportSettingsI;
 import jalview.api.AlignViewportI;
 import jalview.api.AlignmentViewPanel;
 import jalview.api.ComplexAlignFile;
@@ -29,7 +29,7 @@ import jalview.api.FeatureRenderer;
 import jalview.api.FeatureSettingsModelI;
 import jalview.api.FeaturesDisplayedI;
 import jalview.bin.BuildDetails;
-import jalview.datamodel.AlignExportSettingBeanI;
+import jalview.datamodel.AlignExportSettingsAdapter;
 import jalview.datamodel.AlignmentAnnotation;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.Annotation;
@@ -124,50 +124,14 @@ public class JSONFile extends AlignFile implements ComplexAlignFile
     try
     {
       AlignmentPojo jsonAlignmentPojo = new AlignmentPojo();
-      AlignExportSettingBeanI exportSettings = getExportSettings();
+      AlignExportSettingsI exportSettings = getExportSettings();
 
-      // if no export settings were supplied use the following with all values
-      // defaulting to true
+      /*
+       * if no export settings were supplied, provide an 'export all' setting
+       */
       if (exportSettings == null)
       {
-        exportSettings = new AlignExportSettingBeanI()
-        {
-          @Override
-          public boolean isExportHiddenSequences()
-          {
-            return true;
-          }
-
-          @Override
-          public boolean isExportHiddenColumns()
-          {
-            return true;
-          }
-
-          @Override
-          public boolean isExportGroups()
-          {
-            return true;
-          }
-
-          @Override
-          public boolean isExportFeatures()
-          {
-            return true;
-          }
-
-          @Override
-          public boolean isExportAnnotations()
-          {
-            return true;
-          }
-
-          @Override
-          public boolean isCancelled()
-          {
-            return false;
-          }
-        };
+        exportSettings = new AlignExportSettingsAdapter(true);
       }
 
       int count = 0;