ref #7589 Remove UpdateResult handling from CharacterMatrix

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixPart.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixPart.java
index a11bf14a0d822cab28fa795e7687e4c638394761..446c8982779ad411d83b2c5ff6215068a29a3cef 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixPart.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixPart.java
@@ -14,7 +14,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -42,7 +41,6 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.api.service.IDescriptionService;
 import eu.etaxonomy.cdm.api.service.IDescriptiveDataSetService;
-import eu.etaxonomy.cdm.api.service.UpdateResult;
 import eu.etaxonomy.cdm.api.service.dto.RowWrapperDTO;
 import eu.etaxonomy.cdm.model.description.DescriptiveDataSet;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
@@ -174,18 +172,11 @@ ICdmEntitySessionEnabled, IPartContentHasSupplementalData, IPartContentHasDetail
         matrix.getDescriptions().stream()
         .filter(o->o instanceof RowWrapperDTO)
         .forEach(wrapper->save((RowWrapperDTO)wrapper));
-        //save data set
-        CdmStore.getService(IDescriptiveDataSetService.class).merge(descriptiveDataSet);
-
-//        //save update results (taxon with aggregated description)
-//        if(updateResults!=null){
-//            updateResults.forEach(result->
-//            CdmStore.getService(result.getCdmEntity()).merge(result.getCdmEntity()));
-//        }
 
+        //save data set
+        CdmStore.getService(IDescriptiveDataSetService.class).merge(descriptiveDataSet, true);
 
         conversation.commit();
-        updateResults = null;
         dirty.setDirty(false);
     }