ref #10448: fix configuration creation in WFO classification export

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/wfo/WFOExportWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/wfo/WFOExportWizard.java
index 92155f4de5113ae69ae85a84e211cbdf9ea1e581..bfc5b413f857ac2b2f6312b1173326c140bba6c5 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/wfo/WFOExportWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/wfo/WFOExportWizard.java
@@ -13,7 +13,6 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import java.util.UUID;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -85,21 +84,11 @@ public class WFOExportWizard extends
                String urlString = page.getFolderText() + File.separator
                                + page.getExportFileName();
 
-               if (!page.getCheckUseSelectedTaxonNode()){
-                       configurator.getTaxonNodeFilter().reset();
-                       if (!page.getCheckUseAllClassifications()){
-                               configurator.getTaxonNodeFilter().orClassification(page.getSelectedClassificationUUID());
-                       }else{
-                               for (UUID classificationUuid: page.getAllClassificationUuids()){
-                                       configurator.getTaxonNodeFilter().orClassification(classificationUuid);
-                               }
 
-                       }
-               }
                if (StringUtils.isNotBlank(page.getFamilyString())) {
                    configurator.setFamilyStr(page.getFamilyString());
                }
-            CdmStore.getExportManager().runMoniteredOperation(configurator, urlString);
+        CdmStore.getExportManager().runMoniteredOperation(configurator, urlString);
 
                return true;
        }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExportToFileDestinationWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExportToFileDestinationWizardPage.java
index c613f51698df690a5d0672e07b0bc0bd7c23df5e..335593b55954ed6dc4fab02ecc80b303f6f1bcc7 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExportToFileDestinationWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExportToFileDestinationWizardPage.java
@@ -273,7 +273,7 @@ public class ExportToFileDestinationWizardPage extends WizardPage implements Sel
             gridDataSep.horizontalSpan = 2;
             separator.setLayoutData(gridDataSep);
         }
-        if (classifications == null) {
+        if (classifications == null && !wfoExport) {
             classifications = CdmStore.getService(IClassificationService.class).list(null, null, null, null, null);
             Collections.sort(classifications, (o1, o2) -> {
                 if (o1.equals(o2)) {
@@ -388,7 +388,7 @@ public class ExportToFileDestinationWizardPage extends WizardPage implements Sel
                 });
             }
 
-            if (node != null) {
+            if (node != null && !wfoExport) {
                 selectedClassification = node.getClassification();
             }
             if (!wfoExport) {