From 29e233c63d9ea67eaab0d49737d2afb32efaef9f Mon Sep 17 00:00:00 2001 From: Patrick Plitzner Date: Mon, 3 Sep 2018 13:33:31 +0200 Subject: [PATCH] ref #7674 Add aggregated description directly to matrix after creation --- .../matrix/CharacterMatrixBottomToolbar.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixBottomToolbar.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixBottomToolbar.java index fe0599703..4a24e2f7f 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixBottomToolbar.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixBottomToolbar.java @@ -36,6 +36,7 @@ import eu.etaxonomy.cdm.model.description.CategoricalData; import eu.etaxonomy.cdm.model.description.Feature; import eu.etaxonomy.cdm.model.description.QuantitativeData; import eu.etaxonomy.cdm.model.description.SpecimenDescription; +import eu.etaxonomy.cdm.model.description.TaxonDescription; import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.cdm.model.taxon.TaxonNode; import eu.etaxonomy.cdm.persistence.dto.SpecimenNodeWrapper; @@ -163,8 +164,10 @@ public class CharacterMatrixBottomToolbar extends Composite{ List descriptionUuids = new ArrayList<>(); matrix.getDescriptiveDataSet().getDescriptions().forEach(desc->descriptionUuids.add(desc.getUuid())); UpdateResult result = CdmStore.getService(IDescriptionService.class).aggregateDescription(taxonUuid, descriptionUuids, matrix.getDescriptiveDataSet().getLabel(), matrix.getDescriptiveDataSet().getUuid()); + TaxonDescription taxonDescription = (TaxonDescription) result.getCdmEntity(); + TaxonRowWrapperDTO taxonRowWrapper = CdmStore.getService(IDescriptiveDataSetService.class).createTaxonRowWrapper(taxonDescription, matrix.getDescriptiveDataSet()); + matrix.getDescriptions().add(taxonRowWrapper); matrix.addUpdateResult(result); - matrix.setDirty(); aggregateCategorcialHistogram(matrix.getFeatureToHistogramMap()); aggregateQuantitativeSummary(matrix.getFeatureToQuantDataStatisticsMap()); -- 2.34.1