Project

General

Profile

« Previous | Next » 

Revision f972ab15

Added by Andreas Müller about 3 years ago

ref #9331 adapt vaadin to NamedSource

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/view/name/SpecimenTypeDesignationWorkingsetEditorPresenter.java
40 40 
import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
41 41 
import eu.etaxonomy.cdm.model.common.AnnotationType;
42 42 
import eu.etaxonomy.cdm.model.common.CdmBase;
43 
import eu.etaxonomy.cdm.model.description.DescriptionElementSource;
44 43 
import eu.etaxonomy.cdm.model.location.Country;
45 44 
import eu.etaxonomy.cdm.model.name.Registration;
46 45 
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;
......
49 48 
import eu.etaxonomy.cdm.model.occurrence.Collection;
50 49 
import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
51 50 
import eu.etaxonomy.cdm.model.permission.CRUD;
51 
import eu.etaxonomy.cdm.model.reference.NamedSource;
52 
import eu.etaxonomy.cdm.model.reference.NamedSourceBase;
52 53 
import eu.etaxonomy.cdm.model.reference.Reference;
53 54 
import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
54 55 
import eu.etaxonomy.cdm.model.reference.ReferenceType;
......
133 134 
     * This may be any type listed in {@link RegistrationUIDefaults#NOMECLATURAL_PUBLICATION_UNIT_TYPES}
134 135 
     * but never a {@link ReferenceType#Section}
135 136 
     */
136 
    private DescriptionElementSource publishedUnit;
137 
    private NamedSourceBase publishedUnit;
137 138 

  		




  138
  139
  
    
    private Map<CollectionPopupEditor, SpecimenTypeDesignationDTORow> collectionPopupEditorsRowMap = new HashMap<>();


  		




  139
  140
  
    

  		




  ......




  191
  192
  
    
            rootEntities.add(registration);


  		




  192
  193
  
    
            setInTypedesignationOnlyAct(Optional.of(Boolean.valueOf(registration.getName() == null)));


  		




  193
  194
  
    
            try {


  		




  194
  
  
    
                DescriptionElementSource pubUnitSource = RegistrationDTO.findPublishedUnit(registration);


  		




  
  195
  
    
                NamedSourceBase pubUnitSource = RegistrationDTO.findPublishedUnit(registration);


  		




  195
  196
  
    
                if(pubUnitSource == null) {


  		




  196
  197
  
    
                    Reference reference = getRepo().getReferenceService().load(idset.getPublishedUnitUuid());


  		




  197
  
  
    
                    pubUnitSource = DescriptionElementSource.NewPrimarySourceInstance(reference, null);


  		




  
  198
  
    
                    pubUnitSource = NamedSource.NewPrimarySourceInstance(reference, null);


  		




  198
  199
  
    
                }


  		




  199
  200
  
    
                setPublishedUnit(pubUnitSource);


  		




  200
  201
  
    
            } catch (Exception e) {


  		




  ......




  582
  583
  
    
     * @return


  		




  583
  584
  
    
     *  the {@link #publishedUnit}


  		




  584
  585
  
    
     */


  		




  585
  
  
    
    public DescriptionElementSource getPublishedUnit() {


  		




  
  586
  
    
    public NamedSourceBase getPublishedUnit() {


  		




  586
  587
  
    
        return publishedUnit;


  		




  587
  588
  
    
    }


  		




  588
  589
  
    

  		




  ......




  591
  592
  
    
     *  The unit of publication in which the type designation has been published.


  		




  592
  593
  
    
     *  This may be any type listed in {@link RegistrationUIDefaults#NOMECLATURAL_PUBLICATION_UNIT_TYPES}


  		




  593
  594
  
    
     */


  		




  594
  
  
    
    protected void setPublishedUnit(DescriptionElementSource publishedUnit) throws Exception {


  		




  
  595
  
    
    protected void setPublishedUnit(NamedSourceBase publishedUnit) throws Exception {


  		




  595
  596
  
    
        if(publishedUnit == null) {


  		




  596
  597
  
    
            throw new NullPointerException();


  		




  597
  598
  
    
        }


  		












Also available in:  Unified diff