Project

General

Profile

« Previous | Next » 

Revision 68f70701

Added by Anahit Babadshanjan almost 16 years ago

Normalized Distribution/NamedArea (used in Palmae exemplar group data)

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/jaxb/DataSet.java
18 18 
import eu.etaxonomy.cdm.model.agent.Agent;
19 19 
import eu.etaxonomy.cdm.model.agent.Contact;
20 20 
import eu.etaxonomy.cdm.model.agent.Institution;
21 
import eu.etaxonomy.cdm.model.agent.InstitutionType;
21 22 
import eu.etaxonomy.cdm.model.agent.InstitutionalMembership;
22 23 
import eu.etaxonomy.cdm.model.agent.Person;
23 24 
import eu.etaxonomy.cdm.model.agent.Team;
24 25 
import eu.etaxonomy.cdm.model.common.DefinedTermBase;
26 
import eu.etaxonomy.cdm.model.common.ExtensionType;
25 27 
import eu.etaxonomy.cdm.model.common.Keyword;
26 28 
import eu.etaxonomy.cdm.model.common.Language;
27 29 
import eu.etaxonomy.cdm.model.common.LanguageString;
......
34 36 
import eu.etaxonomy.cdm.model.common.TermBase;
35 37 
import eu.etaxonomy.cdm.model.common.TermVocabulary;
36 38 
import eu.etaxonomy.cdm.model.common.VersionableEntity;
39 
import eu.etaxonomy.cdm.model.description.AbsenceTerm;
37 40 
import eu.etaxonomy.cdm.model.description.Feature;
38 41 
import eu.etaxonomy.cdm.model.description.FeatureNode;
39 42 
import eu.etaxonomy.cdm.model.description.FeatureTree;
43 
import eu.etaxonomy.cdm.model.description.MeasurementUnit;
44 
import eu.etaxonomy.cdm.model.description.Modifier;
45 
import eu.etaxonomy.cdm.model.description.PresenceTerm;
46 
import eu.etaxonomy.cdm.model.description.Scope;
47 
import eu.etaxonomy.cdm.model.description.Sex;
48 
import eu.etaxonomy.cdm.model.description.Stage;
49 
import eu.etaxonomy.cdm.model.description.State;
50 
import eu.etaxonomy.cdm.model.description.StatisticalMeasure;
51 
import eu.etaxonomy.cdm.model.description.TextFormat;
40 52 
import eu.etaxonomy.cdm.model.location.Continent;
41 53 
import eu.etaxonomy.cdm.model.location.NamedArea;
42 54 
import eu.etaxonomy.cdm.model.location.NamedAreaLevel;
43 55 
import eu.etaxonomy.cdm.model.location.NamedAreaType;
56 
import eu.etaxonomy.cdm.model.location.ReferenceSystem;
44 57 
import eu.etaxonomy.cdm.model.location.TdwgArea;
45 58 
import eu.etaxonomy.cdm.model.location.WaterbodyOrCountry;
46 59 
import eu.etaxonomy.cdm.model.media.Media;
47 60 
import eu.etaxonomy.cdm.model.media.MediaRepresentation;
48 61 
import eu.etaxonomy.cdm.model.media.MediaRepresentationPart;
62 
import eu.etaxonomy.cdm.model.media.RightsTerm;
49 63 
import eu.etaxonomy.cdm.model.molecular.DnaSample;
50 64 
import eu.etaxonomy.cdm.model.name.BotanicalName;
51 65 
import eu.etaxonomy.cdm.model.name.CultivarPlantName;
......
64 78 
import eu.etaxonomy.cdm.model.name.TypeDesignationStatus;
65 79 
import eu.etaxonomy.cdm.model.name.ZoologicalName;
66 80 
import eu.etaxonomy.cdm.model.occurrence.DerivationEventType;
81 
import eu.etaxonomy.cdm.model.occurrence.DeterminationModifier;
67 82 
import eu.etaxonomy.cdm.model.occurrence.FieldObservation;
68 83 
import eu.etaxonomy.cdm.model.occurrence.Fossil;
69 84 
import eu.etaxonomy.cdm.model.occurrence.LivingBeing;
70 85 
import eu.etaxonomy.cdm.model.occurrence.Observation;
86 
import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;
71 87 
import eu.etaxonomy.cdm.model.occurrence.Specimen;
72 88 
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
73 89 
import eu.etaxonomy.cdm.model.reference.Article;
90 
import eu.etaxonomy.cdm.model.reference.BibtexEntryType;
74 91 
import eu.etaxonomy.cdm.model.reference.Book;
75 92 
import eu.etaxonomy.cdm.model.reference.BookSection;
76 93 
import eu.etaxonomy.cdm.model.reference.CdDvd;
......
155 172
156 173 
    @XmlElementWrapper(name = "Terms")
157 174 
    @XmlElements({
175 
    	@XmlElement(name = "AbsenceTerm", namespace = "http://etaxonomy.eu/cdm/model/description/1.0", type = AbsenceTerm.class),
176 
    	@XmlElement(name = "BibtexEntryType", namespace = "http://etaxonomy.eu/cdm/model/reference/1.0", type = BibtexEntryType.class),
158 177 
    	@XmlElement(name = "Continent", namespace = "http://etaxonomy.eu/cdm/model/location/1.0", type = Continent.class),
159 178 
    	@XmlElement(name = "DerivationEventType", namespace = "http://etaxonomy.eu/cdm/model/occurrence/1.0", type = DerivationEventType.class),
179 
    	@XmlElement(name = "DeterminationModifier", namespace = "http://etaxonomy.eu/cdm/model/occurrence/1.0", type = DeterminationModifier.class),
180 
    	@XmlElement(name = "ExtensionType", namespace = "http://etaxonomy.eu/cdm/model/common/1.0", type = ExtensionType.class),
160 181 
    	@XmlElement(name = "Feature", namespace = "http://etaxonomy.eu/cdm/model/description/1.0", type = Feature.class),
161 182 
    	@XmlElement(name = "HybridRelationshipType", namespace = "http://etaxonomy.eu/cdm/model/name/1.0", type = HybridRelationshipType.class),
183 
    	@XmlElement(name = "InstitutionType", namespace = "http://etaxonomy.eu/cdm/model/agent/1.0", type = InstitutionType.class),
162 184 
        @XmlElement(name = "Keyword", namespace = "http://etaxonomy.eu/cdm/model/common/1.0", type = Keyword.class),
163 185 
    	@XmlElement(name = "Language", namespace = "http://etaxonomy.eu/cdm/model/common/1.0", type = Language.class),
164 186 
    	@XmlElement(name = "MarkerType", namespace = "http://etaxonomy.eu/cdm/model/common/1.0", type = MarkerType.class),
187 
    	@XmlElement(name = "MeasurementUnit", namespace = "http://etaxonomy.eu/cdm/model/description/1.0", type = MeasurementUnit.class),
188 
    	@XmlElement(name = "Modifier", namespace = "http://etaxonomy.eu/cdm/model/description/1.0", type = Modifier.class),
165 189 
    	@XmlElement(name = "NamedArea", namespace = "http://etaxonomy.eu/cdm/model/location/1.0", type = NamedArea.class),
166 190 
    	@XmlElement(name = "NamedAreaLevel", namespace = "http://etaxonomy.eu/cdm/model/location/1.0", type = NamedAreaLevel.class),
167 191 
    	@XmlElement(name = "NamedAreaType", namespace = "http://etaxonomy.eu/cdm/model/location/1.0", type = NamedAreaType.class),
168 192 
    	@XmlElement(name = "NameRelationshipType", namespace = "http://etaxonomy.eu/cdm/model/name/1.0", type = NameRelationshipType.class),
169 193 
    	@XmlElement(name = "NomenclaturalCode", namespace = "http://etaxonomy.eu/cdm/model/name/1.0", type = NomenclaturalCode.class),
170 194 
    	@XmlElement(name = "NomenclaturalStatusType", namespace = "http://etaxonomy.eu/cdm/model/name/1.0", type = NomenclaturalStatusType.class),
195 
    	@XmlElement(name = "PresenceTerm", namespace = "http://etaxonomy.eu/cdm/model/description/1.0", type = PresenceTerm.class),
196 
    	@XmlElement(name = "PreservationMethod", namespace = "http://etaxonomy.eu/cdm/model/occurrence/1.0", type = PreservationMethod.class),
171 197 
        @XmlElement(name = "Rank", namespace = "http://etaxonomy.eu/cdm/model/name/1.0", type = Rank.class),
198 
    	@XmlElement(name = "ReferenceSystem", namespace = "http://etaxonomy.eu/cdm/model/location/1.0", type = ReferenceSystem.class),
199 
    	@XmlElement(name = "RightsTerm", namespace = "http://etaxonomy.eu/cdm/model/media/1.0", type = RightsTerm.class),
200 
    	@XmlElement(name = "Sex", namespace = "http://etaxonomy.eu/cdm/model/description/1.0", type = Sex.class),
201 
    	@XmlElement(name = "Scope", namespace = "http://etaxonomy.eu/cdm/model/description/1.0", type = Scope.class),
202 
    	@XmlElement(name = "Stage", namespace = "http://etaxonomy.eu/cdm/model/description/1.0", type = Stage.class),
203 
    	@XmlElement(name = "State", namespace = "http://etaxonomy.eu/cdm/model/description/1.0", type = State.class),
204 
    	@XmlElement(name = "StatisticalMeasure", namespace = "http://etaxonomy.eu/cdm/model/description/1.0", type = StatisticalMeasure.class),
172 205 
    	@XmlElement(name = "SynonymRelationshipType", namespace = "http://etaxonomy.eu/cdm/model/taxon/1.0", type = SynonymRelationshipType.class),
173 206 
    	@XmlElement(name = "TaxonRelationshipType", namespace = "http://etaxonomy.eu/cdm/model/taxon/1.0", type = TaxonRelationshipType.class),
174 
    	@XmlElement(name = "TdwgArea", namespace = "http://etaxonomy.eu/cdm/model/location/1.0", type = TdwgArea.class),
207 
    	@XmlElement(name = "TextFormat", namespace = "http://etaxonomy.eu/cdm/model/description/1.0", type = TextFormat.class),
175 208 
    	@XmlElement(name = "TypeDesignationStatus", namespace = "http://etaxonomy.eu/cdm/model/name/1.0", type = TypeDesignationStatus.class),
176 209 
    	@XmlElement(name = "WaterbodyOrCountry", namespace = "http://etaxonomy.eu/cdm/model/location/1.0", type = WaterbodyOrCountry.class)
177 210 
    })
......
260 293 
    @XmlElement(name = "HomotypicalGroup", namespace = "http://etaxonomy.eu/cdm/model/name/1.0")
261 294 
    protected Set<HomotypicalGroup> homotypicalGroups;
262 295 

  		




  263
  
  
    
    public DataSet () {


  		




  
  296
  
    
//	@XmlElement(name = "TdwgArea", namespace = "http://etaxonomy.eu/cdm/model/location/1.0", type = TdwgArea.class),


  		




  
  297
  
    

  		




  
  298
  
    
	public DataSet () {


  		




  264
  299
  
    
    }


  		




  265
  300
  
    

  		




  266
  301
  
    
    /**


  		












  

    
      cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/AbsenceTerm.java
    
  





  17
  17
  
    
import eu.etaxonomy.cdm.model.taxon.Taxon;


  		




  18
  18
  
    

  		




  19
  19
  
    
import javax.persistence.*;


  		




  
  20
  
    
import javax.xml.bind.annotation.XmlAccessType;


  		




  
  21
  
    
import javax.xml.bind.annotation.XmlAccessorType;


  		




  
  22
  
    
import javax.xml.bind.annotation.XmlRootElement;


  		




  
  23
  
    
import javax.xml.bind.annotation.XmlType;


  		




  20
  24
  
    

  		




  21
  25
  
    
/**


  		




  22
  26
  
    
 * This class represents terms describing different types of absence


  		




  ......




  26
  30
  
    
 * @version 1.0


  		




  27
  31
  
    
 * @created 08-Nov-2007 13:06:08


  		




  28
  32
  
    
 */


  		




  
  33
  
    
@XmlAccessorType(XmlAccessType.FIELD)


  		




  
  34
  
    
@XmlType(name = "AbsenceTerm")


  		




  
  35
  
    
@XmlRootElement(name = "AbsenceTerm")


  		




  29
  36
  
    
@Entity


  		




  30
  37
  
    
public class AbsenceTerm extends PresenceAbsenceTermBase<AbsenceTerm> {


  		




  31
  38
  
    
	static Logger logger = Logger.getLogger(AbsenceTerm.class);


  		












  

    
      cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Distribution.java
    
  





  16
  16
  
    
import org.hibernate.annotations.Cascade;


  		




  17
  17
  
    
import org.hibernate.annotations.CascadeType;


  		




  18
  18
  
    
import javax.persistence.*;


  		




  
  19
  
    
import javax.xml.bind.annotation.XmlAccessType;


  		




  
  20
  
    
import javax.xml.bind.annotation.XmlAccessorType;


  		




  
  21
  
    
import javax.xml.bind.annotation.XmlElement;


  		




  
  22
  
    
import javax.xml.bind.annotation.XmlIDREF;


  		




  
  23
  
    
import javax.xml.bind.annotation.XmlRootElement;


  		




  
  24
  
    
import javax.xml.bind.annotation.XmlSchemaType;


  		




  
  25
  
    
import javax.xml.bind.annotation.XmlType;


  		




  19
  26
  
    

  		




  20
  27
  
    
/**


  		




  21
  28
  
    
 * This class represents elementary distribution data for a {@link Taxon taxon}.


  		




  ......




  33
  40
  
    
 * @version 1.0


  		




  34
  41
  
    
 * @created 08-Nov-2007 13:06:21


  		




  35
  42
  
    
 */


  		




  
  43
  
    
@XmlAccessorType(XmlAccessType.FIELD)


  		




  
  44
  
    
@XmlType(name = "Distribution", propOrder = {


  		




  
  45
  
    
    "area",


  		




  
  46
  
    
    "status"


  		




  
  47
  
    
})


  		




  
  48
  
    
@XmlRootElement(name = "Distribution")


  		




  36
  49
  
    
@Entity


  		




  37
  50
  
    
public class Distribution extends DescriptionElementBase {


  		




  38
  51
  
    
	static Logger logger = Logger.getLogger(Distribution.class);


  		




  39
  52
  
    
	


  		




  
  53
  
    
	@XmlElement(name = "NamedArea")


  		




  
  54
  
    
	@XmlIDREF


  		




  
  55
  
    
	@XmlSchemaType(name = "IDREF")


  		




  40
  56
  
    
	private NamedArea area;


  		




  
  57
  
    
	


  		




  
  58
  
    
	@XmlElement(name = "PresenceAbsenceStatus")


  		




  41
  59
  
    
	private PresenceAbsenceTermBase status;


  		




  42
  60
  
    

  		




  43
  61
  
    
	


  		












  

    
      cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/PresenceAbsenceTermBase.java
    
  





  16
  16
  
    

  		




  17
  17
  
    
import org.apache.log4j.Logger;


  		




  18
  18
  
    
import javax.persistence.*;


  		




  
  19
  
    
import javax.xml.bind.annotation.XmlAccessType;


  		




  
  20
  
    
import javax.xml.bind.annotation.XmlAccessorType;


  		




  
  21
  
    
import javax.xml.bind.annotation.XmlRootElement;


  		




  
  22
  
    
import javax.xml.bind.annotation.XmlType;


  		




  19
  23
  
    

  		




  20
  24
  
    
/**


  		




  21
  25
  
    
 * This (abstract) class represents terms describing the {@link AbsenceTerm absence}


  		




  ......




  29
  33
  
    
 * @version 1.0


  		




  30
  34
  
    
 * @created 08-Nov-2007 13:06:44


  		




  31
  35
  
    
 */


  		




  
  36
  
    
@XmlAccessorType(XmlAccessType.FIELD)


  		




  
  37
  
    
@XmlType(name = "PresenceAbsenceTermBase")


  		




  
  38
  
    
@XmlRootElement(name = "PresenceAbsenceTermBase")


  		




  32
  39
  
    
@Entity


  		




  33
  40
  
    
public abstract class PresenceAbsenceTermBase<T extends PresenceAbsenceTermBase> extends OrderedTermBase<PresenceAbsenceTermBase> {


  		




  34
  41
  
    
	static Logger logger = Logger.getLogger(PresenceAbsenceTermBase.class);


  		












  

    
      cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/PresenceTerm.java
    
  





  16
  16
  
    
import eu.etaxonomy.cdm.model.taxon.Taxon;


  		




  17
  17
  
    

  		




  18
  18
  
    
import javax.persistence.*;


  		




  
  19
  
    
import javax.xml.bind.annotation.XmlAccessType;


  		




  
  20
  
    
import javax.xml.bind.annotation.XmlAccessorType;


  		




  
  21
  
    
import javax.xml.bind.annotation.XmlRootElement;


  		




  
  22
  
    
import javax.xml.bind.annotation.XmlType;


  		




  19
  23
  
    

  		




  20
  24
  
    
/**


  		




  21
  25
  
    
 * This class represents terms describing different types of presence


  		




  ......




  25
  29
  
    
 * @version 1.0


  		




  26
  30
  
    
 * @created 08-Nov-2007 13:06:44


  		




  27
  31
  
    
 */


  		




  
  32
  
    
@XmlAccessorType(XmlAccessType.FIELD)


  		




  
  33
  
    
@XmlType(name = "PresenceTerm")


  		




  
  34
  
    
@XmlRootElement(name = "PresenceTerm")


  		




  28
  35
  
    
@Entity


  		




  29
  36
  
    
public class PresenceTerm extends PresenceAbsenceTermBase<PresenceTerm> {


  		




  30
  37
  
    
	private static final Logger logger = Logger.getLogger(PresenceTerm.class);


  		












  

    
      cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TextFormat.java
    
  





  17
  17
  
    

  		




  18
  18
  
    
import org.apache.log4j.Logger;


  		




  19
  19
  
    
import javax.persistence.*;


  		




  
  20
  
    
import javax.xml.bind.annotation.XmlAccessType;


  		




  
  21
  
    
import javax.xml.bind.annotation.XmlAccessorType;


  		




  
  22
  
    
import javax.xml.bind.annotation.XmlRootElement;


  		




  
  23
  
    
import javax.xml.bind.annotation.XmlType;


  		




  20
  24
  
    

  		




  21
  25
  
    
/**


  		




  22
  26
  
    
 * The class representing kinds of formats used for structuring text


  		




  ......




  26
  30
  
    
 * @version 1.0


  		




  27
  31
  
    
 * @created 08-Nov-2007 13:06:59


  		




  28
  32
  
    
 */


  		




  
  33
  
    
@XmlAccessorType(XmlAccessType.FIELD)


  		




  
  34
  
    
@XmlType(name = "TextFormat")


  		




  
  35
  
    
@XmlRootElement(name = "TextFormat")


  		




  29
  36
  
    
@Entity


  		




  30
  37
  
    
public class TextFormat extends DefinedTermBase {


  		




  31
  38
  
    
	static Logger logger = Logger.getLogger(TextFormat.class);


  		












Also available in:  Unified diff