Project

General

Profile

« Previous | Next » 

Revision 292fe199

Added by Andreas Müller almost 7 years ago

ref #6446, ref #6368 remove TaxonnameBase in vaadin,

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationDTO.java
19 19 
import eu.etaxonomy.cdm.mock.Registration;
20 20 
import eu.etaxonomy.cdm.mock.RegistrationStatus;
21 21 
import eu.etaxonomy.cdm.model.common.TimePeriod;
22 
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
22 
import eu.etaxonomy.cdm.model.name.TaxonName;
23 23 
import eu.etaxonomy.cdm.model.name.TypeDesignationBase;
24 24 
import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;
25 25 
import eu.etaxonomy.cdm.model.reference.Reference;
......
41 41 

  		




  42
  42
  
    
    private Set<Registration> blockedBy = new HashSet<>();


  		




  43
  43
  
    

  		




  44
  
  
    
    private TaxonNameBase<?, ?> typifiedName;


  		




  
  44
  
    
    private TaxonName typifiedName;


  		




  45
  45
  
    

  		




  46
  46
  
    
    private TimePeriod datePublished;


  		




  47
  47
  
    

  		




  ......




  92
  92
  
    
     * @return


  		




  93
  93
  
    
     * @throws RegistrationValidationException


  		




  94
  94
  
    
     */


  		




  95
  
  
    
    private TaxonNameBase<?,?> findTypifiedName() throws RegistrationValidationException {


  		




  
  95
  
    
    private TaxonName findTypifiedName() throws RegistrationValidationException {


  		




  96
  96
  
    

  		




  97
  97
  
    
        List<String> problems = new ArrayList<>();


  		




  98
  98
  
    

  		




  99
  
  
    
        TaxonNameBase<?,?> typifiedName = null;


  		




  
  99
  
    
        TaxonName typifiedName = null;


  		




  100
  100
  
    

  		




  101
  101
  
    
        for(TypeDesignationBase<?> typeDesignation : reg.getTypeDesignations()){


  		




  102
  102
  
    
            typeDesignation.getTypifiedNames();


  		




  ......




  116
  116
  
    
                typifiedName = typeDesignation.getTypifiedNames().iterator().next();


  		




  117
  117
  
    
            } else {


  		




  118
  118
  
    
                // compare


  		




  119
  
  
    
                TaxonNameBase<?,?> otherTypifiedName = typeDesignation.getTypifiedNames().iterator().next();


  		




  
  119
  
    
                TaxonName otherTypifiedName = typeDesignation.getTypifiedNames().iterator().next();


  		




  120
  120
  
    
                if(typifiedName.getId() != otherTypifiedName.getId()){


  		




  121
  121
  
    
                  //TODO instead throw RegistrationValidationException()


  		




  122
  122
  
    
                    problems.add("Multiple typifiedName in " + typeDesignation.toString());


  		












Also available in:  Unified diff