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
--- /dev/null
+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;
+ }
+
+}
* @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
* @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
* @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
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;
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
return this.rights;
}
- public void setRights(Set<Rights> rights) {
+ protected void setRights(Set<Rights> rights) {
this.rights = rights;
}
return this.extensions;
}
- public void setExtensions(Set<Extension> extensions) {
+ protected void setExtensions(Set<Extension> extensions) {
this.extensions = extensions;
}
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;
//formats for images for example
private Set<MediaInstance> instances;
private Set<Rights> rights;
- private Team artist;
+ private Agent artist;
@OneToMany
public Set<MediaInstance> getInstances(){
}
- public Team getArtist(){
+ public Agent getArtist(){
return this.artist;
}
- public void setArtist(Team artist){
+ public void setArtist(Agent artist){
this.artist = artist;
}
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(){
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;
}
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,
return false;
}
+ @Transient
public boolean isLegitimateType(){
//True, if enum is of type:
//Legitimate,
return false;
}
+ @Transient
public boolean isIllegitimateType(){
//True, if enum is of type:
//Illegitimate,
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,
return false;
}
+ @Transient
public boolean isLegitimateType(){
//True, if enum is of type:
//Legitimate,
return false;
}
+ @Transient
public boolean isIllegitimateType(){
//True, if enum is of type:
//Illegitimate,
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;
//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;
}
@ManyToOne(cascade = {CascadeType.PERSIST, CascadeType.MERGE} )
- public Team getCombinationAuthorTeam(){
+ public Agent getCombinationAuthorTeam(){
return this.combinationAuthorTeam;
}
*
* @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;
}
*
* @param exCombinationAuthorTeam exCombinationAuthorTeam
*/
- public void setExCombinationAuthorTeam(Team exCombinationAuthorTeam){
+ public void setExCombinationAuthorTeam(Agent exCombinationAuthorTeam){
this.exCombinationAuthorTeam = exCombinationAuthorTeam;
}
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;
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(){
this.taxon = taxon;
}
- public Team getIdentifierTeam(){
+ public Agent getIdentifierTeam(){
return this.identifierTeam;
}
*
* @param identifierTeam identifierTeam
*/
- public void setIdentifierTeam(Team identifierTeam){
+ public void setIdentifierTeam(Agent identifierTeam){
this.identifierTeam = identifierTeam;
}
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;
private Set<Media> media;
private Point exactLocation;
private NamedArea namedArea;
- private Team collector;
+ private Agent collector;
private Collection collection;
public Collection getCollection(){
}
- public Team getCollector(){
+ public Agent getCollector(){
return this.collector;
}
*
* @param collector collector
*/
- public void setCollector(Team collector){
+ public void setCollector(Agent collector){
this.collector = collector;
}
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;
//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;
}
*
* @param authorTeam authorTeam
*/
- public void setAuthorTeam(Team authorTeam){
+ public void setAuthorTeam(Agent authorTeam){
this.authorTeam = authorTeam;
}