(no commit message)

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/CategoricalData.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/CategoricalData.java
index 649500414d91c0395d554064860d4f8381cebde7..e0c5d215ec63d5981313716254dca09118d6fabb 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/CategoricalData.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/CategoricalData.java
@@ -40,7 +40,7 @@ public class CategoricalData extends DescriptionElementBase {
        }
        
        protected CategoricalData() {
-               super();
+               super(null);
        }
        
        @ManyToMany

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/CommonTaxonName.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/CommonTaxonName.java
index e9d87b2fc8995802b988f996dae8aae4b6c08230..75a1642e423841eb504f7528b77b25346c80e1dc 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/CommonTaxonName.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/CommonTaxonName.java
@@ -31,7 +31,8 @@ public class CommonTaxonName extends DescriptionElementBase {
        private Language language;
 
        /**
-        * Factory method
+        * Factory method. Sets the feature (type) of this description element to COMMON_NAME
+        * and sets the name and language
         * @param name
         * @param language
         * @return
@@ -44,6 +45,7 @@ public class CommonTaxonName extends DescriptionElementBase {
        }
        
        protected CommonTaxonName(){
+               super(Feature.COMMON_NAME());
        }
        
        

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 b60b291acf946cc4f227620b1c64b99c5514ec6b..c54731f4300e9c93267481671f49201b03a00232 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
@@ -42,8 +42,15 @@ import javax.persistence.*;
 public abstract class DescriptionElementBase extends ReferencedEntityBase implements IMediaEntity{
        private static final Logger logger = Logger.getLogger(DescriptionElementBase.class);
        
+       protected DescriptionElementBase(){
+       }
+       
+       protected DescriptionElementBase(Feature feature){
+               this.feature = feature; 
+       }
+       
        //type, category of information. In structured descriptions characters
-       private Feature type;
+       private Feature feature;
        private Set<Modifier> modifiers = new HashSet<Modifier>();
        private MultilanguageSet modifyingText;
        private Set<Media> media = new HashSet<Media>();
@@ -86,10 +93,10 @@ public abstract class DescriptionElementBase extends ReferencedEntityBase implem
        @ManyToOne
        @Cascade(CascadeType.SAVE_UPDATE)
        public Feature getFeature(){
-               return this.type;
+               return this.feature;
        }
        public void setFeature(Feature feature){
-               this.type = feature;
+               this.feature = feature;
        }
 
        

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Distribution.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Distribution.java
index ef5c01268c330812efa4b6d576e3c54ac2013948..49a2f6cc30784eae28e6a0bf7de4aac0469f14b0 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Distribution.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Distribution.java
@@ -52,8 +52,7 @@ public class Distribution extends DescriptionElementBase {
        }
        
        protected Distribution(){
-               super();
-               this.setFeature(Feature.DISTRIBUTION());
+               super(Feature.DISTRIBUTION());
        }
        
        

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 2ecaf61aaf7cff41b46acc26b4d6b8269e7330aa..c5fe92acee94426e5366a6f40972224f5673c271 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
@@ -53,6 +53,7 @@ public class Feature extends DefinedTermBase {
        public static Feature NewInstance() {
                return new Feature();
        }
+       
        public static Feature NewInstance(String term, String label, String labelAbbrev){
                return new Feature(term, label, labelAbbrev);
        }
@@ -184,6 +185,8 @@ public class Feature extends DefinedTermBase {
        private static final UUID uuidMaterialsMethods = UUID.fromString("1e87d9c3-0844-4a03-9686-773e2ccb3ab6");
        private static final UUID uuidEtymology = UUID.fromString("dd653d48-355c-4aec-a4e7-724f6eb29f8d");
        private static final UUID uuidDiagnosis = UUID.fromString("d43d8501-ceab-4caa-9e51-e87138528fac");
+       private static final UUID uuidProtolog = UUID.fromString("7f1fd111-fc52-49f0-9e75-d0097f576b2d");
+       
 //     private static final UUID uuidDistribution = UUID.fromString("");
 //     private static final UUID uuidDistribution = UUID.fromString("");
 //     private static final UUID uuidDistribution = UUID.fromString("");
@@ -236,6 +239,10 @@ public class Feature extends DefinedTermBase {
        public static final Feature DIAGNOSIS(){
                return getByUuid(uuidDiagnosis);
        }
+       
+       public static final Feature PROTOLOG(){
+               return getByUuid(uuidProtolog);
+       }
 
        
        /**

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/IndividualsAssociation.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/IndividualsAssociation.java
index 0f07c24c37faef00b7ed9d336d7de17c6d77984b..12ecba991c168b204def19f4a7d817f3c59b548e 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/IndividualsAssociation.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/IndividualsAssociation.java
@@ -43,7 +43,7 @@ public class IndividualsAssociation extends DescriptionElementBase {
         * Constructor
         */
        protected IndividualsAssociation(){
-               super();
+               super(null);
        }
        
 

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/QuantitativeData.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/QuantitativeData.java
index d4f35988462f6117df3434b9e2783a78fe58b765..c374d497b4598cc29aed0026b3ffca3e5c0f52f0 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/QuantitativeData.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/QuantitativeData.java
@@ -39,7 +39,7 @@ public class QuantitativeData extends DescriptionElementBase {
         * Constructor
         */
        protected QuantitativeData(){
-               super();
+               super(null);
        }
        
        @OneToMany

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonInteraction.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonInteraction.java
index a34bf01b15f866adc6e9a8a7ebccd39e6eb491e0..3a60eb3eaf568203d7f9e3cc0362f857c146d838 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonInteraction.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonInteraction.java
@@ -10,17 +10,16 @@
 package eu.etaxonomy.cdm.model.description;
 
 
-import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
+import javax.persistence.Entity;
+import javax.persistence.ManyToOne;
+
+import org.apache.log4j.Logger;
+
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.MultilanguageSet;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 
-import org.apache.log4j.Logger;
-
-import java.util.*;
-import javax.persistence.*;
-
 /**
  * FIXME
  * @author m.doering
@@ -42,7 +41,7 @@ public class TaxonInteraction extends DescriptionElementBase {
        }
        
        public TaxonInteraction() {
-               super();
+               super(null);
        }
        
        

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TextData.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TextData.java
index c008ee6641d5bf896978a2626f523d5fe43f3f9f..4cda98e4118805cc294f32dff6c0b73baa8cecad 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TextData.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TextData.java
@@ -39,7 +39,11 @@ public class TextData extends DescriptionElementBase {
        public static TextData NewInstance(){
                return new TextData();
        }
-
+       
+       public static TextData NewInstance(Feature feature){
+               return new TextData(feature);
+       }
+       
        public static TextData NewInstance(String text, Language language, TextFormat format){
                TextData result =  new TextData();
                result.putText(text, language);
@@ -51,7 +55,11 @@ public class TextData extends DescriptionElementBase {
         * Constructor
         */
        public TextData(){
-               super();
+               this(null);
+       }
+       
+       public TextData(Feature feature){
+               super(feature);
                initTextSet();
        }
 

diff --git a/cdmlib-model/src/main/resources/terms/Feature.csv b/cdmlib-model/src/main/resources/terms/Feature.csv
index e4578e32179933c63d145f37c9df65487154c839..35722652daa78c814ad60f46f77b44e9d2fa7de7 100644 (file)
--- a/cdmlib-model/src/main/resources/terms/Feature.csv
+++ b/cdmlib-model/src/main/resources/terms/Feature.csv
@@ -14,3 +14,4 @@
 "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