ref #9710: missed adaption in StructuredAggregationConfigurationWizard

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/StructuredAggregationConfigurationWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/StructuredAggregationConfigurationWizard.java
index bb4940201a7895308a32a5c36fa6ff8437c561fc..8d1399fbccb93dfd7a12d189fa010193f1dc9849 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/StructuredAggregationConfigurationWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/StructuredAggregationConfigurationWizard.java
@@ -17,10 +17,10 @@ import eu.etaxonomy.cdm.api.service.description.StructuredDescriptionAggregation
 import eu.etaxonomy.cdm.api.service.longrunningService.ILongRunningTasksService;
 import eu.etaxonomy.cdm.common.monitor.IRemotingProgressMonitor;
 import eu.etaxonomy.cdm.filter.TaxonNodeFilter;
-import eu.etaxonomy.cdm.model.description.DescriptiveDataSet;
-import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+import eu.etaxonomy.cdm.persistence.dto.DescriptiveDataSetBaseDto;
 import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
+import eu.etaxonomy.cdm.persistence.dto.TermDto;
 import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.operation.IPostMoniteredOperationEnabled;
 
@@ -33,11 +33,11 @@ public class StructuredAggregationConfigurationWizard extends Wizard implements
     private final StructuredDescriptionAggregationConfiguration configurator;
     private StructuredDescriptionAggregationConfigurationWizardPage page;
     private ILongRunningTasksService longRunningTaskService;
-    private DescriptiveDataSet dataSet;
+    private DescriptiveDataSetBaseDto dataSet;
     private List<TaxonNodeDto> selectedNodes;
 
 
-    public StructuredAggregationConfigurationWizard(StructuredDescriptionAggregationConfiguration config, DescriptiveDataSet dataSet, List<TaxonNodeDto> nodes) {
+    public StructuredAggregationConfigurationWizard(StructuredDescriptionAggregationConfiguration config, DescriptiveDataSetBaseDto dataSet, List<TaxonNodeDto> nodes) {
         super();
         this.configurator = config;
         this.dataSet = dataSet;
@@ -68,10 +68,10 @@ public class StructuredAggregationConfigurationWizard extends Wizard implements
 //        }
         TaxonNodeFilter filter = configurator.getTaxonNodeFilter();
         if (!page.useHigherLevel()) {
-            filter.setRankMax(dataSet.getMaxRank());
-            filter.setRankMin(dataSet.getMinRank());
+            filter.setRankMax(dataSet.getMaxRank().getUuid());
+            filter.setRankMin(dataSet.getMinRank().getUuid());
 
-            for (NamedArea namedArea : dataSet.getGeoFilter()) {
+            for (TermDto namedArea : dataSet.getGeoFilter()) {
                 filter = filter.orArea(namedArea.getUuid());
             }
             //TODO: check whether this is correct!!!!
@@ -84,13 +84,13 @@ public class StructuredAggregationConfigurationWizard extends Wizard implements
             }
             configurator.setTaxonNodeFilter(filter);
         }else{
-            filter = TaxonNodeFilter.NewRankInstance(dataSet.getMinRank(),
-                    dataSet.getMaxRank());
-            for (NamedArea namedArea : dataSet.getGeoFilter()) {
+            filter = TaxonNodeFilter.NewRankInstance(dataSet.getMinRank().getUuid(),
+                    dataSet.getMaxRank().getUuid());
+            for (TermDto namedArea : dataSet.getGeoFilter()) {
                 filter = filter.orArea(namedArea.getUuid());
             }
-            for (TaxonNode taxonNode : dataSet.getTaxonSubtreeFilter()) {
-                filter = filter.orSubtree(taxonNode);
+            for (TaxonNodeDto taxonNode : dataSet.getSubTreeFilter()) {
+                filter = filter.orSubtree(taxonNode.getUuid());
             }
             configurator.setTaxonNodeFilter(filter);
         }