ref #7981: remove aggregation call in wizard

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 5e5ab1524db7bbd45e10efcc04a12e97b0c3efed..ac373504509c61daa220a111d6c8aa94549325c3 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
@@ -8,10 +8,7 @@
 */
 package eu.etaxonomy.taxeditor.ui.dialog.configurator;
 
-import java.util.UUID;
-
 import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.swt.widgets.Display;
 
 import eu.etaxonomy.cdm.api.application.CdmApplicationState;
 import eu.etaxonomy.cdm.api.service.description.StructuredDescriptionAggregationConfiguration;
@@ -22,7 +19,6 @@ import eu.etaxonomy.cdm.model.description.DescriptiveDataSet;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.taxeditor.l10n.Messages;
-import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.operation.IPostMoniteredOperationEnabled;
 
 /**
@@ -79,25 +75,19 @@ public class StructuredAggregationConfigurationWizard extends Wizard implements
                 }
             }
             configurator.setTaxonNodeFilter(filter);
+        }else{
+            filter = TaxonNodeFilter.NewRankInstance(dataSet.getMinRank(),
+                    dataSet.getMaxRank());
+            for (NamedArea namedArea : dataSet.getGeoFilter()) {
+                filter = filter.orArea(namedArea.getUuid());
+            }
+            for (TaxonNode taxonNode : dataSet.getTaxonSubtreeFilter()) {
+                filter = filter.orSubtree(taxonNode);
+            }
+            configurator.setTaxonNodeFilter(filter);
         }
 
 
-        UUID uuid = longRunningTaskService.invoke(configurator);
-
-        Display.getDefault().asyncExec(new Runnable() {
-            @Override
-            public void run() {
-                AbstractUtility.executeMoniteredOperation("Aggregate Structured Descriptions",
-                        uuid,
-                        1000,
-                        false,
-                        StructuredAggregationConfigurationWizard.this,
-                        null,
-                        true);
-
-            }
-
-        });
 
         return true;
     }