Project

General

Profile

« Previous | Next » 

Revision a4ef0a5a

Added by Andreas Kohlbecker over 6 years ago

SpecimenTypeDesignationWorkingSetDTO with nore knowledge on typifiedName and citation simplifies presenters

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/model/registration/SpecimenTypeDesignationWorkingSetDTO.java
21 21
import eu.etaxonomy.cdm.model.location.NamedArea;
22 22
import eu.etaxonomy.cdm.model.location.Point;
23 23
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;
24
import eu.etaxonomy.cdm.model.name.TaxonName;
24 25
import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
25 26
import eu.etaxonomy.cdm.model.occurrence.GatheringEvent;
27
import eu.etaxonomy.cdm.model.reference.Reference;
26 28

  
27 29
/**
28 30
 * @author a.kohlbecker
......
41 43

  
42 44
    OWNER owner;
43 45

  
44
    private Integer citationEntityID;
46
    private Reference citation;
45 47

  
46
    private Integer typifiedNameEntityID;
48
    private TaxonName typifiedName;
47 49

  
48 50
    /**
49 51
     *
......
51 53
     * @param baseEntity
52 54
     * @param specimenTypeDesignations can be <code>null</code>
53 55
     */
54
    public SpecimenTypeDesignationWorkingSetDTO(OWNER owner, VersionableEntity baseEntity, List<SpecimenTypeDesignation> specimenTypeDesignations) {
56
    public SpecimenTypeDesignationWorkingSetDTO(OWNER owner, VersionableEntity baseEntity, List<SpecimenTypeDesignation> specimenTypeDesignations, Reference citation, TaxonName typifiedName) {
55 57
        super();
56 58
        this.owner = owner;
57 59
        this.baseEntity = baseEntity;
60
        this.citation = citation;
61
        this.typifiedName = typifiedName;
58 62
        if(baseEntity instanceof FieldUnit){
59 63
            this.fieldUnit = (FieldUnit) baseEntity;
60 64
            if(fieldUnit.getGatheringEvent() == null){
......
73 77
     * @param citationEntityID
74 78
     * @param typifiedNameEntityID
75 79
     */
76
    public SpecimenTypeDesignationWorkingSetDTO(OWNER reg, FieldUnit newfieldUnit, Integer citationEntityID,
77
            Integer typifiedNameEntityID) {
78
        this(reg, newfieldUnit, null);
79
        this.citationEntityID = citationEntityID;
80
        this.typifiedNameEntityID = typifiedNameEntityID;
80
    public SpecimenTypeDesignationWorkingSetDTO(OWNER reg, FieldUnit newfieldUnit, Reference citation, TaxonName typifiedName) {
81
        this(reg, newfieldUnit, null, citation, typifiedName);
81 82
    }
82 83

  
83 84
    /**
......
281 282
    }
282 283

  
283 284
    /**
284
     * @param id
285
     * @return the citation
285 286
     */
286
    public void setCitationEntityID(int id) {
287
        citationEntityID = id;
288

  
287
    public Reference getCitation() {
288
        return citation;
289 289
    }
290 290

  
291 291
    /**
292
     * @return
292
     * @param citation the citation to set
293 293
     */
294
    public int getCitationEntityID() {
295
        return citationEntityID;
294
    public void setCitation(Reference citation) {
295
        this.citation = citation;
296 296
    }
297 297

  
298 298
    /**
299
     * @param id
299
     * @return the typifiedName
300 300
     */
301
    public void setTypifiedNameEntityID(int id) {
302
        typifiedNameEntityID = id;
303

  
301
    public TaxonName getTypifiedName() {
302
        return typifiedName;
304 303
    }
305 304

  
306 305
    /**
307
     * @return
306
     * @param typifiedName the typifiedName to set
308 307
     */
309
    public int getTypifiedNameEntityID() {
310
        return typifiedNameEntityID;
308
    public void setTypifiedName(TaxonName typifiedName) {
309
        this.typifiedName = typifiedName;
311 310
    }
312 311

  
312

  
313 313
}

Also available in: Unified diff