Revision 50778c94
Added by Andreas Müller over 1 year ago
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/RegistrationDTO.java | ||
---|---|---|
24 | 24 |
|
25 | 25 |
import eu.etaxonomy.cdm.api.service.exception.RegistrationValidationException; |
26 | 26 |
import eu.etaxonomy.cdm.api.service.name.TypeDesignationDTO; |
27 |
import eu.etaxonomy.cdm.api.service.name.TypeDesignationSetFormatter; |
|
28 |
import eu.etaxonomy.cdm.api.service.name.TypeDesignationSetManager; |
|
29 | 27 |
import eu.etaxonomy.cdm.api.service.name.TypeDesignationSet; |
28 |
import eu.etaxonomy.cdm.api.service.name.TypeDesignationSetContainer; |
|
29 |
import eu.etaxonomy.cdm.api.service.name.TypeDesignationSetFormatter; |
|
30 | 30 |
import eu.etaxonomy.cdm.format.reference.NomenclaturalSourceFormatter; |
31 | 31 |
import eu.etaxonomy.cdm.model.common.VerbatimTimePeriod; |
32 | 32 |
import eu.etaxonomy.cdm.model.common.VersionableEntity; |
... | ... | |
61 | 61 |
|
62 | 62 |
private EntityReference name = null; |
63 | 63 |
|
64 |
private TypeDesignationSetManager typeDesignationManager;
|
|
64 |
private TypeDesignationSetContainer typeDesignationSetContainer;
|
|
65 | 65 |
|
66 | 66 |
private Registration reg; |
67 | 67 |
|
... | ... | |
114 | 114 |
case TYPIFICATION: |
115 | 115 |
default: |
116 | 116 |
try { |
117 |
typeDesignationManager = new TypeDesignationSetManager(reg.getTypeDesignations());
|
|
117 |
typeDesignationSetContainer = new TypeDesignationSetContainer(reg.getTypeDesignations());
|
|
118 | 118 |
summaryTaggedText.addAll(new TypeDesignationSetFormatter(false, true, true) |
119 |
.toTaggedText(typeDesignationManager));
|
|
119 |
.toTaggedText(typeDesignationSetContainer));
|
|
120 | 120 |
summary = TaggedCacheHelper.createString(summaryTaggedText); |
121 | 121 |
} catch (RegistrationValidationException e) { |
122 | 122 |
validationProblems.add("Validation errors: " + e.getMessage()); |
... | ... | |
139 | 139 |
public RegistrationDTO(Registration reg, TaxonName typifiedName, Reference publication) { |
140 | 140 |
this.reg = reg; |
141 | 141 |
citation = publication; |
142 |
// create a TypeDesignationSetManager with only a reference to the typifiedName for validation
|
|
143 |
typeDesignationManager = new TypeDesignationSetManager(typifiedName);
|
|
142 |
// create a TypeDesignationSetContainer with only a reference to the typifiedName for validation
|
|
143 |
typeDesignationSetContainer = new TypeDesignationSetContainer(typifiedName);
|
|
144 | 144 |
makeBibliographicCitationStrings(); |
145 | 145 |
makeNomenclaturalCitationString(); |
146 | 146 |
} |
... | ... | |
247 | 247 |
} |
248 | 248 |
|
249 | 249 |
public EntityReference getTypifiedNameRef() { |
250 |
return typeDesignationManager != null ? typeDesignationManager.getTypifiedNameAsEntityRef() : null;
|
|
250 |
return typeDesignationSetContainer != null ? typeDesignationSetContainer.getTypifiedNameAsEntityRef() : null;
|
|
251 | 251 |
} |
252 | 252 |
|
253 | 253 |
public TaxonName typifiedName() { |
254 |
return typeDesignationManager != null ? typeDesignationManager.getTypifiedName() : null;
|
|
254 |
return typeDesignationSetContainer != null ? typeDesignationSetContainer.getTypifiedName() : null;
|
|
255 | 255 |
} |
256 | 256 |
|
257 | 257 |
public EntityReference getNameRef() { |
... | ... | |
259 | 259 |
} |
260 | 260 |
|
261 | 261 |
public Map<VersionableEntity,TypeDesignationSet> getOrderedTypeDesignationSets() { |
262 |
return typeDesignationManager != null ? typeDesignationManager.getOrderedTypeDesignationSets() : null;
|
|
262 |
return typeDesignationSetContainer != null ? typeDesignationSetContainer.getOrderedTypeDesignationSets() : null;
|
|
263 | 263 |
} |
264 | 264 |
|
265 | 265 |
public TypeDesignationSet getTypeDesignationSet(VersionableEntity baseEntity) { |
266 |
return typeDesignationManager != null ? typeDesignationManager.getOrderedTypeDesignationSets().get(baseEntity) : null;
|
|
266 |
return typeDesignationSetContainer != null ? typeDesignationSetContainer.getOrderedTypeDesignationSets().get(baseEntity) : null;
|
|
267 | 267 |
} |
268 | 268 |
|
269 | 269 |
public Set<TypeDesignationBase> getTypeDesignationsInWorkingSet(VersionableEntity baseEntity) { |
... | ... | |
291 | 291 |
} |
292 | 292 |
|
293 | 293 |
private TypeDesignationBase<?> findTypeDesignation(TypeDesignationDTO ref) { |
294 |
return typeDesignationManager != null ? typeDesignationManager.findTypeDesignation(ref.getUuid()) : null;
|
|
294 |
return typeDesignationSetContainer != null ? typeDesignationSetContainer.findTypeDesignation(ref.getUuid()) : null;
|
|
295 | 295 |
} |
296 | 296 |
|
297 | 297 |
public Collection<TypeDesignationBase<?>> typeDesignations() { |
298 |
return typeDesignationManager != null ? typeDesignationManager.getTypeDesignations() : null;
|
|
298 |
return typeDesignationSetContainer != null ? typeDesignationSetContainer.getTypeDesignations() : null;
|
|
299 | 299 |
} |
300 | 300 |
|
301 | 301 |
private void makeNomenclaturalCitationString() { |
Also available in: Unified diff
ref #10089 rename TypeDesignationSetManager to TypeDesignationSetContainer in cdmlib