Revision eac82784
Added by Andreas Müller about 5 years ago
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java | ||
---|---|---|
57 | 57 |
import eu.etaxonomy.cdm.model.common.ReferencedEntityBase; |
58 | 58 |
import eu.etaxonomy.cdm.model.common.RelationshipBase; |
59 | 59 |
import eu.etaxonomy.cdm.model.common.RelationshipBase.Direction; |
60 |
import eu.etaxonomy.cdm.model.common.SourcedEntityBase; |
|
60 | 61 |
import eu.etaxonomy.cdm.model.description.DescriptionElementSource; |
61 | 62 |
import eu.etaxonomy.cdm.model.name.HomotypicalGroup; |
62 | 63 |
import eu.etaxonomy.cdm.model.name.HybridRelationship; |
... | ... | |
76 | 77 |
import eu.etaxonomy.cdm.persistence.dao.common.ICdmGenericDao; |
77 | 78 |
import eu.etaxonomy.cdm.persistence.dao.common.IOrderedTermVocabularyDao; |
78 | 79 |
import eu.etaxonomy.cdm.persistence.dao.common.IReferencedEntityDao; |
80 |
import eu.etaxonomy.cdm.persistence.dao.common.ISourcedEntityDao; |
|
79 | 81 |
import eu.etaxonomy.cdm.persistence.dao.common.ITermVocabularyDao; |
80 | 82 |
import eu.etaxonomy.cdm.persistence.dao.name.IHomotypicalGroupDao; |
81 | 83 |
import eu.etaxonomy.cdm.persistence.dao.name.INomenclaturalStatusDao; |
... | ... | |
105 | 107 |
@Qualifier("refEntDao") |
106 | 108 |
protected IReferencedEntityDao<ReferencedEntityBase> referencedEntityDao; |
107 | 109 |
@Autowired |
110 |
@Qualifier("sourcedEntityDao") |
|
111 |
protected ISourcedEntityDao<SourcedEntityBase<?>> sourcedEntityDao; |
|
112 |
@Autowired |
|
108 | 113 |
private INomenclaturalStatusDao nomStatusDao; |
109 | 114 |
@Autowired |
110 | 115 |
private ITypeDesignationDao typeDesignationDao; |
... | ... | |
195 | 200 |
@Transactional |
196 | 201 |
public DeleteResult deleteTypeDesignation(TaxonName name, TypeDesignationBase<?> typeDesignation){ |
197 | 202 |
if(typeDesignation != null && typeDesignation .isPersited()){ |
198 |
typeDesignation = HibernateProxyHelper.deproxy(referencedEntityDao.load(typeDesignation.getUuid()), TypeDesignationBase.class);
|
|
203 |
typeDesignation = HibernateProxyHelper.deproxy(sourcedEntityDao.load(typeDesignation.getUuid()), TypeDesignationBase.class);
|
|
199 | 204 |
} |
200 | 205 |
|
201 | 206 |
DeleteResult result = new DeleteResult(); |
... | ... | |
229 | 234 |
@Transactional(readOnly = false) |
230 | 235 |
public DeleteResult deleteTypeDesignation(UUID nameUuid, UUID typeDesignationUuid){ |
231 | 236 |
TaxonName nameBase = load(nameUuid); |
232 |
TypeDesignationBase<?> typeDesignation = HibernateProxyHelper.deproxy(referencedEntityDao.load(typeDesignationUuid), TypeDesignationBase.class);
|
|
237 |
TypeDesignationBase<?> typeDesignation = HibernateProxyHelper.deproxy(sourcedEntityDao.load(typeDesignationUuid), TypeDesignationBase.class);
|
|
233 | 238 |
return deleteTypeDesignation(nameBase, typeDesignation); |
234 | 239 |
} |
235 | 240 |
|
Also available in: Unified diff
ref #8017 add sources to TypeDesignationBase (cont.)