Project

General

Profile

Revision 07b9b244

ID07b9b244a352eab71f3e1209e9a23360c3b92114
Parent 26024c71
Child 287ae15a

Added by Patrick Plitzner about 1 year ago

ref #8679 Set taxon node filter and no batch size adaption

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixBottomToolbar.java
47 47
import eu.etaxonomy.cdm.model.description.DescriptiveDataSet;
48 48
import eu.etaxonomy.cdm.model.description.Feature;
49 49
import eu.etaxonomy.cdm.model.description.QuantitativeData;
50
import eu.etaxonomy.cdm.model.location.NamedArea;
50 51
import eu.etaxonomy.cdm.model.taxon.Taxon;
51 52
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
52 53
import eu.etaxonomy.cdm.persistence.dto.SpecimenNodeWrapper;
......
198 199
        config.setDatasetUuid(matrix.getDescriptiveDataSet().getUuid());
199 200
        config.setAggregateToHigherRanks(true);
200 201
        config.setAggregationMode(AggregationMode.byAreasAndRanks());
201
        TaxonNodeFilter filter = TaxonNodeFilter.NewInstance();
202
        Set<TaxonNode> taxonSubtreeFilter = matrix.getDescriptiveDataSet().getTaxonSubtreeFilter();
203
        for (TaxonNode taxonNode : taxonSubtreeFilter) {
202
        config.setAdaptBatchSize(false);
203

  
204
        TaxonNodeFilter filter = TaxonNodeFilter.NewRankInstance(matrix.getDescriptiveDataSet().getMinRank(),
205
                matrix.getDescriptiveDataSet().getMaxRank());
206
        for (NamedArea namedArea : matrix.getDescriptiveDataSet().getGeoFilter()) {
207
            filter = filter.orArea(namedArea.getUuid());
208
        }
209
        for (TaxonNode taxonNode : matrix.getDescriptiveDataSet().getTaxonSubtreeFilter()) {
204 210
            filter = filter.orSubtree(taxonNode);
205 211
        }
206 212
        config.setTaxonNodeFilter(filter);

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)