Project

General

Profile

« Previous | Next » 

Revision 9dc896c9

Added by Andreas Müller almost 7 years ago

fix #6368 rename table and class TaxonNameBase

View differences:

cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java
41 41 
import eu.etaxonomy.cdm.model.common.TreeIndex;
42 42 
import eu.etaxonomy.cdm.model.description.TaxonDescription;
43 43 
import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
44 
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
44 
import eu.etaxonomy.cdm.model.name.TaxonName;
45 45 
import eu.etaxonomy.cdm.model.reference.Reference;
46 46 
import eu.etaxonomy.cdm.model.taxon.Classification;
47 47 
import eu.etaxonomy.cdm.model.taxon.HomotypicGroupTaxonComparator;
......
169 169 
        List<TaxonNodeDto> dtos = new ArrayList<>(pageSize==null?25:pageSize);
170 170 
        Long totalCount = Long.valueOf(allRecords.size());
171 171 

  		




  172
  
  
    
        TaxonNameBase<?,?> parentName = null;


  		




  
  172
  
    
        TaxonName parentName = null;


  		




  173
  173
  
    

  		




  174
  174
  
    
        for(CdmBase record : PagerUtils.pageList(allRecords, pageIndex, pageSize)) {


  		




  175
  175
  
    
            if (record.isInstanceOf(TaxonNode.class)){


  		




  ......




  219
  219
  
    
        Taxon newAcceptedTaxon = (Taxon)this.taxonService.find(newAcceptedTaxonNode.getTaxon().getUuid());


  		




  220
  220
  
    
        newAcceptedTaxon = HibernateProxyHelper.deproxy(newAcceptedTaxon, Taxon.class);


  		




  221
  221
  
    
        // Move oldTaxon to newTaxon


  		




  222
  
  
    
        //TaxonNameBase<?,?> synonymName = oldTaxon.getName();


  		




  223
  
  
    
        TaxonNameBase<?,?> newSynonymName = CdmBase.deproxy(oldTaxon.getName());


  		




  
  222
  
    
        //TaxonName synonymName = oldTaxon.getName();


  		




  
  223
  
    
        TaxonName newSynonymName = CdmBase.deproxy(oldTaxon.getName());


  		




  224
  224
  
    
        HomotypicalGroup group = CdmBase.deproxy(newSynonymName.getHomotypicalGroup());


  		




  225
  225
  
    
        if (synonymType == null){


  		




  226
  226
  
    
            if (newSynonymName.isHomotypic(newAcceptedTaxon.getName())){


  		




  ......




  231
  231
  
    
        }


  		




  232
  232
  
    

  		




  233
  233
  
    
        //set homotypic group


  		




  234
  
  
    
        TaxonNameBase<?,?> newAcceptedTaxonName = HibernateProxyHelper.deproxy(newAcceptedTaxon.getName(), TaxonNameBase.class);


  		




  
  234
  
    
        TaxonName newAcceptedTaxonName = HibernateProxyHelper.deproxy(newAcceptedTaxon.getName(), TaxonName.class);


  		




  235
  235
  
    
        newAcceptedTaxon.setName(newAcceptedTaxonName);


  		




  236
  236
  
    
        // Move Synonym Relations to new Taxon


  		




  237
  237
  
    
        Synonym newSynonym = newAcceptedTaxon.addSynonymName(newSynonymName, citation, citationMicroReference,


  		












Also available in:  Unified diff