Project

General

Profile

« Previous | Next » 

Revision 52002c73

Added by Cherian Mathew over 9 years ago

merge from trunk

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java
13 13
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
14 14
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException;
15 15
import eu.etaxonomy.cdm.api.service.IOccurrenceService;
16
import eu.etaxonomy.cdm.model.media.Media;
16 17
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
17 18
import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
18 19
import eu.etaxonomy.cdm.model.occurrence.MediaSpecimen;
......
83 84
        } else {
84 85
            if (SpecimenOrObservationType.Media.equals(specOrObsType)
85 86
                    || ((specOrObsType.getKindOf() != null) && specOrObsType.getKindOf().equals(SpecimenOrObservationType.Media))) {
86
	            return MediaSpecimen.NewInstance(specOrObsType);
87
	            MediaSpecimen mediaSpecimen = MediaSpecimen.NewInstance(specOrObsType);
88
	            //a MediaSpecimen with no media attached does not make sense. Hence, we add one
89
                mediaSpecimen.setMediaSpecimen(Media.NewInstance());
90
                return mediaSpecimen;
87 91
            } else if (specOrObsType.equals(SpecimenOrObservationType.FieldUnit)) {
88 92
                return FieldUnit.NewInstance();
89 93
            } else {

Also available in: Unified diff