Project

General

Profile

« Previous | Next » 

Revision d4db3c89

Added by Katja Luther almost 4 years ago

ref #8785: adapt to changes in method signature of mergeDescriptions

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixPart.java
42 42 
import eu.etaxonomy.cdm.api.service.DeleteResult;
43 43 
import eu.etaxonomy.cdm.api.service.IDescriptionService;
44 44 
import eu.etaxonomy.cdm.api.service.IDescriptiveDataSetService;
45 
import eu.etaxonomy.cdm.api.service.UpdateResult;
45 46 
import eu.etaxonomy.cdm.api.service.config.RemoveDescriptionsFromDescriptiveDataSetConfigurator;
46 47 
import eu.etaxonomy.cdm.api.service.dto.DescriptionBaseDto;
47 48 
import eu.etaxonomy.cdm.api.service.dto.RowWrapperDTO;
48 49 
import eu.etaxonomy.cdm.api.service.dto.SpecimenRowWrapperDTO;
50 
import eu.etaxonomy.cdm.model.common.CdmBase;
49 51 
import eu.etaxonomy.cdm.model.description.DescriptionBase;
50 52 
import eu.etaxonomy.cdm.model.description.DescriptiveDataSet;
51 53 
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
52 54 
import eu.etaxonomy.cdm.model.term.TermType;
53 
import eu.etaxonomy.cdm.persistence.dto.MergeResult;
54 55 
import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
55 56 
import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;
56 57 
import eu.etaxonomy.taxeditor.editor.l10n.Messages;
......
215 216 

  		




  216
  217
  
    
        }


  		




  217
  218
  
    

  		




  218
  
  
    
        List<MergeResult<DescriptionBase>> results = CdmStore.getService(IDescriptionService.class).mergeDescriptions(descriptionsToMerge, matrix.getDescriptiveDataSet().getUuid(), true);


  		




  
  219
  
    
        UpdateResult results = CdmStore.getService(IDescriptionService.class).mergeDescriptions(descriptionsToMerge, matrix.getDescriptiveDataSet().getUuid());


  		




  219
  220
  
    
        matrix.getRowsToMerge().clear();


  		




  220
  221
  
    
        conversation.commit();


  		




  221
  222
  
    
        HashMap<UUID, DescriptionBase> descriptionResults = new HashMap<>();


  		




  222
  
  
    
        for (MergeResult result: results){


  		




  223
  
  
    
            if (result.getMergedEntity() != null){


  		




  224
  
  
    
                descriptionResults.put(result.getMergedEntity().getUuid(), (DescriptionBase)result.getMergedEntity());


  		




  
  223
  
    
        for (CdmBase result: results.getUpdatedObjects()){


  		




  
  224
  
    
            if (result instanceof DescriptionBase){


  		




  
  225
  
    
                descriptionResults.put(result.getUuid(), (DescriptionBase)result);


  		




  225
  226
  
    
            }


  		




  226
  227
  
    
        }


  		




  227
  228
  
    
        List<Object> updateRows = matrix.getDescriptions().stream().filter(row->descriptionResults.keySet().contains(((RowWrapperDTO)row).getDescription().getDescription().getUuid())).collect(Collectors.toList());


  		












Also available in:  Unified diff