add missing darwin core fields

diff --git a/.gitattributes b/.gitattributes
index f532a6087c421742a141436d28f701f7a9633b60..eb0bafaeae02c77fbf0cb92b8f8130e486a8de7b 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -172,6 +172,7 @@ cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/ViralName.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/ZoologicalName.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/Collection.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/Determination.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/DeterminationModifier.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/Fossil.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/LivingIndividual.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/Observation.java -text

diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/Determination.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/Determination.java
index d9ee6577fe25111566dd389e8824d490f35d715b..1f5ea3191cc4ff20f0c293bf1455e15a33622d39 100644 (file)
--- a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/Determination.java
+++ b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/Determination.java
@@ -32,6 +32,15 @@ public class Determination extends AnnotatableEntity {
        private Calendar identificationDate;
        private Agent determiner;
        private Taxon taxon;
+       private DeterminationModifier modifier;
+
+       public DeterminationModifier getModifier() {
+               return modifier;
+       }
+
+       public void setModifier(DeterminationModifier modifier) {
+               this.modifier = modifier;
+       }
 
        public Taxon getTaxon(){
                return this.taxon;

diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/DeterminationModifier.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/DeterminationModifier.java
new file mode 100644 (file)
index 0000000..b1d6852
--- /dev/null
+++ b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/DeterminationModifier.java
@@ -0,0 +1,7 @@
+package eu.etaxonomy.cdm.model.occurrence;
+
+import eu.etaxonomy.cdm.model.description.Modifier;
+
+public class DeterminationModifier extends Modifier {
+
+}

diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/Occurrence.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/Occurrence.java
index 66731a7252ae6c4ed5d33c09e6bd3434e4b77e66..f0cf14e86cc2ca96d74c89b4c15c5d17b9409a94 100644 (file)
--- a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/Occurrence.java
+++ b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/Occurrence.java
@@ -16,6 +16,9 @@ import eu.etaxonomy.cdm.model.agent.Agent;
 import eu.etaxonomy.cdm.model.agent.Team;
 import eu.etaxonomy.cdm.model.common.Media;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
+import eu.etaxonomy.cdm.model.description.Sex;
+import eu.etaxonomy.cdm.model.description.Stage;
+
 import org.apache.log4j.Logger;
 import eu.etaxonomy.cdm.model.Description;
 import java.util.*;
@@ -40,6 +43,18 @@ public class Occurrence extends IdentifiableEntity {
        private NamedArea namedArea;
        private Agent collector;
        private Collection collection;
+       private String catalogNumber;
+       private String fieldNumber;
+       private String fieldNotes;
+       private String collectingMethod;
+       private Sex sex;
+       private Stage lifeStage;
+       private Integer individualCount;
+       // meter above/below sea level of the surface
+       private Integer absoluteElevation;
+       // distance in meter from the surface when colecting. E.g. 10m below the ground or lake surface or 20m in the canope
+       private Integer relativeElevation;
+       
 
        public Collection getCollection(){
                return this.collection;
@@ -135,4 +150,76 @@ public class Occurrence extends IdentifiableEntity {
                return "";
        }
 
+       public String getCatalogNumber() {
+               return catalogNumber;
+       }
+
+       public void setCatalogNumber(String catalogNumber) {
+               this.catalogNumber = catalogNumber;
+       }
+
+       public String getFieldNumber() {
+               return fieldNumber;
+       }
+
+       public void setFieldNumber(String fieldNumber) {
+               this.fieldNumber = fieldNumber;
+       }
+
+       public String getFieldNotes() {
+               return fieldNotes;
+       }
+
+       public void setFieldNotes(String fieldNotes) {
+               this.fieldNotes = fieldNotes;
+       }
+
+       public String getCollectingMethod() {
+               return collectingMethod;
+       }
+
+       public void setCollectingMethod(String collectingMethod) {
+               this.collectingMethod = collectingMethod;
+       }
+
+       public Sex getSex() {
+               return sex;
+       }
+
+       public void setSex(Sex sex) {
+               this.sex = sex;
+       }
+
+       public Stage getLifeStage() {
+               return lifeStage;
+       }
+
+       public void setLifeStage(Stage lifeStage) {
+               this.lifeStage = lifeStage;
+       }
+
+       public Integer getIndividualCount() {
+               return individualCount;
+       }
+
+       public void setIndividualCount(Integer individualCount) {
+               this.individualCount = individualCount;
+       }
+
+       public Integer getAbsoluteElevation() {
+               return absoluteElevation;
+       }
+
+       public void setAbsoluteElevation(Integer absoluteElevation) {
+               this.absoluteElevation = absoluteElevation;
+       }
+
+       public Integer getRelativeElevation() {
+               return relativeElevation;
+       }
+
+       public void setRelativeElevation(Integer relativeElevation) {
+               this.relativeElevation = relativeElevation;
+       }
+
 }
\ No newline at end of file