Revision d09294f4
Added by Katja Luther over 2 years ago
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dto/FeatureDto.java | ||
---|---|---|
18 | 18 |
import java.util.UUID; |
19 | 19 |
|
20 | 20 |
import eu.etaxonomy.cdm.common.URI; |
21 |
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; |
|
21 | 22 |
import eu.etaxonomy.cdm.model.common.CdmClass; |
22 | 23 |
import eu.etaxonomy.cdm.model.description.Feature; |
23 | 24 |
import eu.etaxonomy.cdm.model.description.MeasurementUnit; |
... | ... | |
72 | 73 |
static public FeatureDto fromFeature(Feature term) { |
73 | 74 |
UUID partOfUuid = term.getPartOf() != null? term.getPartOf().getUuid(): null; |
74 | 75 |
UUID kindOfUuid = term.getKindOf() != null? term.getKindOf().getUuid(): null; |
75 |
UUID vocUuid = term.getVocabulary() != null? term.getVocabulary().getUuid(): null; |
|
76 |
TermVocabulary<?> vocabulary = HibernateProxyHelper.deproxy(term.getVocabulary()); |
|
77 |
UUID vocUuid = vocabulary != null? vocabulary.getUuid(): null; |
|
76 | 78 |
Set<TermVocabularyDto> supportedCategoricalEnumerations = new HashSet<>(); |
77 | 79 |
for (TermVocabulary<State> stateVoc:term.getSupportedCategoricalEnumerations()){ |
78 | 80 |
supportedCategoricalEnumerations.add(TermVocabularyDto.fromVocabulary(stateVoc)); |
Also available in: Unified diff
ref #9802, #9843: fix display label in rowwrapper