Revision 121a05dc
Added by Andreas Müller about 8 years ago
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalStatusType.java | ||
---|---|---|
100 | 100 |
private static final UUID uuidCombNov = UUID.fromString("ed508710-deef-44b1-96f6-1ce6d2c9c884"); |
101 | 101 |
private static final UUID uuidOrthographyRejected = UUID.fromString("39a25673-f716-4ec7-ae27-2498fce43166"); |
102 | 102 |
private static final UUID uuidConservedDesig = UUID.fromString("4e9c9702-a74d-4033-9d47-792ad123712c"); |
103 |
private static final UUID uuidIned = UUID.fromString("51429574-c6f9-4aa1-bab9-0bbc5b160ba1"); |
|
104 | 103 |
|
105 | 104 |
//zoological uuids |
106 | 105 |
public static final UUID uuidIcznNomStatusVocabulary = UUID.fromString("5e3c08e9-13a9-498e-861e-b9b5656ab6ac"); |
... | ... | |
211 | 210 |
public boolean isInvalidType(){ |
212 | 211 |
if (this.equals(INVALID()) |
213 | 212 |
|| this.equals(NUDUM()) |
214 |
|| this.equals(PROVISIONAL()) || this.equals(INED())
|
|
213 |
|| this.equals(PROVISIONAL()) |
|
215 | 214 |
|| this.equals(COMBINATION_INVALID()) |
216 | 215 |
|| this.equals(OPUS_UTIQUE_OPPR()) |
217 | 216 |
|| this.equals(ZOO_NOT_AVAILABLE()) |
... | ... | |
633 | 632 |
return getTermByUuid(uuidSanctioned); |
634 | 633 |
} |
635 | 634 |
|
636 |
/** |
|
637 |
* Returns the nomenclatural status type "inedited". {@link BotanicalName Botanical names} |
|
638 |
* are "inedited" if they were not yet published. |
|
639 |
* |
|
640 |
* @see #isInvalidType() |
|
641 |
* @see #PROVISIONAL() |
|
642 |
* @deprecated this status is deprecated as it is a duplicate for Provisional |
|
643 |
*/ |
|
644 |
@Deprecated |
|
645 |
public static final NomenclaturalStatusType INED(){ |
|
646 |
return getTermByUuid(uuidIned); |
|
647 |
} |
|
648 |
|
|
649 | 635 |
/** |
650 | 636 |
* Returns the nomenclatural status type "invalid" (this corresponds to |
651 | 637 |
* "not available" for {@link ZoologicalName zoological names}). The use of "invalid" |
cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImplRegExBase.java | ||
---|---|---|
220 | 220 |
protected static String pNomStatusOrthVar = "orth\\." + fWs + "(var\\.|rej\\.)"; |
221 | 221 |
protected static String pNomStatusComb = "comb\\." + fWs + "(inval\\.|illeg\\.|nov\\.)"; |
222 | 222 |
protected static String pNomStatusOpus = "opus\\." + fWs + "utique" + fWs + "oppr\\."; |
223 |
protected static String pNomStatusIned = "ined\\."; |
|
224 | 223 |
|
225 |
protected static String pNomStatus = "(" + pNomStatusNom + "|" + pNomStatusOrthVar + "|" +pNomStatusComb + "|" + pNomStatusOpus + "|" + pNomStatusIned + ")";
|
|
224 |
protected static String pNomStatus = "(" + pNomStatusNom + "|" + pNomStatusOrthVar + "|" +pNomStatusComb + "|" + pNomStatusOpus + ")"; |
|
226 | 225 |
protected static String pNomStatusPhrase1 = "," + fWs + pNomStatus; |
227 | 226 |
protected static String pNomStatusPhrase2 = "\\[" + fWs + pNomStatus + "\\]"; |
228 | 227 |
|
cdmlib-model/src/main/resources/terms/NomenclaturalStatusType.csv | ||
---|---|---|
26 | 26 |
"a5055d80-dbba-4660-b091-a1835d59fe7c",,"Opus Utique Oppr","Opus Utique Oppr","opus. utique oppr." |
27 | 27 |
"92a76bd0-6ea8-493f-98e0-4be0b98c092f",,"Subnudum","Subnudum","nom. subnud." |
28 | 28 |
"ed508710-deef-44b1-96f6-1ce6d2c9c884",,"New combination","New combination","comb. nov." |
29 |
"51429574-c6f9-4aa1-bab9-0bbc5b160ba1",,"ined.","Name not yet published","ined." |
|
30 | 29 |
"39a25673-f716-4ec7-ae27-2498fce43166",,"Orthography Rejected","Orthography Rejected","orth. rej." |
Also available in: Unified diff
Remove nomenclatural status type ined. as it is a duplicate for nom.
provis. (related to Cuba #5443)