Project

General

Profile

Revision 2a0a678b

ID2a0a678b59b88779f6db98619be4d4510ea26f93
Parent ce490fbf
Child eabf0992

Added by Andreas Müller 6 months ago

fix #8140 update "lectotype" type designation status

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NameTypeDesignationStatus.java
42 42
	@SuppressWarnings("unused")
43 43
	private static final Logger logger = Logger.getLogger(NameTypeDesignationStatus.class);
44 44

  
45
	private static final UUID uuidAutomatic = UUID.fromString("e89d8b21-615a-4602-913f-1625bf39a69f");
45
	private static final UUID uuidOriginalDesignation = UUID.fromString("40032a44-973b-4a64-b25e-76f86c3a753c");
46 46
	private static final UUID uuidMonotypy = UUID.fromString("3fc639b2-9a64-45f8-9a81-657a4043ad74");
47
    private static final UUID uuidAutomatic = UUID.fromString("e89d8b21-615a-4602-913f-1625bf39a69f");
47 48
	private static final UUID uuidNotApplicable = UUID.fromString("91a9d6a9-7754-41cd-9f7e-be136f599f7e");
48
	private static final UUID uuidOriginalDesignation = UUID.fromString("40032a44-973b-4a64-b25e-76f86c3a753c");
49
	private static final UUID uuidPresentDesignation = UUID.fromString("e5f38f5d-995d-4470-a036-1a9792a543fc");
50
	private static final UUID uuidSubsequentMonotypy = UUID.fromString("2b5806d8-31b0-406e-a32a-4adac0c89ae4");
51
	private static final UUID uuidSubsequentDesignation = UUID.fromString("3e449e7d-a03c-4431-a7d3-aa258406f6b2");
52 49
	private static final UUID uuidTautonymy = UUID.fromString("84521f09-3e10-43f5-aa6f-2173a55a6790");
50

  
53 51
	private static final UUID uuidLectotype = UUID.fromString("4177c938-b741-40e1-95e5-4c53bd1ed87d");
52
	private static final UUID uuidSubsequentMonotypy = UUID.fromString("2b5806d8-31b0-406e-a32a-4adac0c89ae4");
53
    private static final UUID uuidSubsequentDesignation = UUID.fromString("3e449e7d-a03c-4431-a7d3-aa258406f6b2");
54
    private static final UUID uuidPresentDesignation = UUID.fromString("e5f38f5d-995d-4470-a036-1a9792a543fc");
54 55

  
55 56
	/**
56 57
	 * Factory method: creates an additional type designation status instance
......
200 201
		}
201 202
	}
202 203

  
203
	/**
204
	 * {@inheritDoc}
205
	 */
204
	//#8140
206 205
	@Override
207 206
    @Transient
208 207
	public boolean isLectotype(){
209 208
		if (
210 209
				this.equals(LECTOTYPE()) ||
211 210
				this.equals(SUBSEQUENT_DESIGNATION()) ||
212
				this.equals(PRESENT_DESIGNATION() )
211
				this.equals(SUBSEQUENT_MONOTYPY()) ||
212
                this.equals(PRESENT_DESIGNATION() )
213 213
				){
214 214
			return true;
215 215
		}else{
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/SpecimenTypeDesignationStatus.java
113 113

  
114 114
//************************** METHODS ********************************
115 115

  
116
	/* (non-Javadoc)
117
	 * @see eu.etaxonomy.cdm.model.common.DefinedTermBase#resetTerms()
118
	 */
119 116
	@Override
120 117
	public void resetTerms(){
121 118
		termMap = null;
......
130 127
        }
131 128
	}
132 129

  
130
	//#8140
133 131
	@Transient
134 132
	@Override
135 133
	public boolean isLectotype(){
136 134
		if (this.equals(LECTOTYPE()) ||
137 135
				this.equals(ISOLECTOTYPE()) ||
138 136
				this.equals(SECOND_STEP_LECTOTYPE()) ||
139
				this.equals(PARALECTOTYPE()) ){
137
				this.equals(PARALECTOTYPE()) ||
138
				//with source but not "lecto"
139
				this.equals(EPITYPE()) ||
140
				this.equals(ISOEPITYPE()) ||
141
				this.equals(NEOTYPE()) ||
142
				this.equals(ISONEOTYPE()) ||
143
				this.equals(SECOND_STEP_NEOTYPE())
144
		        ){
140 145
			return true;
141 146
		}else{
142 147
			return false;

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)