Project

General

Profile

« Previous | Next » 

Revision f8019c2d

Added by Patrick Plitzner over 5 years ago

ref #7657 Consider taxon node filter when loading data

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrix.java
85 85 
import eu.etaxonomy.cdm.api.service.UpdateResult;
86 86 
import eu.etaxonomy.cdm.api.service.dto.RowWrapperDTO;
87 87 
import eu.etaxonomy.cdm.common.monitor.IRemotingProgressMonitor;
88 
import eu.etaxonomy.cdm.model.description.DescriptionBase;
88 89 
import eu.etaxonomy.cdm.model.description.DescriptiveDataSet;
89 90 
import eu.etaxonomy.cdm.model.description.Feature;
90 91 
import eu.etaxonomy.cdm.model.description.FeatureNode;
91 92 
import eu.etaxonomy.cdm.model.description.FeatureTree;
92 93 
import eu.etaxonomy.cdm.model.description.MeasurementUnit;
93 
import eu.etaxonomy.cdm.model.description.SpecimenDescription;
94 94 
import eu.etaxonomy.cdm.model.description.State;
95 95 
import eu.etaxonomy.cdm.persistence.dto.SpecimenNodeWrapper;
96 96 
import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;
......
388 388 
        // add the SortHeaderLayer to the column header layer stack
389 389 
        // as we use GlazedLists, we use the GlazedListsSortModel which
390 390 
        // delegates the sorting to the SortedList
391 
        final SortHeaderLayer<SpecimenDescription> sortHeaderLayer = new SortHeaderLayer<>(
391 
        final SortHeaderLayer<DescriptionBase> sortHeaderLayer = new SortHeaderLayer<>(
392 392 
                columnHeaderLayer,
393 393 
                new GlazedListsSortModel<>(
394 394 
                        sortedList,
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixBottomToolbar.java
138 138 
        btnAggregate.addSelectionListener(new SelectionAdapter() {
139 139 
            @Override
140 140 
            public void widgetSelected(SelectionEvent e) {
141 
                Set<TaxonNode> taxonSubtreeFilter = matrix.getDescriptiveDataSet().getTaxonSubtreeFilter();
141 
                List<TaxonNode> taxonSubtreeFilter = CdmStore.getService(IDescriptiveDataSetService.class).loadFilteredTaxonNodes(matrix.getDescriptiveDataSet(), null);
142 142 
                List<TaxonNodeDto> nodeDtos = taxonSubtreeFilter.stream()
143 143 
                        .map(node -> new TaxonNodeDto(node)).collect(Collectors.toList());
144 144 
                TaxonNodeDto parentDto = CdmStore.getService(ITaxonNodeService.class).findCommonParentDto(nodeDtos);

Also available in: Unified diff