Revision 71559ffe
Added by Katja Luther over 2 years ago
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/SpecimenRowWrapperDTO.java | ||
---|---|---|
33 | 33 |
private String identifier; |
34 | 34 |
private NamedArea country; |
35 | 35 |
|
36 |
public SpecimenRowWrapperDTO(DescriptionBaseDto description, SpecimenOrObservationType type, TaxonNodeDto taxonNode, FieldUnit fieldUnit, String identifier, |
|
36 |
public SpecimenRowWrapperDTO(DescriptionBaseDto description, SpecimenOrObservationBaseDTO specimen, SpecimenOrObservationType type, TaxonNodeDto taxonNode, FieldUnit fieldUnit, String identifier,
|
|
37 | 37 |
NamedArea country) { |
38 | 38 |
super(description, taxonNode); |
39 | 39 |
if (fieldUnit != null){ |
... | ... | |
41 | 41 |
} |
42 | 42 |
this.identifier = identifier; |
43 | 43 |
this.country = country; |
44 |
this.specimenDto = description.getSpecimenDto();
|
|
44 |
this.specimenDto = specimen;
|
|
45 | 45 |
this.type = type; |
46 | 46 |
} |
47 | 47 |
|
48 | 48 |
|
49 | 49 |
public SpecimenRowWrapperDTO(SpecimenOrObservationBase specimen, TaxonNodeDto taxonNode, FieldUnit fieldUnit, String identifier, |
50 | 50 |
NamedArea country) { |
51 |
super(new DescriptionBaseDto(specimen), taxonNode);
|
|
51 |
super(new DescriptionBaseDto(new UuidAndTitleCache<SpecimenOrObservationBase>(specimen.getUuid(), specimen.getId(), specimen.getTitleCache())), taxonNode);
|
|
52 | 52 |
if (fieldUnit != null){ |
53 | 53 |
this.fieldUnit = new UuidAndTitleCache<>(fieldUnit.getUuid(), fieldUnit.getId(), fieldUnit.getTitleCache()); |
54 | 54 |
} |
... | ... | |
60 | 60 |
|
61 | 61 |
public SpecimenRowWrapperDTO(SpecimenOrObservationBase specimen, TaxonNodeDto taxonNode, UuidAndTitleCache<FieldUnit> fieldUnit, String identifier, |
62 | 62 |
NamedArea country) { |
63 |
super(new DescriptionBaseDto(specimen), taxonNode);
|
|
63 |
super(new DescriptionBaseDto(new UuidAndTitleCache<SpecimenOrObservationBase>(specimen.getUuid(), specimen.getId(), specimen.getTitleCache())), taxonNode);
|
|
64 | 64 |
if (fieldUnit != null){ |
65 | 65 |
this.fieldUnit = fieldUnit; |
66 | 66 |
} |
Also available in: Unified diff
ref #9710: switch to dtos for descriptive data set and descriptions for character matrix