Add Agent superclass

diff --git a/.gitattributes b/.gitattributes
index 4cfd01711c78956ad6b1e10677a8e3af93ab474a..6c0067cf0f7845ba68593a4b9fadcebe0600ed7c 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -73,6 +73,7 @@ cdmlibrary/src/main/java/eu/etaxonomy/cdm/database/DbType.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/database/LocalHsqldb.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/Description.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/Address.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/Agent.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/Contact.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/Institution.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/InstitutionType.java -text

diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/Agent.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/Agent.java
new file mode 100644 (file)
index 0000000..7df3db3
--- /dev/null
+++ b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/Agent.java
@@ -0,0 +1,20 @@
+package eu.etaxonomy.cdm.model.agent;
+
+import javax.persistence.Entity;
+
+import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
+
+@Entity
+public class Agent extends IdentifiableEntity {
+
+       public Agent() {
+               // TODO Auto-generated constructor stub
+       }
+
+       @Override
+       public String generateTitle() {
+               // TODO Auto-generated method stub
+               return null;
+       }
+
+}

diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/Institution.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/Institution.java
index 40c5b9d49347f0089fa6ef35aec7260bc96047db..a20fc6fb307f540caa27fb379eca53eeb8e82639 100644 (file)
--- a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/Institution.java
+++ b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/Institution.java
@@ -23,7 +23,7 @@ import javax.persistence.*;
  * @created 08-Nov-2007 13:06:29
  */
 @Entity
-public class Institution extends IdentifiableEntity {
+public class Institution extends Agent {
        public Institution() {
                super();
                // TODO Auto-generated constructor stub

diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/Person.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/Person.java
index 87407dc6fd93ef2dba8bc767aab636731845924e..a88b0f6dfdb45a1a1db61440d003530a2c97b874 100644 (file)
--- a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/Person.java
+++ b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/Person.java
@@ -25,7 +25,7 @@ import javax.persistence.*;
  * @created 08-Nov-2007 13:06:42
  */
 @Entity
-public class Person extends IdentifiableEntity {
+public class Person extends Agent {
        public Person() {
                super();
                // TODO Auto-generated constructor stub

diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/Team.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/Team.java
index 7a742068c9865c2b5ff842554fb1ac2eeaa63f47..deb51b85613c8cec60b80e21f797fb39781f6d0b 100644 (file)
--- a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/Team.java
+++ b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/Team.java
@@ -24,7 +24,7 @@ import javax.persistence.*;
  * @created 08-Nov-2007 13:06:58
  */
 @Entity
-public class Team extends VersionableEntity {
+public class Team extends Agent {
        public Team() {
                super();
                // TODO Auto-generated constructor stub
@@ -33,7 +33,6 @@ public class Team extends VersionableEntity {
        static Logger logger = Logger.getLogger(Team.class);
        //An abreviated name for the team (e. g. in case of nomenclatural authorteams). A non abreviated name for the team (e. g.
        //in case of some bibliographical references)
-       private String originalCitation;
        private ArrayList<Person> teamMembers;
        public ArrayList<Person> getTeamMembers(){
                return this.teamMembers;
@@ -47,17 +46,4 @@ public class Team extends VersionableEntity {
                this.teamMembers = teamMembers;
        }
 
-       
-       public String getOriginalCitation(){
-               return this.originalCitation;
-       }
-
-       /**
-        * 
-        * @param originalCitation    originalCitation
-        */
-       public void setOriginalCitation(String originalCitation){
-               this.originalCitation = originalCitation;
-       }
-
 }
\ No newline at end of file

diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/IdentifiableEntity.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/IdentifiableEntity.java
index 35f4f868a3d987d24b3f5d527e7c8db902db58b0..7cc46066848d60e04d567f7d7b3d16f1425018e2 100644 (file)
--- a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/IdentifiableEntity.java
+++ b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/IdentifiableEntity.java
@@ -77,7 +77,7 @@ public abstract class IdentifiableEntity extends AnnotatableEntity implements IO
                return this.rights;
        }
 
-       public void setRights(Set<Rights> rights) {
+       protected void setRights(Set<Rights> rights) {
                this.rights = rights;
        }
 
@@ -104,7 +104,7 @@ public abstract class IdentifiableEntity extends AnnotatableEntity implements IO
                return this.extensions;
        }
 
-       public void setExtensions(Set<Extension> extensions) {
+       protected void setExtensions(Set<Extension> extensions) {
                this.extensions = extensions;
        }
 

diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Media.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Media.java
index 57282b2cfc0bea1e686a2239621d924d849704f6..517ebd2068d2d48f9f6f8775fb159e735f07a102 100644 (file)
--- a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Media.java
+++ b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Media.java
@@ -10,6 +10,7 @@
 package eu.etaxonomy.cdm.model.common;
 
 
+import eu.etaxonomy.cdm.model.agent.Agent;
 import eu.etaxonomy.cdm.model.agent.Team;
 import org.apache.log4j.Logger;
 import eu.etaxonomy.cdm.model.Description;
@@ -38,7 +39,7 @@ public class Media extends AnnotatableEntity {
        //formats for images for example
        private Set<MediaInstance> instances;
        private Set<Rights> rights;
-       private Team artist;
+       private Agent artist;
 
        @OneToMany
        public Set<MediaInstance> getInstances(){
@@ -55,10 +56,10 @@ public class Media extends AnnotatableEntity {
        }
 
        
-       public Team getArtist(){
+       public Agent getArtist(){
                return this.artist;
        }
-       public void setArtist(Team artist){
+       public void setArtist(Agent artist){
                this.artist = artist;
        }
 

diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/OriginalSource.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/OriginalSource.java
index b1019df3d22dc1fb4c63046a551b5d80f2e3e1eb..4b3afae3f6c553cf53baf04b518b5a0a8db7e3ad 100644 (file)
--- a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/OriginalSource.java
+++ b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/OriginalSource.java
@@ -28,7 +28,7 @@ public class OriginalSource extends ReferencedEntityBase {
        static Logger logger = Logger.getLogger(OriginalSource.class);
        //The object's ID in the source, where the alternative string comes from
        private String idInSource;
-       private AnnotatableEntity parent;
+       private IdentifiableEntity parent;
 
 
        public String getIdInSource(){
@@ -43,12 +43,12 @@ public class OriginalSource extends ReferencedEntityBase {
                this.idInSource = idInSource;
        }
 
-       protected AnnotatableEntity getParent() {
+       protected IdentifiableEntity getParent() {
                return parent;
        }
 
        @ManyToOne              
-       protected void setParent(AnnotatableEntity parent) {
+       protected void setParent(IdentifiableEntity parent) {
                this.parent = parent;
        }
 

diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NameRelationshipType.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NameRelationshipType.java
index 8eab66d4adc463c2287ec120158b6debcc9695fa..c44ecbacc2ada7ba1c7e7190041b4bb097cded95 100644 (file)
--- a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NameRelationshipType.java
+++ b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NameRelationshipType.java
@@ -32,6 +32,7 @@ public class NameRelationshipType extends EnumeratedTermBase {
        static Logger logger = Logger.getLogger(NameRelationshipType.class);
        private static String initializationClassUri = "http://rs.tdwg.org/ontology/voc/TaxonName.rdf#NomenclaturalNoteTypeTerm";
 
+       @Transient
        public boolean isInvalidType(){
                //True, if enum is of type:
                //Invalid,
@@ -44,6 +45,7 @@ public class NameRelationshipType extends EnumeratedTermBase {
                return false;
        }
 
+       @Transient
        public boolean isLegitimateType(){
                //True, if enum is of type:
                //Legitimate,
@@ -61,6 +63,7 @@ public class NameRelationshipType extends EnumeratedTermBase {
                return false;
        }
 
+       @Transient
        public boolean isIllegitimateType(){
                //True, if enum is of type:
                //Illegitimate,

diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalStatusType.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalStatusType.java
index 47ac360821a8eb4566a10479c703465b20722534..18ef8e048d59e54df3797d5810a93d311af4474c 100644 (file)
--- a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalStatusType.java
+++ b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalStatusType.java
@@ -34,6 +34,7 @@ public class NomenclaturalStatusType extends EnumeratedTermBase {
        static Logger logger = Logger.getLogger(NomenclaturalStatusType.class);
        private static String initializationClassUri = "http://rs.tdwg.org/ontology/voc/TaxonName.rdf#PublicationStatus";
 
+       @Transient
        public boolean isInvalidType(){
                //True, if enum is of type:
                //Invalid,
@@ -46,6 +47,7 @@ public class NomenclaturalStatusType extends EnumeratedTermBase {
                return false;
        }
 
+       @Transient
        public boolean isLegitimateType(){
                //True, if enum is of type:
                //Legitimate,
@@ -63,6 +65,7 @@ public class NomenclaturalStatusType extends EnumeratedTermBase {
                return false;
        }
 
+       @Transient
        public boolean isIllegitimateType(){
                //True, if enum is of type:
                //Illegitimate,

diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NonViralName.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NonViralName.java
index ab228ddcf9310789dcc5b2271e57bc62b1fd01dc..fe7ee22a461df364825a45ebed0b15f500319f18 100644 (file)
--- a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NonViralName.java
+++ b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NonViralName.java
@@ -10,6 +10,7 @@
 package eu.etaxonomy.cdm.model.name;
 
 
+import eu.etaxonomy.cdm.model.agent.Agent;
 import eu.etaxonomy.cdm.model.agent.Team;
 import org.apache.log4j.Logger;
 import eu.etaxonomy.cdm.model.Description;
@@ -35,9 +36,9 @@ public class NonViralName extends TaxonNameBase {
        //Species subdivision epithet
        private String infraSpecificEpithet;
        //Author team that published the present combination
-       private Team combinationAuthorTeam;
+       private Agent combinationAuthorTeam;
        //Author team that contributed to the publication of the present combination
-       private Team exCombinationAuthorTeam;
+       private Agent exCombinationAuthorTeam;
        //concatenated und formated authorteams including basionym and combination authors
        private String authorshipCache;
 
@@ -46,7 +47,7 @@ public class NonViralName extends TaxonNameBase {
        }
 
        @ManyToOne(cascade = {CascadeType.PERSIST, CascadeType.MERGE}  )
-       public Team getCombinationAuthorTeam(){
+       public Agent getCombinationAuthorTeam(){
                return this.combinationAuthorTeam;
        }
 
@@ -54,12 +55,12 @@ public class NonViralName extends TaxonNameBase {
         * 
         * @param combinationAuthorTeam    combinationAuthorTeam
         */
-       public void setCombinationAuthorTeam(Team combinationAuthorTeam){
+       public void setCombinationAuthorTeam(Agent combinationAuthorTeam){
                this.combinationAuthorTeam = combinationAuthorTeam;
        }
 
        @ManyToOne(cascade = {CascadeType.PERSIST, CascadeType.MERGE}  )
-       public Team getExCombinationAuthorTeam(){
+       public Agent getExCombinationAuthorTeam(){
                return this.exCombinationAuthorTeam;
        }
 
@@ -67,7 +68,7 @@ public class NonViralName extends TaxonNameBase {
         * 
         * @param exCombinationAuthorTeam    exCombinationAuthorTeam
         */
-       public void setExCombinationAuthorTeam(Team exCombinationAuthorTeam){
+       public void setExCombinationAuthorTeam(Agent exCombinationAuthorTeam){
                this.exCombinationAuthorTeam = exCombinationAuthorTeam;
        }
 

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 c2af2ae070fd5a8ee6129844bed9e2432e62382a..379d1807b7cb380e3a05926d80486791c3111e1a 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
@@ -10,6 +10,7 @@
 package eu.etaxonomy.cdm.model.occurrence;
 
 
+import eu.etaxonomy.cdm.model.agent.Agent;
 import eu.etaxonomy.cdm.model.agent.Team;
 import eu.etaxonomy.cdm.model.common.AnnotatableEntity;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
@@ -28,7 +29,7 @@ import javax.persistence.*;
 public class Determination extends AnnotatableEntity {
        static Logger logger = Logger.getLogger(Determination.class);
        private Calendar identificationDate;
-       private Team identifierTeam;
+       private Agent identifierTeam;
        private IdentifiableEntity taxon;
 
        public IdentifiableEntity getTaxon(){
@@ -43,7 +44,7 @@ public class Determination extends AnnotatableEntity {
                this.taxon = taxon;
        }
 
-       public Team getIdentifierTeam(){
+       public Agent getIdentifierTeam(){
                return this.identifierTeam;
        }
 
@@ -51,7 +52,7 @@ public class Determination extends AnnotatableEntity {
         * 
         * @param identifierTeam    identifierTeam
         */
-       public void setIdentifierTeam(Team identifierTeam){
+       public void setIdentifierTeam(Agent identifierTeam){
                this.identifierTeam = identifierTeam;
        }
 

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 cc2c10d33b2af42ced7c94aaf60dc324ecf3aa12..66731a7252ae6c4ed5d33c09e6bd3434e4b77e66 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
@@ -12,6 +12,7 @@ package eu.etaxonomy.cdm.model.occurrence;
 
 import eu.etaxonomy.cdm.model.location.Point;
 import eu.etaxonomy.cdm.model.location.NamedArea;
+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;
@@ -37,7 +38,7 @@ public class Occurrence extends IdentifiableEntity {
        private Set<Media> media;
        private Point exactLocation;
        private NamedArea namedArea;
-       private Team collector;
+       private Agent collector;
        private Collection collection;
 
        public Collection getCollection(){
@@ -81,7 +82,7 @@ public class Occurrence extends IdentifiableEntity {
        }
 
        
-       public Team getCollector(){
+       public Agent getCollector(){
                return this.collector;
        }
 
@@ -89,7 +90,7 @@ public class Occurrence extends IdentifiableEntity {
         * 
         * @param collector    collector
         */
-       public void setCollector(Team collector){
+       public void setCollector(Agent collector){
                this.collector = collector;
        }
 

diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/ReferenceBase.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/ReferenceBase.java
index 51bc1e70cee856fdfcad63592707b55c4807b57a..f97b694e46237bdfca6c24a0bda946e5b0a30816 100644 (file)
--- a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/ReferenceBase.java
+++ b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/ReferenceBase.java
@@ -10,6 +10,7 @@
 package eu.etaxonomy.cdm.model.reference;
 
 
+import eu.etaxonomy.cdm.model.agent.Agent;
 import eu.etaxonomy.cdm.model.agent.Team;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import org.apache.log4j.Logger;
@@ -32,10 +33,10 @@ public abstract class ReferenceBase extends IdentifiableEntity {
        //flag to subselect only references that could be useful for nomenclatural citations. If a reference is used as a
        //nomenclatural reference in a name this flag should be automatically set
        private boolean isNomenclaturallyRelevant;
-       private Team authorTeam;
+       private Agent authorTeam;
 
        
-       public Team getAuthorTeam(){
+       public Agent getAuthorTeam(){
                return this.authorTeam;
        }
 
@@ -43,7 +44,7 @@ public abstract class ReferenceBase extends IdentifiableEntity {
         * 
         * @param authorTeam    authorTeam
         */
-       public void setAuthorTeam(Team authorTeam){
+       public void setAuthorTeam(Agent authorTeam){
                this.authorTeam = authorTeam;
        }