Project

General

Profile

« Previous | Next » 

Revision e3a4a3ff

Added by Andreas Müller almost 7 years ago

ref #6446 merge taxon name subclasses in TaxEditor

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/association/TaxonAssociationDetailElement.java
32 32 
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
33 33 
import eu.etaxonomy.cdm.model.common.CdmBase;
34 34 
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;
35 
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
35 
import eu.etaxonomy.cdm.model.name.TaxonName;
36 36 
import eu.etaxonomy.cdm.model.occurrence.DeterminationEvent;
37 37 
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
38 38 
import eu.etaxonomy.taxeditor.model.MessagingUtils;
......
139 139 
        else if(element instanceof SpecimenTypeDesignation){
140 140 
            SpecimenTypeDesignation typeDesignation = (SpecimenTypeDesignation)element;
141 141 
            String label = typeDesignation.getTypeStatus()!=null?typeDesignation.getTypeStatus().getLabel()+" of ":"Type of ";
142 
            Set<TaxonNameBase> typifiedNames = typeDesignation.getTypifiedNames();
143 
            for (TaxonNameBase taxonNameBase : typifiedNames) {
142 
            Set<TaxonName> typifiedNames = typeDesignation.getTypifiedNames();
143 
            for (TaxonName taxonNameBase : typifiedNames) {
144 144 
                label += taxonNameBase+", ";
145 145 
            }
146 146 
            if(label.endsWith(", ")){
......
163 163 
            Object firstElement = ((IStructuredSelection) event.getSelection()).getFirstElement();
164 164 
            if(firstElement instanceof SpecimenTypeDesignation){
165 165 
            	SpecimenTypeDesignation typeDesignation = (SpecimenTypeDesignation)firstElement;
166 
            	Set<TaxonNameBase> typifiedNames = typeDesignation.getTypifiedNames();
166 
            	Set<TaxonName> typifiedNames = typeDesignation.getTypifiedNames();
167 167 
            	if(typifiedNames.size()==1){
168 168 
            		firstElement = typifiedNames.iterator().next();
169 169 
            	}

Also available in: Unified diff