marker type "endemic" and features "status" and "systematics" in cdmlib-model

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 51ec29c2dbdfeac11e90bd6d2eec9a4a86aabb44..83e43c4e9db559f2c5829e2694e21ce480ac2c0f 100644 (file)
--- 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<MarkerType> {
        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<UUID, MarkerType> termMap = null;          
 
        public static MarkerType NewInstance(String term, String label, String labelAbbrev){
@@ -145,6 +146,10 @@ public class MarkerType extends DefinedTermBase<MarkerType> {
        public static final MarkerType IN_BIBLIOGRAPHY(){
                return getTermByUuid(uuidInBibliography);
        }
+
+       public static final MarkerType ENDEMIC(){
+               return getTermByUuid(uuidEndemic);
+       }
        
        @Override
        protected void setDefaultTerms(TermVocabulary<MarkerType> 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 758f33b8d649002dc1ba153482bc319d3c0fb034..dc0e31d6db704d8035876f30392a1efd26309838 100644 (file)
--- 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<Feature> {
        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<Feature> {
        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}.<BR>

diff --git a/cdmlib-model/src/main/resources/terms/Feature.csv b/cdmlib-model/src/main/resources/terms/Feature.csv
index 98fcf6544bf425b55d33e93bedb4810d52777470..534b7ec50f2f4a17c4220a2fb02702a82e319e78 100644 (file)
--- 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",\r
 "e2308f37-ddc5-447d-b483-5e2171dd85fd",,"Individuals Association", "Individuals Association","100100",\r
 "8200e050-d5fd-4cac-8a76-4b47afb13809",,"Specimen", "Specimen", "100100",\r
-"f59e747d-0b4f-4bf7-b69a-cbd50bc78595",,"Observation", "Observation", "100100"
\ No newline at end of file
+"f59e747d-0b4f-4bf7-b69a-cbd50bc78595",,"Observation", "Observation", "100100"\r
+"86d40635-2a63-4ad6-be75-9faa4a6a57fb",,"Status","Status","100000"\r
+"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 8081f783658d04062a9d2908ec85ea62e56a8c01..91be9ff36b8bcceff948a641cf4000d21fdb69c0 100644 (file)
--- 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",\r
 "b4b1b2ab-89a8-4ce6-8110-d60b8b1bc433",,"complete","complete",\r
 "0522c2b3-b21c-400c-80fc-a251c3501dbc",,"publish","publish",\r
-"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",\r
+"efe95ade-8a6c-4a0e-800e-437c8b50c45e",,"endemic","endemic","endemic"
\ No newline at end of file