Project

General

Profile

« Previous | Next » 

Revision 1903cf2b

Added by Patrick Plitzner over 5 years ago

ref #7589 Remove UpdateResult handling from CharacterMatrix

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixPart.java
14 14
import java.util.Collection;
15 15
import java.util.Collections;
16 16
import java.util.HashMap;
17
import java.util.HashSet;
18 17
import java.util.List;
19 18
import java.util.Map;
20 19
import java.util.UUID;
......
42 41
import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
43 42
import eu.etaxonomy.cdm.api.service.IDescriptionService;
44 43
import eu.etaxonomy.cdm.api.service.IDescriptiveDataSetService;
45
import eu.etaxonomy.cdm.api.service.UpdateResult;
46 44
import eu.etaxonomy.cdm.api.service.dto.RowWrapperDTO;
47 45
import eu.etaxonomy.cdm.model.description.DescriptiveDataSet;
48 46
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
......
174 172
        matrix.getDescriptions().stream()
175 173
        .filter(o->o instanceof RowWrapperDTO)
176 174
        .forEach(wrapper->save((RowWrapperDTO)wrapper));
177
        //save data set
178
        CdmStore.getService(IDescriptiveDataSetService.class).merge(descriptiveDataSet);
179

  
180
//        //save update results (taxon with aggregated description)
181
//        if(updateResults!=null){
182
//            updateResults.forEach(result->
183
//            CdmStore.getService(result.getCdmEntity()).merge(result.getCdmEntity()));
184
//        }
185 175

  
176
        //save data set
177
        CdmStore.getService(IDescriptiveDataSetService.class).merge(descriptiveDataSet, true);
186 178

  
187 179
        conversation.commit();
188
        updateResults = null;
189 180
        dirty.setDirty(false);
190 181
    }
191 182

  

Also available in: Unified diff