Project

General

Profile

Revision 01e26d23

ID01e26d23bc5b5eff1e4337b6fb10eead6bb598b6
Parent 86bbdab9
Child a776559e

Added by Katja Luther 11 months ago

ref #7981: remove aggregation call in wizard

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/StructuredAggregationConfigurationWizard.java
8 8
*/
9 9
package eu.etaxonomy.taxeditor.ui.dialog.configurator;
10 10

  
11
import java.util.UUID;
12

  
13 11
import org.eclipse.jface.wizard.Wizard;
14
import org.eclipse.swt.widgets.Display;
15 12

  
16 13
import eu.etaxonomy.cdm.api.application.CdmApplicationState;
17 14
import eu.etaxonomy.cdm.api.service.description.StructuredDescriptionAggregationConfiguration;
......
22 19
import eu.etaxonomy.cdm.model.location.NamedArea;
23 20
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
24 21
import eu.etaxonomy.taxeditor.l10n.Messages;
25
import eu.etaxonomy.taxeditor.model.AbstractUtility;
26 22
import eu.etaxonomy.taxeditor.operation.IPostMoniteredOperationEnabled;
27 23

  
28 24
/**
......
79 75
                }
80 76
            }
81 77
            configurator.setTaxonNodeFilter(filter);
78
        }else{
79
            filter = TaxonNodeFilter.NewRankInstance(dataSet.getMinRank(),
80
                    dataSet.getMaxRank());
81
            for (NamedArea namedArea : dataSet.getGeoFilter()) {
82
                filter = filter.orArea(namedArea.getUuid());
83
            }
84
            for (TaxonNode taxonNode : dataSet.getTaxonSubtreeFilter()) {
85
                filter = filter.orSubtree(taxonNode);
86
            }
87
            configurator.setTaxonNodeFilter(filter);
82 88
        }
83 89

  
84 90

  
85
        UUID uuid = longRunningTaskService.invoke(configurator);
86

  
87
        Display.getDefault().asyncExec(new Runnable() {
88
            @Override
89
            public void run() {
90
                AbstractUtility.executeMoniteredOperation("Aggregate Structured Descriptions",
91
                        uuid,
92
                        1000,
93
                        false,
94
                        StructuredAggregationConfigurationWizard.this,
95
                        null,
96
                        true);
97

  
98
            }
99

  
100
        });
101 91

  
102 92
        return true;
103 93
    }

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)