From ca8ee70a5e29b6f2bed40235d7ae06770959d73b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Mon, 20 Dec 2010 10:31:00 +0000 Subject: [PATCH] marker type "endemic" and features "status" and "systematics" in cdmlib-model --- .../etaxonomy/cdm/model/common/MarkerType.java | 7 ++++++- .../cdm/model/description/Feature.java | 18 +++++++++++++++++- .../src/main/resources/terms/Feature.csv | 4 +++- .../src/main/resources/terms/MarkerType.csv | 3 ++- 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/MarkerType.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/MarkerType.java index 51ec29c2db..83e43c4e9d 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/MarkerType.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/MarkerType.java @@ -47,7 +47,8 @@ public class MarkerType extends DefinedTermBase { private static final UUID uuidComplete = UUID.fromString("b4b1b2ab-89a8-4ce6-8110-d60b8b1bc433"); private static final UUID uuidPublish = UUID.fromString("0522c2b3-b21c-400c-80fc-a251c3501dbc"); private static final UUID uuidInBibliography = UUID.fromString("2cdb492e-3b8b-4784-8c26-25159835231d"); - + private static final UUID uuidEndemic = UUID.fromString("efe95ade-8a6c-4a0e-800e-437c8b50c45e"); + protected static Map termMap = null; public static MarkerType NewInstance(String term, String label, String labelAbbrev){ @@ -145,6 +146,10 @@ public class MarkerType extends DefinedTermBase { public static final MarkerType IN_BIBLIOGRAPHY(){ return getTermByUuid(uuidInBibliography); } + + public static final MarkerType ENDEMIC(){ + return getTermByUuid(uuidEndemic); + } @Override protected void setDefaultTerms(TermVocabulary termVocabulary) { diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Feature.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Feature.java index 758f33b8d6..dc0e31d6db 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Feature.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Feature.java @@ -570,7 +570,8 @@ public class Feature extends DefinedTermBase { private static final UUID uuidIndividualsAssociation = UUID.fromString("e2308f37-ddc5-447d-b483-5e2171dd85fd"); private static final UUID uuidSpecimen = UUID.fromString("8200e050-d5fd-4cac-8a76-4b47afb13809"); private static final UUID uuidObservation = UUID.fromString("f59e747d-0b4f-4bf7-b69a-cbd50bc78595"); - + private static final UUID uuidStatus = UUID.fromString("86d40635-2a63-4ad6-be75-9faa4a6a57fb"); + private static final UUID uuidSystematics = UUID.fromString("bd9aca17-cd0e-4418-a3a1-1a4b80dbc162"); /** * Creates and returns a new feature instance on the basis of a given string @@ -911,6 +912,21 @@ public class Feature extends DefinedTermBase { public static final Feature OBSERVATION(){ return getTermByUuid(uuidObservation); } + + /** + * The status of a taxon. Usually the status should be determined within a {@link Distribution distribution}. + * If this is not possible for some reason (e.g. the area is not well defined) the status feature + * may be used. + * @return + */ + public static final Feature STATUS(){ + return getTermByUuid(uuidStatus); + } + + public static final Feature SYSTEMATICS(){ + return getTermByUuid(uuidSystematics); + } + /** * Returns the "hybrid_parent" feature. This feature can only be used * by {@link TaxonInteraction taxon interactions}.
diff --git a/cdmlib-model/src/main/resources/terms/Feature.csv b/cdmlib-model/src/main/resources/terms/Feature.csv index 98fcf6544b..534b7ec50f 100644 --- a/cdmlib-model/src/main/resources/terms/Feature.csv +++ b/cdmlib-model/src/main/resources/terms/Feature.csv @@ -31,4 +31,6 @@ "002d05f2-fd72-49f1-ba4d-196cf09240b5",,"Pathogen Agent","Pathogen Agent","100010", "e2308f37-ddc5-447d-b483-5e2171dd85fd",,"Individuals Association", "Individuals Association","100100", "8200e050-d5fd-4cac-8a76-4b47afb13809",,"Specimen", "Specimen", "100100", -"f59e747d-0b4f-4bf7-b69a-cbd50bc78595",,"Observation", "Observation", "100100" \ No newline at end of file +"f59e747d-0b4f-4bf7-b69a-cbd50bc78595",,"Observation", "Observation", "100100" +"86d40635-2a63-4ad6-be75-9faa4a6a57fb",,"Status","Status","100000" +"bd9aca17-cd0e-4418-a3a1-1a4b80dbc162",,"Systematics","Systematics","100000" \ No newline at end of file diff --git a/cdmlib-model/src/main/resources/terms/MarkerType.csv b/cdmlib-model/src/main/resources/terms/MarkerType.csv index 8081f78365..91be9ff36b 100644 --- a/cdmlib-model/src/main/resources/terms/MarkerType.csv +++ b/cdmlib-model/src/main/resources/terms/MarkerType.csv @@ -4,4 +4,5 @@ "b51325c8-05fe-421a-832b-d86fc249ef6e",,"is doubtful","is doubtful", "b4b1b2ab-89a8-4ce6-8110-d60b8b1bc433",,"complete","complete", "0522c2b3-b21c-400c-80fc-a251c3501dbc",,"publish","publish", -"2cdb492e-3b8b-4784-8c26-25159835231d",,"show in bibliography","in bibliography", \ No newline at end of file +"2cdb492e-3b8b-4784-8c26-25159835231d",,"show in bibliography","in bibliography", +"efe95ade-8a6c-4a0e-800e-437c8b50c45e",,"endemic","endemic","endemic" \ No newline at end of file -- 2.34.1