(no commit message)

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionElementBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionElementBase.java
index c54731f4300e9c93267481671f49201b03a00232..d4576989309fa2a341852657fef58a82a2a47137 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionElementBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionElementBase.java
@@ -46,6 +46,9 @@ public abstract class DescriptionElementBase extends ReferencedEntityBase implem
        }
        
        protected DescriptionElementBase(Feature feature){
+               if (feature == null){
+                       feature = Feature.UNKNOWN();
+               }
                this.feature = feature; 
        }
        

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 c5fe92acee94426e5366a6f40972224f5673c271..1c112beed65fcad40bff46e082bfea59754d25e2 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
@@ -176,6 +176,7 @@ public class Feature extends DefinedTermBase {
        }
 
        
+       private static final UUID uuidUnknown = UUID.fromString("910307f1-dc3c-452c-a6dd-af5ac7cd365c");
        private static final UUID uuidDescription = UUID.fromString("9087cdcd-8b08-4082-a1de-34c9ba9fb493");
        private static final UUID uuidDistribution = UUID.fromString("9fc9d10c-ba50-49ee-b174-ce83fc3f80c6");
        private static final UUID uuidEcology = UUID.fromString("aa923827-d333-4cf5-9a5f-438ae0a4746b");
@@ -203,6 +204,10 @@ public class Feature extends DefinedTermBase {
                return (Feature)findByUuid(uuid);
        }
        
+       public static final Feature UNKNOWN(){
+               return getByUuid(uuidUnknown);
+       }
+       
        public static final Feature DESCRIPTION(){
                return getByUuid(uuidDescription);
        }

diff --git a/cdmlib-model/src/main/resources/terms/Feature.csv b/cdmlib-model/src/main/resources/terms/Feature.csv
index 35722652daa78c814ad60f46f77b44e9d2fa7de7..7d7d049166967c42967e5da892145a3689d97a45 100644 (file)
--- a/cdmlib-model/src/main/resources/terms/Feature.csv
+++ b/cdmlib-model/src/main/resources/terms/Feature.csv
@@ -14,4 +14,5 @@
 "489bf358-b78a-45e2-a691-f9f3f10446ce",,"Synopsis","Synopsis",\r
 "89d3b005-9876-4923-89d9-60eb75b9583b",,"Multiple","Multiple",\r
 "555a46bc-211a-476f-a022-c472970d6f8b",,"Acknowledgments","Acknowledgments",\r
-"7f1fd111-fc52-49f0-9e75-d0097f576b2d",,"Protolog","Protolog",
\ No newline at end of file
+"7f1fd111-fc52-49f0-9e75-d0097f576b2d",,"Protolog","Protolog",\r
+"910307f1-dc3c-452c-a6dd-af5ac7cd365c",,"Unknown Feature Type","Unknown",
\ No newline at end of file