Project

General

Profile

« Previous | Next » 

Revision b72ce91f

Added by Patrick Plitzner almost 10 years ago

  • removed debug output
    • made DerivateLabelProvider use occurrence service

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java
19 19
import org.hibernate.LazyInitializationException;
20 20

  
21 21
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
22
import eu.etaxonomy.cdm.api.service.IOccurrenceService;
22 23
import eu.etaxonomy.cdm.model.common.DefinedTerm;
23 24
import eu.etaxonomy.cdm.model.molecular.DnaSample;
24 25
import eu.etaxonomy.cdm.model.molecular.Sequence;
......
104 105
     * @return
105 106
     */
106 107
    public static String getDerivateText(Object element){
107
        TreeNode parentNode = null;
108 108
        if(element instanceof TreeNode){
109
            parentNode = ((TreeNode) element).getParent();
110 109
            //unwrap specimen from TreeNode
111 110
            element = ((TreeNode) element).getValue();
112 111
        }
......
143 142
        else if(element instanceof DerivedUnit){
144 143
            DerivedUnit derivedUnit = (DerivedUnit)element;
145 144
            if(derivedUnit.getRecordBasis()==SpecimenOrObservationType.PreservedSpecimen){
146
                if(parentNode!=null && parentNode.getValue() instanceof FieldUnit){
147
                    FieldUnit fieldUnit = (FieldUnit) parentNode.getValue();
145
                java.util.Collection<FieldUnit> fieldUnits = CdmStore.getService(IOccurrenceService.class).getFieldUnits(derivedUnit.getUuid());
146
                if(fieldUnits!=null && !fieldUnits.isEmpty()){
147
                    FieldUnit fieldUnit = fieldUnits.iterator().next();
148 148
                    GatheringEvent gatheringEvent = fieldUnit.getGatheringEvent();
149 149
                    if(gatheringEvent!=null){
150 150
                        label += gatheringEvent.getCollector()!=null?gatheringEvent.getCollector()+", ":"";

Also available in: Unified diff