Revision 417e3cc8
Added by Andreas Kohlbecker over 6 years ago
| src/main/java/eu/etaxonomy/cdm/vaadin/model/registration/SpecimenTypeDesignationDTO.java | ||
|---|---|---|
| 15 | 15 |
|
| 16 | 16 |
import eu.etaxonomy.cdm.api.utility.DerivedUnitConversionException; |
| 17 | 17 |
import eu.etaxonomy.cdm.api.utility.DerivedUnitConverter; |
| 18 |
import eu.etaxonomy.cdm.api.utility.DerivedUnitConverterFactory; |
|
| 18 | 19 |
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; |
| 19 | 20 |
import eu.etaxonomy.cdm.model.common.DefinedTerm; |
| 20 | 21 |
import eu.etaxonomy.cdm.model.common.IdentifiableSource; |
| ... | ... | |
| 107 | 108 |
|
| 108 | 109 |
SpecimenOrObservationType convertToType = specimenOrObservationTypeFor(kindOfUnit); |
| 109 | 110 |
if(requiredSpecimenType.equals(MediaSpecimen.class)){
|
| 110 |
DerivedUnitConverter<MediaSpecimen> converter = new DerivedUnitConverter<MediaSpecimen> (typeSpecimen);
|
|
| 111 |
DerivedUnitConverter<MediaSpecimen> converter = DerivedUnitConverterFactory.createDerivedUnitConverter(typeSpecimen, MediaSpecimen.class);
|
|
| 111 | 112 |
convertedSpecimen = converter.convertTo((Class<MediaSpecimen>)requiredSpecimenType, convertToType); |
| 112 | 113 |
} else {
|
| 113 | 114 |
if(currentType == MediaSpecimen.class){
|
| ... | ... | |
| 115 | 116 |
// set null to allow conversion |
| 116 | 117 |
mediaSpecimen.setMediaSpecimen(null); |
| 117 | 118 |
} |
| 118 |
DerivedUnitConverter<DerivedUnit> converter = new DerivedUnitConverter<DerivedUnit> (typeSpecimen);
|
|
| 119 |
DerivedUnitConverter<DerivedUnit> converter = DerivedUnitConverterFactory.createDerivedUnitConverter(typeSpecimen, DerivedUnit.class);
|
|
| 119 | 120 |
convertedSpecimen = converter.convertTo((Class<DerivedUnit>)requiredSpecimenType, convertToType); |
| 120 | 121 |
} |
| 121 | 122 |
|
Also available in: Unified diff
fix #7114 using the DerivedUnitConverterFactory in SpecimenTypeDesignationDTO