Major update to the latest CDM definition 2.Nov.2007
authorm.doering <m.doering@localhost>
Fri, 2 Nov 2007 17:36:25 +0000 (17:36 +0000)
committerm.doering <m.doering@localhost>
Fri, 2 Nov 2007 17:36:25 +0000 (17:36 +0000)
162 files changed:
.gitattributes
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/Address.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/Contact.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/Institution.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/InstitutionType.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/InstitutionalMembership.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/Person.java
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/PersonInSource.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/Team.java
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/TeamInSource.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/AnnotatableEntity.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Annotation.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/AudioFile.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/DatePeriodTerm.java [moved from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/Generic.java with 57% similarity]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTermBase.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/EntityInSourceBase.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/EnumeratedTermBase.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Enumeration.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Extension.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/ExtensionType.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/FactBase.java [deleted file]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Figure.java [moved from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/Report.java with 58% similarity]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/IReferencedEntity.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/IdentifiableEntity.java
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/ImageFile.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Keyword.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Language.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/LanguageString.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Marker.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/MarkerType.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Media.java
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/MediaInstance.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/MovieFile.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/MultilanguageString.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/NameAlias.java [deleted file]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/ReferencedEntityBase.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/ReferencedMedia.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Representation.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Rights.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/RightsTerm.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/VersionableEntity.java
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/AbsenceTerm.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/CategoricalData.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/CharacterTree.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/CommonTaxonName.java [moved from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Source.java with 51% similarity]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/Description.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionInSource.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/DescriptiveConcept.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/Distribution.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/DiurnalTerm.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/FeatureBase.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/FeatureType.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/IdentificationKey.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/IndividualsAssociation.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/MeasurementUnit.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/Modifier.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/Paragraph.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/PresenceAbsenceTermBase.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/PresenceTerm.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/QuantitativeData.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/Scope.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/SeasonalTerm.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/Sex.java [moved from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/NomenclaturalReference.java with 64% similarity]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/Stage.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/State.java [moved from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NameFactType.java with 56% similarity]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/StateData.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/StatisticalMeasure.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/StatisticalMeasurementValue.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/TaxonInteraction.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/TextData.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/TextFormat.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/location/Continent.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/location/NamedArea.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/location/NamedAreaInSource.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/location/NamedAreaLevel.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/location/NamedAreaType.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/location/Point.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/location/ReferenceSystem.java [moved from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonFactType.java with 50% similarity]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/location/WaterbodyOrCountry.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/molecular/DnaSample.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/molecular/GenBankAccession.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/molecular/Locus.java [moved from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/view/Group.java with 55% similarity]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/molecular/PhylogeneticTree.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/molecular/Sequence.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/molecular/TissueSample.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/BacterialName.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/BotanicalName.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/CultivarPlantName.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/HybridRelationship.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/HybridRelationshipType.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/ITypeDesignation.java [moved from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Fact.java with 69% similarity]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NameFact.java [deleted file]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NameInSource.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NameRelationship.java
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NameRelationshipType.java
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NameTypeDesignation.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalCode.java [deleted file]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalStatus.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalStatusType.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NonViralName.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/Rank.java
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/SpecimenTypeDesignation.java [moved from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/TypeDesignation.java with 52% similarity]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/TaxonName.java [deleted file]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/TaxonNameBase.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/TypeDesignationStatus.java
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/ViralName.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/ZoologicalName.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/Collection.java [moved from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/specimen/Collection.java with 77% similarity]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/Determination.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/Fossil.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/LivingIndividual.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/Observation.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/ObservationalUnit.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/Occurrence.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/PreservationMethod.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/Specimen.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/BookSection.java [deleted file]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/PublicationBase.java [deleted file]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/Unpublished.java [deleted file]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/Article.java [moved from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/Article.java with 52% similarity]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/BibtexEntryType.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/BibtexReference.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/Book.java [moved from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/Book.java with 53% similarity]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/BookSection.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/CdDvd.java [moved from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/CdDvd.java with 76% similarity]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/ConferenceProceedings.java [moved from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/ConferenceProceedings.java with 67% similarity]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/Database.java [moved from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/Database.java with 77% similarity]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/Generic.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/INomenclaturalReference.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/InProceedings.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/Journal.java [moved from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/Journal.java with 80% similarity]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/Map.java [moved from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/Map.java with 76% similarity]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/Patent.java [moved from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/Patent.java with 68% similarity]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/PersonalCommunication.java [moved from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/PersonalCommunication.java with 67% similarity]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/PrintSeries.java [moved from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/BookSeries.java with 61% similarity]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/PrintedUnitBase.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/Proceedings.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/PublicationBase.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/ReferenceBase.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/ReferenceInSource.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/Report.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/SectionBase.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/StrictReferenceBase.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/Thesis.java [moved from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/Thesis.java with 56% similarity]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/WebPage.java [moved from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/WebPage.java with 77% similarity]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/specimen/Country.java [deleted file]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/specimen/Institution.java [deleted file]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/specimen/Locality.java [deleted file]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/specimen/MaterialCategory.java [deleted file]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/specimen/Region.java [deleted file]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/specimen/Specimen.java [deleted file]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/taxon/ConceptRelationshipType.java
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/taxon/Synonym.java [moved from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/taxon/SynonymTaxon.java with 64% similarity]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/taxon/SynonymRelationship.java
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/taxon/SynonymRelationshipType.java
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/taxon/Taxon.java [moved from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/taxon/AcceptedTaxon.java with 63% similarity]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonBase.java
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonFact.java [deleted file]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonInSource.java [new file with mode: 0644]
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonRelationship.java
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/view/User.java
cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/view/View.java

index 9921ade43a0005a4e3e8fe06c4c2cbebadc55aae..b71e90e072fbe6db798dd4d4b43f701a9ff9ee30 100644 (file)
@@ -60,61 +60,152 @@ cdmlibrary/src/main/java/eu/etaxonomy/cdm/aspectj/PropertyChangeAspect.aj -text
 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/PropertyChangeBean.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/Address.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
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/InstitutionalMembership.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/Person.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/PersonInSource.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/Team.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/TeamInSource.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/AnnotatableEntity.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Annotation.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/AudioFile.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/CdmBase.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Fact.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/FactBase.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/DatePeriodTerm.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTermBase.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/EntityInSourceBase.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/EnumeratedTermBase.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Enumeration.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Extension.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/ExtensionType.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Figure.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/IReferencedEntity.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/IdentifiableEntity.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/ImageFile.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Keyword.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Language.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/LanguageString.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Marker.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/MarkerType.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Media.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/NameAlias.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Source.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/MediaInstance.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/MovieFile.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/MultilanguageString.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/ReferencedEntityBase.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/ReferencedMedia.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Representation.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Rights.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/RightsTerm.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/VersionableEntity.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/package-info.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NameFact.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NameFactType.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/AbsenceTerm.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/CategoricalData.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/CharacterTree.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/CommonTaxonName.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/Description.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionInSource.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/DescriptiveConcept.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/Distribution.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/DiurnalTerm.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/FeatureBase.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/FeatureType.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/IdentificationKey.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/IndividualsAssociation.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/MeasurementUnit.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/Modifier.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/Paragraph.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/PresenceAbsenceTermBase.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/PresenceTerm.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/QuantitativeData.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/Scope.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/SeasonalTerm.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/Sex.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/Stage.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/State.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/StateData.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/StatisticalMeasure.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/StatisticalMeasurementValue.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/TaxonInteraction.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/TextData.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/TextFormat.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/location/Continent.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/location/NamedArea.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/location/NamedAreaInSource.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/location/NamedAreaLevel.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/location/NamedAreaType.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/location/Point.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/location/ReferenceSystem.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/location/WaterbodyOrCountry.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/molecular/DnaSample.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/molecular/GenBankAccession.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/molecular/Locus.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/molecular/PhylogeneticTree.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/molecular/Sequence.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/molecular/TissueSample.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/BacterialName.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/BotanicalName.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/CultivarPlantName.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/HybridRelationship.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/HybridRelationshipType.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/ITypeDesignation.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NameInSource.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NameRelationship.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NameRelationshipType.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalCode.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NameTypeDesignation.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalStatus.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalStatusType.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NonViralName.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/Rank.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/TaxonName.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/TypeDesignation.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/SpecimenTypeDesignation.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/TaxonNameBase.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/TypeDesignationStatus.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/Article.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/Book.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/BookSection.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/BookSeries.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/CdDvd.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/ConferenceProceedings.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/Database.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/Generic.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/Journal.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/Map.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/NomenclaturalReference.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/Patent.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/PersonalCommunication.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/PublicationBase.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/Report.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/Thesis.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/Unpublished.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/WebPage.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/specimen/Collection.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/specimen/Country.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/specimen/Institution.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/specimen/Locality.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/specimen/MaterialCategory.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/specimen/Region.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/specimen/Specimen.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/taxon/AcceptedTaxon.java -text
+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/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
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/ObservationalUnit.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/Occurrence.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/PreservationMethod.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/Specimen.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/Article.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/BibtexEntryType.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/BibtexReference.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/Book.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/BookSection.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/CdDvd.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/ConferenceProceedings.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/Database.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/Generic.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/INomenclaturalReference.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/InProceedings.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/Journal.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/Map.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/Patent.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/PersonalCommunication.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/PrintSeries.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/PrintedUnitBase.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/Proceedings.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/PublicationBase.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/ReferenceBase.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/ReferenceInSource.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/Report.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/SectionBase.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/StrictReferenceBase.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/Thesis.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/WebPage.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/taxon/ConceptRelationshipType.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/taxon/Synonym.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/taxon/SynonymRelationship.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/taxon/SynonymRelationshipType.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/taxon/SynonymTaxon.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/taxon/Taxon.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonBase.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonFact.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonFactType.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonInSource.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonRelationship.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/view/Group.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/view/User.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/view/View.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/AgentDaoHibernateImpl.java -text
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/Address.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/Address.java
new file mode 100644 (file)
index 0000000..42cdc69
--- /dev/null
@@ -0,0 +1,130 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.agent;
+
+
+import etaxonomy.cdm.model.location.WaterbodyOrCountry;
+import etaxonomy.cdm.model.location.Point;
+import etaxonomy.cdm.model.common.VersionableEntity;
+import org.apache.log4j.Logger;
+
+/**
+ * taken from TDWG & VCard
+ * 
+ * http://rs.tdwg.org/ontology/voc/ContactDetails#Address
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:33
+ */
+public class Address extends VersionableEntity {
+       static Logger logger = Logger.getLogger(Address.class);
+
+       //Post Office Box
+       @Description("Post Office Box")
+       private String pobox;
+       //including number
+       @Description("including number")
+       private String street;
+       @Description("")
+       private String postcode;
+       //town,locality,suburb
+       @Description("town,locality,suburb")
+       private String locality;
+       //Region/State
+       @Description("Region/State")
+       private String region;
+       private Point location;
+       private WaterbodyOrCountry country;
+
+       public WaterbodyOrCountry getCountry(){
+               return country;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setCountry(WaterbodyOrCountry newVal){
+               country = newVal;
+       }
+
+       public Point getLocation(){
+               return location;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setLocation(Point newVal){
+               location = newVal;
+       }
+
+       public String getPobox(){
+               return pobox;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setPobox(String newVal){
+               pobox = newVal;
+       }
+
+       public String getStreet(){
+               return street;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setStreet(String newVal){
+               street = newVal;
+       }
+
+       public String getPostcode(){
+               return postcode;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setPostcode(String newVal){
+               postcode = newVal;
+       }
+
+       public String getLocality(){
+               return locality;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setLocality(String newVal){
+               locality = newVal;
+       }
+
+       public String getRegion(){
+               return region;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setRegion(String newVal){
+               region = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/Contact.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/Contact.java
new file mode 100644 (file)
index 0000000..c697245
--- /dev/null
@@ -0,0 +1,95 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.agent;
+
+
+import etaxonomy.cdm.model.common.VersionableEntity;
+import org.apache.log4j.Logger;
+
+/**
+ * http://rs.tdwg.org/ontology/voc/ContactDetails#ContactDetails
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:41
+ */
+public class Contact extends VersionableEntity {
+       static Logger logger = Logger.getLogger(Contact.class);
+
+       @Description("")
+       private String email;
+       @Description("")
+       private String url;
+       @Description("")
+       private String phone;
+       @Description("")
+       private String fax;
+       private ArrayList addresses;
+
+       public ArrayList getAddresses(){
+               return addresses;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setAddresses(ArrayList newVal){
+               addresses = newVal;
+       }
+
+       public String getEmail(){
+               return email;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setEmail(String newVal){
+               email = newVal;
+       }
+
+       public String getUrl(){
+               return url;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setUrl(String newVal){
+               url = newVal;
+       }
+
+       public String getPhone(){
+               return phone;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setPhone(String newVal){
+               phone = newVal;
+       }
+
+       public String getFax(){
+               return fax;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setFax(String newVal){
+               fax = newVal;
+       }
+
+}
\ No newline at end of file
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
new file mode 100644 (file)
index 0000000..dbfc8d5
--- /dev/null
@@ -0,0 +1,94 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.agent;
+
+
+import etaxonomy.cdm.model.common.IdentifiableEntity;
+import org.apache.log4j.Logger;
+
+/**
+ * http://rs.tdwg.org/ontology/voc/Institution.rdf
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:54
+ */
+public class Institution extends IdentifiableEntity {
+       static Logger logger = Logger.getLogger(Institution.class);
+
+       //Acronym, code or initialism by which the insitution is generally known
+       @Description("Acronym, code or initialism by which the insitution is generally known")
+       private String code;
+       @Description("")
+       private String name;
+       private ArrayList types;
+       private Institution isPartOf;
+       private Contact contact;
+
+       public Contact getContact(){
+               return contact;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setContact(Contact newVal){
+               contact = newVal;
+       }
+
+       public ArrayList getTypes(){
+               return types;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setTypes(ArrayList newVal){
+               types = newVal;
+       }
+
+       public Institution getIsPartOf(){
+               return isPartOf;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setIsPartOf(Institution newVal){
+               isPartOf = newVal;
+       }
+
+       public String getCode(){
+               return code;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setCode(String newVal){
+               code = newVal;
+       }
+
+       public String getName(){
+               return name;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setName(String newVal){
+               name = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/InstitutionType.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/InstitutionType.java
new file mode 100644 (file)
index 0000000..4b0b37b
--- /dev/null
@@ -0,0 +1,25 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.agent;
+
+
+import etaxonomy.cdm.model.common.EnumeratedTermBase;
+import org.apache.log4j.Logger;
+
+/**
+ * http://rs.tdwg.org/ontology/voc/InstitutionType
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:55
+ */
+public class InstitutionType extends EnumeratedTermBase {
+       static Logger logger = Logger.getLogger(InstitutionType.class);
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/InstitutionalMembership.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/InstitutionalMembership.java
new file mode 100644 (file)
index 0000000..250a361
--- /dev/null
@@ -0,0 +1,86 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.agent;
+
+
+import etaxonomy.cdm.model.common.VersionableEntity;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:54
+ */
+public class InstitutionalMembership extends VersionableEntity {
+       static Logger logger = Logger.getLogger(InstitutionalMembership.class);
+
+       //Time period a person belonged to the institution
+       @Description("Time period a person belonged to the institution")
+       private TimePeriod period;
+       //Department of the institution this person was working in
+       @Description("Department of the institution this person was working in")
+       private String department;
+       //Role this person had in the institution
+       @Description("Role this person had in the institution")
+       private String role;
+       /**
+        * current institute the person belongs to
+        */
+       private Institution institute;
+
+       public Institution getInstitute(){
+               return institute;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setInstitute(Institution newVal){
+               institute = newVal;
+       }
+
+       public TimePeriod getPeriod(){
+               return period;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setPeriod(TimePeriod newVal){
+               period = newVal;
+       }
+
+       public String getDepartment(){
+               return department;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setDepartment(String newVal){
+               department = newVal;
+       }
+
+       public String getRole(){
+               return role;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setRole(String newVal){
+               role = newVal;
+       }
+
+}
\ No newline at end of file
index a2b4070ce355990ac5f9e78ce2ce35810f50687e..d09925df8435522f423a9664e9348cdad8d102e8 100644 (file)
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.agent;\r
-\r
-\r
-import eu.etaxonomy.cdm.model.common.VersionableEntity;\r
-import eu.etaxonomy.cdm.model.common.NameAlias;\r
-import org.apache.log4j.Logger;\r
-import java.util.*;\r
-import javax.persistence.*;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:10\r
- */\r
-@Entity\r
-public class Person extends VersionableEntity {\r
-       static Logger logger = Logger.getLogger(Person.class);\r
-\r
-       private String forenames;\r
-       private String lifespan;\r
-       private String subjectScope;\r
-       private String surname;\r
-       private ArrayList standardForms;\r
-\r
-       public String getForenames(){\r
-               return forenames;\r
-       }\r
-\r
-       public String getLifespan(){\r
-               return lifespan;\r
-       }\r
-\r
-       public ArrayList getStandardForms(){\r
-               return standardForms;\r
-       }\r
-\r
-       public String getSubjectScope(){\r
-               return subjectScope;\r
-       }\r
-\r
-       public String getSurname(){\r
-               return surname;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setForenames(String newVal){\r
-               forenames = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setLifespan(String newVal){\r
-               lifespan = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setStandardForms(ArrayList newVal){\r
-               standardForms = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setSubjectScope(String newVal){\r
-               subjectScope = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setSurname(String newVal){\r
-               surname = newVal;\r
-       }\r
-\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.agent;
+
+
+import etaxonomy.cdm.model.common.Keyword;
+import etaxonomy.cdm.model.common.IdentifiableEntity;
+import org.apache.log4j.Logger;
+
+/**
+ * http://rs.tdwg.org/ontology/voc/Person.rdf
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:07
+ */
+public class Person extends IdentifiableEntity {
+       static Logger logger = Logger.getLogger(Person.class);
+
+       //e.g. the title
+       @Description("e.g. the title")
+       private String prefix;
+       //All other names not included in the surname. May be just initials, all forenames in full or a combination of expanded
+       //names and initials.
+       @Description("All other names not included in the surname. May be just initials, all forenames in full or a combination of expanded names and initials.")
+       private String firstname;
+       //A hereditary name common to all members of a family, as distinct from a given name or forename
+       @Description("A hereditary name common to all members of a family, as distinct from a given name or forename")
+       private String lastname;
+       //e.g. junior
+       @Description("e.g. junior")
+       private String suffix;
+       //The period for which this person was alive represented as a TimePeriod datatype, i.e. start - end date.
+       //Alternative suggestion as a flexible String. the form birthdate - deathdate (XXXX - YYYY; XXXX - or - YYYY as
+       //appropriate) is prefered, or as simple flourished date (fl. XXXX) may be given where that is all that is known
+       @Description("The period for which this person was alive represented as a TimePeriod datatype, i.e. start - end date.
+       Alternative suggestion as a flexible String. the form birthdate - deathdate (XXXX - YYYY; XXXX - or - YYYY as appropriate) is prefered, or as simple flourished date (fl. XXXX) may be given where that is all that is known")
+       private TimePeriod lifespan;
+       private ArrayList institutionalMemberships;
+       private Contact contact;
+       private ArrayList personInSources;
+       private ArrayList keywords;
+
+       public ArrayList getInstitutionalMemberships(){
+               return institutionalMemberships;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setInstitutionalMemberships(ArrayList newVal){
+               institutionalMemberships = newVal;
+       }
+
+       public ArrayList getPersonInSources(){
+               return personInSources;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setPersonInSources(ArrayList newVal){
+               personInSources = newVal;
+       }
+
+       public ArrayList getKeywords(){
+               return keywords;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setKeywords(ArrayList newVal){
+               keywords = newVal;
+       }
+
+       public Contact getContact(){
+               return contact;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setContact(Contact newVal){
+               contact = newVal;
+       }
+
+       public String getPrefix(){
+               return prefix;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setPrefix(String newVal){
+               prefix = newVal;
+       }
+
+       public String getFirstname(){
+               return firstname;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setFirstname(String newVal){
+               firstname = newVal;
+       }
+
+       public String getLastname(){
+               return lastname;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setLastname(String newVal){
+               lastname = newVal;
+       }
+
+       public String getSuffix(){
+               return suffix;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setSuffix(String newVal){
+               suffix = newVal;
+       }
+
+       public TimePeriod getLifespan(){
+               return lifespan;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setLifespan(TimePeriod newVal){
+               lifespan = newVal;
+       }
+
 }
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/PersonInSource.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/PersonInSource.java
new file mode 100644 (file)
index 0000000..7c98a44
--- /dev/null
@@ -0,0 +1,24 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.agent;
+
+
+import etaxonomy.cdm.model.common.EntityInSourceBase;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:08
+ */
+public class PersonInSource extends EntityInSourceBase {
+       static Logger logger = Logger.getLogger(PersonInSource.class);
+
+}
\ No newline at end of file
index 1268c81638646bf3dd91d2c9d52ce81fccc1932b..e2fa7d5935db83ee9dcb6732a24667d88a4d8414 100644 (file)
@@ -1,70 +1,71 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.agent;\r
-\r
-\r
-import eu.etaxonomy.cdm.model.common.VersionableEntity;\r
-import org.apache.log4j.Logger;\r
-import java.util.*;\r
-import javax.persistence.*;\r
-\r
-/**\r
- * This author team class note explains everything there is to authors and\r
- * includes explanation why certain attributes have been dropped or are dealt with\r
- * elsewhere.\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:16\r
- */\r
-@Entity\r
-public class Team extends VersionableEntity {\r
-       static Logger logger = Logger.getLogger(Team.class);\r
-\r
-       private String fullName;\r
-       private String shortName;\r
-       private java.util.ArrayList teamMembers;\r
-\r
-       public String getFullName(){\r
-               return fullName;\r
-       }\r
-\r
-       public String getShortName(){\r
-               return shortName;\r
-       }\r
-\r
-       public java.util.ArrayList getTeamMembers(){\r
-               return teamMembers;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setFullName(String newVal){\r
-               fullName = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setShortName(String newVal){\r
-               shortName = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setTeamMembers(java.util.ArrayList newVal){\r
-               teamMembers = newVal;\r
-       }\r
-\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.agent;
+
+
+import etaxonomy.cdm.model.common.VersionableEntity;
+import org.apache.log4j.Logger;
+
+/**
+ * An author team may exist for itself or may be built with the persons who belong
+ * to it.
+ * {At least one otf the attributes shortName or fullName must exist.}
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:23
+ */
+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)
+       @Description("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 teamInSource;
+       private java.util.ArrayList teamMembers;
+
+       public java.util.ArrayList getTeamMembers(){
+               return teamMembers;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setTeamMembers(java.util.ArrayList newVal){
+               teamMembers = newVal;
+       }
+
+       public ArrayList getTeamInSource(){
+               return teamInSource;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setTeamInSource(ArrayList newVal){
+               teamInSource = newVal;
+       }
+
+       public String getOriginalCitation(){
+               return originalCitation;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setOriginalCitation(String newVal){
+               originalCitation = newVal;
+       }
+
 }
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/TeamInSource.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/agent/TeamInSource.java
new file mode 100644 (file)
index 0000000..c7bcca1
--- /dev/null
@@ -0,0 +1,24 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.agent;
+
+
+import etaxonomy.cdm.model.common.EntityInSourceBase;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:23
+ */
+public class TeamInSource extends EntityInSourceBase {
+       static Logger logger = Logger.getLogger(TeamInSource.class);
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/AnnotatableEntity.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/AnnotatableEntity.java
new file mode 100644 (file)
index 0000000..8c6e91b
--- /dev/null
@@ -0,0 +1,51 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.common;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:34
+ */
+@MappedSuperclass
+public abstract class AnnotatableEntity extends VersionableEntity {
+       static Logger logger = Logger.getLogger(AnnotatableEntity.class);
+
+       private ArrayList markers;
+       private ArrayList annotations;
+
+       public ArrayList getMarkers(){
+               return markers;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setMarkers(ArrayList newVal){
+               markers = newVal;
+       }
+
+       public ArrayList getAnnotations(){
+               return annotations;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setAnnotations(ArrayList newVal){
+               annotations = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Annotation.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Annotation.java
new file mode 100644 (file)
index 0000000..b11094a
--- /dev/null
@@ -0,0 +1,66 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.common;
+
+
+import etaxonomy.cdm.model.agent.Person;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:34
+ */
+public class Annotation extends VersionableEntity {
+       static Logger logger = Logger.getLogger(Annotation.class);
+
+       //Human annotation
+       @Description("Human annotation")
+       private String note;
+       private Language language;
+       private Person commentator;
+
+       public Person getCommentator(){
+               return commentator;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setCommentator(Person newVal){
+               commentator = newVal;
+       }
+
+       public Language getLanguage(){
+               return language;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setLanguage(Language newVal){
+               language = newVal;
+       }
+
+       public String getNote(){
+               return note;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setNote(String newVal){
+               note = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/AudioFile.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/AudioFile.java
new file mode 100644 (file)
index 0000000..5a0fdf5
--- /dev/null
@@ -0,0 +1,39 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.common;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:35
+ */
+public class AudioFile extends MediaInstance {
+       static Logger logger = Logger.getLogger(AudioFile.class);
+
+       //length of recording in seconds
+       @Description("length of recording in seconds")
+       private int duration;
+
+       public int getDuration(){
+               return duration;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setDuration(int newVal){
+               duration = newVal;
+       }
+
+}
\ No newline at end of file
similarity index 57%
rename from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/Generic.java
rename to cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/DatePeriodTerm.java
index df1caf6d2a9163da990feab35675643da65eb4fb..32e68c11db81a9a710bd2e10a7a71b6f807b0a18 100644 (file)
@@ -1,23 +1,24 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.publication;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:04\r
- */\r
-public class Generic extends PublicationBase {\r
-       static Logger logger = Logger.getLogger(Generic.class);\r
-\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.common;
+
+
+import etaxonomy.cdm.model.description.Scope;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:43
+ */
+public class DatePeriodTerm extends Scope {
+       static Logger logger = Logger.getLogger(DatePeriodTerm.class);
+
 }
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTermBase.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTermBase.java
new file mode 100644 (file)
index 0000000..5c3fee2
--- /dev/null
@@ -0,0 +1,160 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.common;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * workaround for enumerations, base type according to TDWG.
+ * 
+ * For linear ordering use partOf relation and BreadthFirst.
+ * Default iterator order should therefore be BreadthFirst (not DepthFirst)
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:43
+ */
+public abstract class DefinedTermBase extends VersionableEntity {
+       static Logger logger = Logger.getLogger(DefinedTermBase.class);
+
+       //URI used as an ID for the term. In the case of TDWG ontology derived terms the URL to the term!
+       @Description("URI used as an ID for the term. In the case of TDWG ontology derived terms the URL to the term!")
+       private String uri;
+       //The RDF ontology source defining the terms to be loaded when a database is created for the first time.
+       //
+       //Software can go and grap these terms incl labels and description. UUID needed? Furhter vocs can be setup through our
+       //own ontology.
+       @Description("The RDF ontology source defining the terms to be loaded when a database is created for the first time.
+       
+       Software can go and grap these terms incl labels and description. UUID needed? Furhter vocs can be setup through our own ontology.")
+       private static final int initializationClassUri;
+       private DefinedTermBase partOf;
+       private ArrayList includes;
+       private ArrayList representations;
+       private DefinedTermBase kindOf;
+       private ArrayList generalizationOf;
+       private java.util.ArrayList media;
+
+       public ArrayList getRepresentations(){
+               return representations;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setRepresentations(ArrayList newVal){
+               representations = newVal;
+       }
+
+       public DefinedTermBase getKindOf(){
+               return kindOf;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setKindOf(DefinedTermBase newVal){
+               kindOf = newVal;
+       }
+
+       public ArrayList getGeneralizationOf(){
+               return generalizationOf;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setGeneralizationOf(ArrayList newVal){
+               generalizationOf = newVal;
+       }
+
+       public DefinedTermBase getPartOf(){
+               return partOf;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setPartOf(DefinedTermBase newVal){
+               partOf = newVal;
+       }
+
+       public ArrayList getIncludes(){
+               return includes;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setIncludes(ArrayList newVal){
+               includes = newVal;
+       }
+
+       public java.util.ArrayList getMedia(){
+               return media;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setMedia(java.util.ArrayList newVal){
+               media = newVal;
+       }
+
+       public String getUri(){
+               return uri;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setUri(String newVal){
+               uri = newVal;
+       }
+
+       public getInitializationClassUri(){
+               return initializationClassUri;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setInitializationClassUri(newVal){
+               initializationClassUri = newVal;
+       }
+
+       /**
+        * 
+        * @param uri
+        */
+       @Transient
+       public static defined terms getDefinedTermByUri(String uri){
+               return null;
+       }
+
+       /**
+        * add new terms from a vocabulary to which uri points. By default this is the
+        * initializationClassUri
+        * 
+        * @param uri
+        */
+       public void addTermsFromInitializationClass(String uri){
+
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/EntityInSourceBase.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/EntityInSourceBase.java
new file mode 100644 (file)
index 0000000..ac2db58
--- /dev/null
@@ -0,0 +1,41 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.common;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * Other names/labels/titles (abreviated or not) for the same object (person,
+ * reference, source, etc.)
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:46
+ */
+public abstract class EntityInSourceBase extends ReferencedEntityBase {
+       static Logger logger = Logger.getLogger(EntityInSourceBase.class);
+
+       //The object's ID in the source, where the alternative string comes from
+       @Description("The object's ID in the source, where the alternative string comes from")
+       private String idInSource;
+
+       public String getIdInSource(){
+               return idInSource;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setIdInSource(String newVal){
+               idInSource = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/EnumeratedTermBase.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/EnumeratedTermBase.java
new file mode 100644 (file)
index 0000000..73119a9
--- /dev/null
@@ -0,0 +1,37 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.common;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:47
+ */
+public abstract class EnumeratedTermBase extends DefinedTermBase {
+       static Logger logger = Logger.getLogger(EnumeratedTermBase.class);
+
+       private Enumeration enumeration;
+
+       public Enumeration getEnumeration(){
+               return enumeration;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setEnumeration(Enumeration newVal){
+               enumeration = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Enumeration.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Enumeration.java
new file mode 100644 (file)
index 0000000..3b5a74b
--- /dev/null
@@ -0,0 +1,42 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.common;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * A single enumeration must only contain DefinedTerm instances of one kind
+ * (=class)
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:47
+ */
+public class Enumeration extends DefinedTermBase {
+       static Logger logger = Logger.getLogger(Enumeration.class);
+
+       //The order of the enumeration list is a linear order that can be used for statistical purposes. Measurement scale =
+       //ordinal
+       @Description("The order of the enumeration list is a linear order that can be used for statistical purposes. Measurement scale = ordinal")
+       private boolean isOrdinal;
+
+       public boolean isOrdinal(){
+               return isOrdinal;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setOrdinal(boolean newVal){
+               isOrdinal = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Extension.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Extension.java
new file mode 100644 (file)
index 0000000..aefa2f5
--- /dev/null
@@ -0,0 +1,55 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.common;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * This class aims to make available more "attributes" for identifiable entities
+ * in a flexible way. Application developers (and even users) can define their own
+ * "attrributes" as an ExtensionType and add data to Identifiable instances via
+ * Extension instances.
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:47
+ */
+public class Extension extends VersionableEntity {
+       static Logger logger = Logger.getLogger(Extension.class);
+
+       @Description("")
+       private String value;
+       private ExtensionType type;
+
+       public ExtensionType getType(){
+               return type;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setType(ExtensionType newVal){
+               type = newVal;
+       }
+
+       public String getValue(){
+               return value;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setValue(String newVal){
+               value = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/ExtensionType.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/ExtensionType.java
new file mode 100644 (file)
index 0000000..ec1b37e
--- /dev/null
@@ -0,0 +1,34 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.common;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * Extension types similar to dynamically defined attributes. These are not data
+ * types, but rather content types like "DOI", "2nd nomenclatural reference", "3rd
+ * hybrid parent" or specific local identifiers.
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:48
+ */
+public class ExtensionType extends DefinedTermBase {
+       static Logger logger = Logger.getLogger(ExtensionType.class);
+
+       public static final ExtensionType XML_FRAGMENT(){
+               return null;
+       }
+
+       public static final ExtensionType RDF_FRAGMENT(){
+               return null;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/FactBase.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/FactBase.java
deleted file mode 100644 (file)
index 61dfcf3..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.common;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-import java.util.*;\r
-import javax.persistence.*;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:03\r
- */\r
-@Entity\r
-public abstract class FactBase extends VersionableEntity {\r
-       static Logger logger = Logger.getLogger(FactBase.class);\r
-\r
-       private String citationMicroReference;\r
-       private String fact;\r
-\r
-       public String getCitationMicroReference(){\r
-               return citationMicroReference;\r
-       }\r
-\r
-       public String getFact(){\r
-               return fact;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setCitationMicroReference(String newVal){\r
-               citationMicroReference = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setFact(String newVal){\r
-               fact = newVal;\r
-       }\r
-\r
-}
\ No newline at end of file
similarity index 58%
rename from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/Report.java
rename to cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Figure.java
index f5b9546c1a9347c1fae0297b72fe55ecffdf414c..dcb99e6aeb0de072ff6e49389ceaeb83dd87ed01 100644 (file)
@@ -1,23 +1,23 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.publication;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:12\r
- */\r
-public class Report extends PublicationBase {\r
-       static Logger logger = Logger.getLogger(Report.class);\r
-\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.common;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:49
+ */
+public class Figure extends ReferencedMedia {
+       static Logger logger = Logger.getLogger(Figure.class);
+
 }
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/IReferencedEntity.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/IReferencedEntity.java
new file mode 100644 (file)
index 0000000..130bc64
--- /dev/null
@@ -0,0 +1,29 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.common;
+
+
+import etaxonomy.cdm.model.reference.StrictReferenceBase;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:55
+ */
+public interface IReferencedEntity {
+
+       @Transient
+       public StrictReferenceBase getCitation();
+
+       @Transient
+       public String getCitation();
+
+}
\ No newline at end of file
index e31cafc3b5ce7900cf1659eb9d62778c0ee52064..16d7dd2526e1ae89782fc0125a494013ef2d18fc 100644 (file)
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.common;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-import java.util.*;\r
-import javax.persistence.*;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:04\r
- */\r
-@MappedSuperclass\r
-public abstract class IdentifiableEntity extends VersionableEntity {\r
-       static Logger logger = Logger.getLogger(IdentifiableEntity.class);\r
-\r
-       private String lsid;\r
-\r
-       public String getLsid(){\r
-               return lsid;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setLsid(String newVal){\r
-               lsid = newVal;\r
-       }\r
-\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.common;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:52
+ */
+@MappedSuperclass
+public abstract class IdentifiableEntity extends AnnotatableEntity {
+       static Logger logger = Logger.getLogger(IdentifiableEntity.class);
+
+       @Description("")
+       private String lsid;
+       @Description("")
+       private String titleCache;
+       //if true titleCache will not be automatically generated/updated
+       @Description("if true titleCache will not be automatically generated/updated")
+       private boolean hasProtectedTitleCache;
+       private ArrayList rights;
+       private ArrayList extensions;
+
+       public ArrayList getExtensions(){
+               return extensions;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setExtensions(ArrayList newVal){
+               extensions = newVal;
+       }
+
+       public ArrayList getRights(){
+               return rights;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setRights(ArrayList newVal){
+               rights = newVal;
+       }
+
+       public String getLsid(){
+               return lsid;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setLsid(String newVal){
+               lsid = newVal;
+       }
+
+       public String getTitleCache(){
+               return titleCache;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setTitleCache(String newVal){
+               titleCache = newVal;
+       }
+
+       public boolean getHasProtectedTitleCache(){
+               return hasProtectedTitleCache;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setHasProtectedTitleCache(boolean newVal){
+               hasProtectedTitleCache = newVal;
+       }
+
+       @Transient
+       public String getTitle(){
+               return "";
+       }
+
+       public abstract String generateTitle();
+
+       public boolean hasProtectedTitleCache(){
+               return false;
+       }
+
+       @Transient
+       public Extension[] getExtensions(){
+               return null;
+       }
+
+       @Transient
+       public Marker[] getMarkers(){
+               return null;
+       }
+
+       /**
+        * 
+        * @param extension
+        */
+       public void addExtension(Extension extension){
+
+       }
+
+       /**
+        * 
+        * @param marker
+        */
+       public void addMarker(Marker marker){
+
+       }
+
+       /**
+        * 
+        * @param extension
+        */
+       public void removeExtension(Extension extension){
+
+       }
+
+       /**
+        * 
+        * @param marker
+        */
+       public void removeMarker(Marker marker){
+
+       }
+
 }
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/ImageFile.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/ImageFile.java
new file mode 100644 (file)
index 0000000..49b5fc3
--- /dev/null
@@ -0,0 +1,54 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.common;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:53
+ */
+public class ImageFile extends MediaInstance {
+       static Logger logger = Logger.getLogger(ImageFile.class);
+
+       //image height in pixel
+       @Description("image height in pixel")
+       private int height;
+       //image width in pixel
+       @Description("image width in pixel")
+       private int width;
+
+       public int getHeight(){
+               return height;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setHeight(int newVal){
+               height = newVal;
+       }
+
+       public int getWidth(){
+               return width;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setWidth(int newVal){
+               width = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Keyword.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Keyword.java
new file mode 100644 (file)
index 0000000..3c49da3
--- /dev/null
@@ -0,0 +1,24 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.common;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * simple keywords. could be taxonomic scope, geographic scope or anything else
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:56
+ */
+public class Keyword extends EnumeratedTermBase {
+       static Logger logger = Logger.getLogger(Keyword.class);
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Language.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Language.java
new file mode 100644 (file)
index 0000000..a580952
--- /dev/null
@@ -0,0 +1,69 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.common;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * list of languages according to current internet best practices as given by IANA
+ * or ISO codes.
+ * 
+ * http://www.ietf.org/rfc/rfc4646.txt
+ * http://www.loc.gov/standards/iso639-2/php/English_list.php
+ * 
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:56
+ */
+public class Language extends DefinedTermBase {
+       static Logger logger = Logger.getLogger(Language.class);
+
+       public static final Language CHINESE(){
+               return null;
+       }
+
+       public static final Language ENGLISH(){
+               return null;
+       }
+
+       public static final Language SPANISH(){
+               return null;
+       }
+
+       public static final Language HINDI(){
+               return null;
+       }
+
+       public static final Language ARABIC(){
+               return null;
+       }
+
+       public static final Language BENGALI(){
+               return null;
+       }
+
+       public static final Language RUSSIAN(){
+               return null;
+       }
+
+       public static final Language PORTUGUESE(){
+               return null;
+       }
+
+       public static final Language JAPANESE(){
+               return null;
+       }
+
+       public static final Language GERMAN(){
+               return null;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/LanguageString.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/LanguageString.java
new file mode 100644 (file)
index 0000000..344f40f
--- /dev/null
@@ -0,0 +1,51 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.common;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:57
+ */
+public class LanguageString {
+       static Logger logger = Logger.getLogger(LanguageString.class);
+
+       @Description("")
+       private char text;
+       private Language language;
+
+       public Language getLanguage(){
+               return language;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setLanguage(Language newVal){
+               language = newVal;
+       }
+
+       public char getText(){
+               return text;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setText(char newVal){
+               text = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Marker.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Marker.java
new file mode 100644 (file)
index 0000000..bcc5d4a
--- /dev/null
@@ -0,0 +1,54 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.common;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * This class aims to make available some "flags" for identifiable entities in a
+ * flexible way. Application developers (and even users) can define their own
+ * "flags" as a MarkerType.
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:58
+ */
+public class Marker extends VersionableEntity {
+       static Logger logger = Logger.getLogger(Marker.class);
+
+       @Description("")
+       private boolean flag;
+       private MarkerType type;
+
+       public MarkerType getType(){
+               return type;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setType(MarkerType newVal){
+               type = newVal;
+       }
+
+       public boolean getFlag(){
+               return flag;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setFlag(boolean newVal){
+               flag = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/MarkerType.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/MarkerType.java
new file mode 100644 (file)
index 0000000..5910868
--- /dev/null
@@ -0,0 +1,41 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.common;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * Marker types similar to dynamically defined attributes. These  content types
+ * like "IS_DOUBTFUL", "COMPLETE"  or specific local flags.
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:59
+ */
+public class MarkerType extends DefinedTermBase {
+       static Logger logger = Logger.getLogger(MarkerType.class);
+
+       public static final MarkerType IMPORTED(){
+               return null;
+       }
+
+       public static final MarkerType TO_BE_CHECKED(){
+               return null;
+       }
+
+       public static final MarkerType IS_DOUBTFUL(){
+               return null;
+       }
+
+       public static final MarkerType COMPLETE(){
+               return null;
+       }
+
+}
\ No newline at end of file
index 7af994b0d161e0d261db311a812d7a26869f734d..d0a94401c8c5866de44c33360a4c8d8c4e39e2d3 100644 (file)
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.common;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-import java.util.*;\r
-import javax.persistence.*;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:07\r
- */\r
-@Entity\r
-public class Media extends VersionableEntity {\r
-       static Logger logger = Logger.getLogger(Media.class);\r
-\r
-       private String description;\r
-       private String location;\r
-\r
-       public String getDescription(){\r
-               return description;\r
-       }\r
-\r
-       public String getLocation(){\r
-               return location;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setDescription(String newVal){\r
-               description = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setLocation(String newVal){\r
-               location = newVal;\r
-       }\r
-\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.common;
+
+
+import etaxonomy.cdm.model.agent.Team;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:59
+ */
+public class Media extends AnnotatableEntity {
+       static Logger logger = Logger.getLogger(Media.class);
+
+       @Description("")
+       private MultilanguageString title;
+       //creation date of the media (not of the record)
+       @Description("creation date of the media (not of the record)")
+       private Calendar mediaCreated;
+       @Description("")
+       private MultilanguageString description;
+       /**
+        * A single medium such as a picture can have multiple representations in files.
+        * Common are multiple resolutions or file formats for images for example
+        */
+       private ArrayList instances;
+       private ArrayList rights;
+       private Team artist;
+
+       public ArrayList getInstances(){
+               return instances;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setInstances(ArrayList newVal){
+               instances = newVal;
+       }
+
+       public Team getArtist(){
+               return artist;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setArtist(Team newVal){
+               artist = newVal;
+       }
+
+       public ArrayList getRights(){
+               return rights;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setRights(ArrayList newVal){
+               rights = newVal;
+       }
+
+       public MultilanguageString getTitle(){
+               return title;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setTitle(MultilanguageString newVal){
+               title = newVal;
+       }
+
+       public Calendar getMediaCreated(){
+               return mediaCreated;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setMediaCreated(Calendar newVal){
+               mediaCreated = newVal;
+       }
+
+       public MultilanguageString getDescription(){
+               return description;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setDescription(MultilanguageString newVal){
+               description = newVal;
+       }
+
 }
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/MediaInstance.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/MediaInstance.java
new file mode 100644 (file)
index 0000000..f7753e9
--- /dev/null
@@ -0,0 +1,86 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.common;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * metadata for an external file such as images, phylogenetic trees, or audio
+ * recordings available through the location attribute!
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:00
+ */
+public class MediaInstance extends VersionableEntity {
+       static Logger logger = Logger.getLogger(MediaInstance.class);
+
+       //http://www.iana.org/assignments/media-types/
+       @Description("http://www.iana.org/assignments/media-types/")
+       private String mimeType;
+       //filename suffix defining the media-type as an alternative to the proper MIME type
+       @Description("filename suffix defining the media-type as an alternative to the proper MIME type")
+       private String suffix;
+       //where the media file is stored
+       @Description("where the media file is stored")
+       private String uri;
+       //in bytes
+       @Description("in bytes")
+       private int size;
+
+       public String getMimeType(){
+               return mimeType;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setMimeType(String newVal){
+               mimeType = newVal;
+       }
+
+       public String getSuffix(){
+               return suffix;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setSuffix(String newVal){
+               suffix = newVal;
+       }
+
+       public String getUri(){
+               return uri;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setUri(String newVal){
+               uri = newVal;
+       }
+
+       public int getSize(){
+               return size;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setSize(int newVal){
+               size = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/MovieFile.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/MovieFile.java
new file mode 100644 (file)
index 0000000..5abebcd
--- /dev/null
@@ -0,0 +1,39 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.common;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:01
+ */
+public class MovieFile extends ImageFile {
+       static Logger logger = Logger.getLogger(MovieFile.class);
+
+       //Length of movie in seconds
+       @Description("Length of movie in seconds")
+       private int duration;
+
+       public int getDuration(){
+               return duration;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setDuration(int newVal){
+               duration = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/MultilanguageString.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/MultilanguageString.java
new file mode 100644 (file)
index 0000000..b4f95d5
--- /dev/null
@@ -0,0 +1,37 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.common;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:01
+ */
+public class MultilanguageString {
+       static Logger logger = Logger.getLogger(MultilanguageString.class);
+
+       private ArrayList representations;
+
+       public ArrayList getRepresentations(){
+               return representations;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setRepresentations(ArrayList newVal){
+               representations = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/NameAlias.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/NameAlias.java
deleted file mode 100644 (file)
index ffc80ba..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.common;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-import java.util.*;\r
-import javax.persistence.*;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:07\r
- */\r
-@Entity\r
-public class NameAlias extends VersionableEntity {\r
-       static Logger logger = Logger.getLogger(NameAlias.class);\r
-\r
-       private String alias;\r
-       private ArrayList sources;\r
-\r
-       public String getAlias(){\r
-               return alias;\r
-       }\r
-\r
-       public ArrayList getSources(){\r
-               return sources;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setAlias(String newVal){\r
-               alias = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setSources(ArrayList newVal){\r
-               sources = newVal;\r
-       }\r
-\r
-}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/ReferencedEntityBase.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/ReferencedEntityBase.java
new file mode 100644 (file)
index 0000000..f550027
--- /dev/null
@@ -0,0 +1,70 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.common;
+
+
+import etaxonomy.cdm.model.reference.StrictReferenceBase;
+import org.apache.log4j.Logger;
+
+/**
+ * abstract class for all objects that may have a reference
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:12
+ */
+public abstract class ReferencedEntityBase extends AnnotatableEntity implements IReferencedEntity {
+       static Logger logger = Logger.getLogger(ReferencedEntityBase.class);
+
+       //Details of the reference. These are mostly (implicitly) pages but can also be tables or any other element of a
+       //publication.
+       //{if the citationMicroReference exists then there must be also a reference}
+
+       @Description("Details of the reference. These are mostly (implicitly) pages but can also be tables or any other element of a publication.
+       {if the citationMicroReference exists then there must be also a reference}
+       ")
+       private String citationMicroReference;
+       @Description("")
+       private String originalNameString;
+
+       public String getCitationMicroReference(){
+               return citationMicroReference;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setCitationMicroReference(String newVal){
+               citationMicroReference = newVal;
+       }
+
+       public String getOriginalNameString(){
+               return originalNameString;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setOriginalNameString(String newVal){
+               originalNameString = newVal;
+       }
+
+       @Transient
+       public String getCitation(){
+               return "";
+       }
+
+       @Transient
+       public StrictReferenceBase getCitation(){
+               return null;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/ReferencedMedia.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/ReferencedMedia.java
new file mode 100644 (file)
index 0000000..38710e4
--- /dev/null
@@ -0,0 +1,63 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.common;
+
+
+import etaxonomy.cdm.model.reference.ReferenceBase;
+import etaxonomy.cdm.model.reference.StrictReferenceBase;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:13
+ */
+public abstract class ReferencedMedia extends Media implements IReferencedEntity {
+       static Logger logger = Logger.getLogger(ReferencedMedia.class);
+
+       @Description("")
+       private String citationMicroReference;
+       private ReferenceBase citation;
+
+       public ReferenceBase getCitation(){
+               return citation;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setCitation(ReferenceBase newVal){
+               citation = newVal;
+       }
+
+       public String getCitationMicroReference(){
+               return citationMicroReference;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setCitationMicroReference(String newVal){
+               citationMicroReference = newVal;
+       }
+
+       @Transient
+       public String getCitation(){
+               return "";
+       }
+
+       @Transient
+       public StrictReferenceBase getCitation(){
+               return null;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Representation.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Representation.java
new file mode 100644 (file)
index 0000000..886c5a9
--- /dev/null
@@ -0,0 +1,80 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.common;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * workaround for enumerations
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:14
+ */
+public class Representation extends VersionableEntity {
+       static Logger logger = Logger.getLogger(Representation.class);
+
+       @Description("")
+       private String label;
+       @Description("")
+       private String abbreviatedLabel;
+       @Description("")
+       private String description;
+       private Language language;
+
+       public Language getLanguage(){
+               return language;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setLanguage(Language newVal){
+               language = newVal;
+       }
+
+       public String getLabel(){
+               return label;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setLabel(String newVal){
+               label = newVal;
+       }
+
+       public String getAbbreviatedLabel(){
+               return abbreviatedLabel;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setAbbreviatedLabel(String newVal){
+               abbreviatedLabel = newVal;
+       }
+
+       public String getDescription(){
+               return description;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setDescription(String newVal){
+               description = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Rights.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Rights.java
new file mode 100644 (file)
index 0000000..b94a463
--- /dev/null
@@ -0,0 +1,98 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.common;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * Typically, rights information includes a statement about various property
+ * rights associated with the resource, including intellectual property rights.
+ * http://purl.org/dc/elements/1.1/rights
+ * 
+ * http://dublincore.org/documents/dcmi-terms/
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:15
+ */
+public class Rights extends VersionableEntity {
+       static Logger logger = Logger.getLogger(Rights.class);
+
+       //external location of copyright text
+       @Description("external location of copyright text")
+       private String uri;
+       @Description("")
+       private String statement;
+       @Description("")
+       private String abbreviatedStatement;
+       private RightsTerm type;
+       private Language language;
+
+       public RightsTerm getType(){
+               return type;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setType(RightsTerm newVal){
+               type = newVal;
+       }
+
+       public Language getLanguage(){
+               return language;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setLanguage(Language newVal){
+               language = newVal;
+       }
+
+       public String getUri(){
+               return uri;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setUri(String newVal){
+               uri = newVal;
+       }
+
+       public String getStatement(){
+               return statement;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setStatement(String newVal){
+               statement = newVal;
+       }
+
+       public String getAbbreviatedStatement(){
+               return abbreviatedStatement;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setAbbreviatedStatement(String newVal){
+               abbreviatedStatement = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/RightsTerm.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/RightsTerm.java
new file mode 100644 (file)
index 0000000..dffe2e3
--- /dev/null
@@ -0,0 +1,38 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.common;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:15
+ */
+public class RightsTerm extends DefinedTermBase {
+       static Logger logger = Logger.getLogger(RightsTerm.class);
+
+       /**
+        * http://purl.org/dc/terms/accessRights
+        */
+       public static final RightsTerm ACCESS_RIGHTS(){
+               return null;
+       }
+
+       public static final RightsTerm COPYRIGHT(){
+               return null;
+       }
+
+       public static final RightsTerm LICENSE(){
+               return null;
+       }
+
+}
\ No newline at end of file
index ef81291e2003be54924e269b59ae7dc52c735924..5b2df159124fa8c230a497547a21874a29f509a9 100644 (file)
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.common;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-\r
-import java.util.*;\r
-import javax.persistence.*;\r
-\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:18\r
- */\r
-@MappedSuperclass\r
-public abstract class VersionableEntity extends CdmBase{\r
-       static Logger logger = Logger.getLogger(VersionableEntity.class);\r
-       \r
-       \r
-       /*Default creator*/\r
-       public static String createdWhoDefault = "test";\r
-       \r
-       private Calendar createdWhen;\r
-       private String createdWho;\r
-       private int id;\r
-       private String notes;\r
-       private Calendar updatedWhen;\r
-       private String updatedWho;\r
-       //the globally unique identifier\r
-       private String uuid;\r
-       private ArrayList m_View;\r
-\r
-       public Calendar getCreatedWhen(){\r
-               if (createdWhen == null){\r
-                       createdWhen = Calendar.getInstance();\r
-               }\r
-               return createdWhen;\r
-       }\r
-\r
-       public String getCreatedWho(){\r
-               if (createdWho == null){\r
-                       createdWho = createdWhoDefault;\r
-               }\r
-               return createdWho;\r
-       }\r
-\r
-       @Id @GeneratedValue(generator="system-increment")\r
-       public int getId(){\r
-               return id;\r
-       }\r
-\r
-       public ArrayList getM_View(){\r
-               return m_View;\r
-       }\r
-\r
-       public String getNotes(){\r
-               return notes;\r
-       }\r
-\r
-       public Calendar getUpdatedWhen(){\r
-               return updatedWhen;\r
-       }\r
-\r
-       public String getUpdatedWho(){\r
-               return updatedWho;\r
-       }\r
-\r
-       public String getUuid(){\r
-               if (uuid == null){\r
-                       uuid = UUID.randomUUID().toString();\r
-               }\r
-               return uuid;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setCreatedWhen(Calendar newVal){\r
-               createdWhen = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setCreatedWho(String newVal){\r
-               createdWho = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setId(int newVal){\r
-               id = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setM_View(ArrayList newVal){\r
-               m_View = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setNotes(String newVal){\r
-               notes = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setUpdatedWhen(Calendar newVal){\r
-               updatedWhen = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setUpdatedWho(String newVal){\r
-               updatedWho = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setUuid(String newVal){\r
-               uuid = newVal;\r
-       }\r
-       \r
-\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.common;
+
+
+import etaxonomy.cdm.model.agent.Person;
+import etaxonomy.cdm.model.view.View;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:25
+ */
+@MappedSuperclass
+public abstract class VersionableEntity {
+       static Logger logger = Logger.getLogger(VersionableEntity.class);
+
+       @Description("")
+       private int id;
+       //the globally unique identifier
+       @Description("the globally unique identifier")
+       private String uuid;
+       @Description("")
+       private Calendar created;
+       //time of last update for this object
+       @Description("time of last update for this object")
+       private Calendar updated;
+       private ArrayList m_View;
+       private VersionableEntity nextVersion;
+       private VersionableEntity previousVersion;
+       private Person updatedBy;
+       private Person createdBy;
+
+       public ArrayList getM_View(){
+               return m_View;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setM_View(ArrayList newVal){
+               m_View = newVal;
+       }
+
+       public VersionableEntity getNextVersion(){
+               return nextVersion;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setNextVersion(VersionableEntity newVal){
+               nextVersion = newVal;
+       }
+
+       public VersionableEntity getPreviousVersion(){
+               return previousVersion;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setPreviousVersion(VersionableEntity newVal){
+               previousVersion = newVal;
+       }
+
+       public Person getUpdatedBy(){
+               return updatedBy;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setUpdatedBy(Person newVal){
+               updatedBy = newVal;
+       }
+
+       public Person getCreatedBy(){
+               return createdBy;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setCreatedBy(Person newVal){
+               createdBy = newVal;
+       }
+
+       public int getId(){
+               return id;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setId(int newVal){
+               id = newVal;
+       }
+
+       public String getUuid(){
+               return uuid;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setUuid(String newVal){
+               uuid = newVal;
+       }
+
+       public Calendar getCreated(){
+               return created;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setCreated(Calendar newVal){
+               created = newVal;
+       }
+
+       public Calendar getUpdated(){
+               return updated;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setUpdated(Calendar newVal){
+               updated = newVal;
+       }
+
+       /**
+        * based on created
+        */
+       @Transient
+       public Calendar getValidFrom(){
+               return null;
+       }
+
+       /**
+        * based on updated
+        */
+       @Transient
+       public Calendar getValidTo(){
+               return null;
+       }
+
 }
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/AbsenceTerm.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/AbsenceTerm.java
new file mode 100644 (file)
index 0000000..3466395
--- /dev/null
@@ -0,0 +1,23 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.description;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:33
+ */
+public class AbsenceTerm extends PresenceAbsenceTermBase {
+       static Logger logger = Logger.getLogger(AbsenceTerm.class);
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/CategoricalData.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/CategoricalData.java
new file mode 100644 (file)
index 0000000..8b0caf6
--- /dev/null
@@ -0,0 +1,52 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.description;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:39
+ */
+public class CategoricalData extends FeatureBase {
+       static Logger logger = Logger.getLogger(CategoricalData.class);
+
+       //whether the sequence of ordered states is important
+       @Description("whether the sequence of ordered states is important")
+       private boolean orderRelevant;
+       private java.util.ArrayList states;
+
+       public java.util.ArrayList getStates(){
+               return states;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setStates(java.util.ArrayList newVal){
+               states = newVal;
+       }
+
+       public boolean getOrderRelevant(){
+               return orderRelevant;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setOrderRelevant(boolean newVal){
+               orderRelevant = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/CharacterTree.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/CharacterTree.java
new file mode 100644 (file)
index 0000000..7c9dad8
--- /dev/null
@@ -0,0 +1,40 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.description;
+
+
+import etaxonomy.cdm.model.common.VersionableEntity;
+import org.apache.log4j.Logger;
+
+/**
+ * Character trees arrange concepts and characters. They may also be used to
+ * define flat char. subsets for filtering purposes.
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:40
+ */
+public class CharacterTree extends VersionableEntity {
+       static Logger logger = Logger.getLogger(CharacterTree.class);
+
+       private ArrayList characters;
+
+       public ArrayList getCharacters(){
+               return characters;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setCharacters(ArrayList newVal){
+               characters = newVal;
+       }
+
+}
\ No newline at end of file
similarity index 51%
rename from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Source.java
rename to cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/CommonTaxonName.java
index ea92bc41449fc9f87e706f05d412b0bf95c71519..c674afa474aa95e6d4d5fc51cb79349454bb2933 100644 (file)
@@ -1,53 +1,53 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.common;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-import java.util.*;\r
-import javax.persistence.*;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:12\r
- */\r
-@Entity\r
-public class Source extends VersionableEntity {\r
-       static Logger logger = Logger.getLogger(Source.class);\r
-\r
-       private String name;\r
-       private String version;\r
-\r
-       public String getName(){\r
-               return name;\r
-       }\r
-\r
-       public String getVersion(){\r
-               return version;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setName(String newVal){\r
-               name = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setVersion(String newVal){\r
-               version = newVal;\r
-       }\r
-\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.description;
+
+
+import etaxonomy.cdm.model.common.Language;
+import org.apache.log4j.Logger;
+
+/**
+ * only valid for Taxa, not specimen/occurrences. Check DescriptionBase relation.
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:40
+ */
+public class CommonTaxonName extends FeatureBase {
+       static Logger logger = Logger.getLogger(CommonTaxonName.class);
+
+       @Description("")
+       private String name;
+       private Language language;
+
+       public Language getLanguage(){
+               return language;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setLanguage(Language newVal){
+               language = newVal;
+       }
+
+       public String getName(){
+               return name;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setName(String newVal){
+               name = newVal;
+       }
+
 }
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/Description.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/Description.java
new file mode 100644 (file)
index 0000000..b024240
--- /dev/null
@@ -0,0 +1,93 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.description;
+
+
+import etaxonomy.cdm.model.location.NamedArea;
+import etaxonomy.cdm.model.common.IdentifiableEntity;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:44
+ */
+public class Description extends IdentifiableEntity {
+       static Logger logger = Logger.getLogger(Description.class);
+
+       //in 95% of all cases this will be the taxon name. getLabel() should return the taxon name in case label is null.
+       @Description("in 95% of all cases this will be the taxon name. getLabel() should return the taxon name in case label is null.")
+       private String label;
+       private ArrayList sources;
+       private ArrayList geoScopes;
+       private ArrayList scopes;
+       private ArrayList features;
+
+       public ArrayList getSources(){
+               return sources;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setSources(ArrayList newVal){
+               sources = newVal;
+       }
+
+       public ArrayList getGeoScopes(){
+               return geoScopes;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setGeoScopes(ArrayList newVal){
+               geoScopes = newVal;
+       }
+
+       public ArrayList getScopes(){
+               return scopes;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setScopes(ArrayList newVal){
+               scopes = newVal;
+       }
+
+       public ArrayList getFeatures(){
+               return features;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setFeatures(ArrayList newVal){
+               features = newVal;
+       }
+
+       public String getLabel(){
+               return label;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setLabel(String newVal){
+               label = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionInSource.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionInSource.java
new file mode 100644 (file)
index 0000000..5ab369d
--- /dev/null
@@ -0,0 +1,24 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.description;
+
+
+import etaxonomy.cdm.model.common.EntityInSourceBase;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:44
+ */
+public class DescriptionInSource extends EntityInSourceBase {
+       static Logger logger = Logger.getLogger(DescriptionInSource.class);
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/DescriptiveConcept.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/DescriptiveConcept.java
new file mode 100644 (file)
index 0000000..bea4146
--- /dev/null
@@ -0,0 +1,28 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.description;
+
+
+import etaxonomy.cdm.model.common.VersionableEntity;
+import org.apache.log4j.Logger;
+
+/**
+ * Descriptive concepts (properties, object parts, observation methods, etc.)
+ * define an optional ontology for descriptions. In contrast to characters,
+ * concepts can not be scored in descriptions. - Reusable states and char.
+ * dependencies are expressed here as well.
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:45
+ */
+public class DescriptiveConcept extends VersionableEntity {
+       static Logger logger = Logger.getLogger(DescriptiveConcept.class);
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/Distribution.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/Distribution.java
new file mode 100644 (file)
index 0000000..9de1630
--- /dev/null
@@ -0,0 +1,57 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.description;
+
+
+import etaxonomy.cdm.model.location.NamedArea;
+import org.apache.log4j.Logger;
+
+/**
+ * fact attribute contains the concrete occurrence term like "Extinct"
+ * This allows all terms to enter the database and classify them basically
+ * according to class hierarchy of distribution.
+ * 
+ * {validInRegion mandatory}
+ * {type is "distribution"}
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:45
+ */
+public class Distribution extends FeatureBase {
+       static Logger logger = Logger.getLogger(Distribution.class);
+
+       private NamedArea area;
+       private PresenceAbsenceTermBase status;
+
+       public NamedArea getArea(){
+               return area;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setArea(NamedArea newVal){
+               area = newVal;
+       }
+
+       public PresenceAbsenceTermBase getStatus(){
+               return status;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setStatus(PresenceAbsenceTermBase newVal){
+               status = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/DiurnalTerm.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/DiurnalTerm.java
new file mode 100644 (file)
index 0000000..3e3925a
--- /dev/null
@@ -0,0 +1,23 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.description;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:46
+ */
+public class DiurnalTerm extends Scope {
+       static Logger logger = Logger.getLogger(DiurnalTerm.class);
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/FeatureBase.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/FeatureBase.java
new file mode 100644 (file)
index 0000000..2dffdfd
--- /dev/null
@@ -0,0 +1,94 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.description;
+
+
+import etaxonomy.cdm.model.reference.StrictReferenceBase;
+import etaxonomy.cdm.model.common.Media;
+import etaxonomy.cdm.model.common.IReferencedEntity;
+import etaxonomy.cdm.model.common.AnnotatableEntity;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:48
+ */
+public abstract class FeatureBase extends AnnotatableEntity implements IReferencedEntity {
+       static Logger logger = Logger.getLogger(FeatureBase.class);
+
+       @Description("")
+       private String modifyingText;
+       private ArrayList media;
+       /**
+        * type, category of information. In structured descriptions characters
+        */
+       private FeatureType type;
+       private ArrayList modifiers;
+
+       public ArrayList getMedia(){
+               return media;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setMedia(ArrayList newVal){
+               media = newVal;
+       }
+
+       public FeatureType getType(){
+               return type;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setType(FeatureType newVal){
+               type = newVal;
+       }
+
+       public ArrayList getModifiers(){
+               return modifiers;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setModifiers(ArrayList newVal){
+               modifiers = newVal;
+       }
+
+       public String getModifyingText(){
+               return modifyingText;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setModifyingText(String newVal){
+               modifyingText = newVal;
+       }
+
+       @Transient
+       public String getCitation(){
+               return "";
+       }
+
+       @Transient
+       public StrictReferenceBase getCitation(){
+               return null;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/FeatureType.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/FeatureType.java
new file mode 100644 (file)
index 0000000..d6d7574
--- /dev/null
@@ -0,0 +1,167 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.description;
+
+
+import etaxonomy.cdm.model.common.DefinedTermBase;
+import etaxonomy.cdm.model.common.Enumeration;
+import org.apache.log4j.Logger;
+
+/**
+ * NEEDS TO BE COMPLEMENTED
+ * SPM / TDWG
+ * http://rs.tdwg.org/ontology/voc/SpeciesProfileModel
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:49
+ */
+public class FeatureType extends DefinedTermBase {
+       static Logger logger = Logger.getLogger(FeatureType.class);
+
+       @Description("")
+       private boolean supportsQuantitativeData;
+       @Description("")
+       private boolean supportsTextData;
+       @Description("")
+       private boolean supportsDistribution;
+       @Description("")
+       private boolean supportsIndividualAssociation;
+       @Description("")
+       private boolean supportsTaxonInteraction;
+       @Description("")
+       private boolean supportsCommonTaxonName;
+       private ArrayList recommendedModifierEnumeration;
+       private ArrayList recommendedStatisticalMeasures;
+       private ArrayList supportedCategoricalEnumerations;
+
+       public ArrayList getRecommendedModifierEnumeration(){
+               return recommendedModifierEnumeration;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setRecommendedModifierEnumeration(ArrayList newVal){
+               recommendedModifierEnumeration = newVal;
+       }
+
+       public ArrayList getRecommendedStatisticalMeasures(){
+               return recommendedStatisticalMeasures;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setRecommendedStatisticalMeasures(ArrayList newVal){
+               recommendedStatisticalMeasures = newVal;
+       }
+
+       public ArrayList getSupportedCategoricalEnumerations(){
+               return supportedCategoricalEnumerations;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setSupportedCategoricalEnumerations(ArrayList newVal){
+               supportedCategoricalEnumerations = newVal;
+       }
+
+       public boolean getSupportsQuantitativeData(){
+               return supportsQuantitativeData;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setSupportsQuantitativeData(boolean newVal){
+               supportsQuantitativeData = newVal;
+       }
+
+       public boolean getSupportsTextData(){
+               return supportsTextData;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setSupportsTextData(boolean newVal){
+               supportsTextData = newVal;
+       }
+
+       public boolean getSupportsDistribution(){
+               return supportsDistribution;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setSupportsDistribution(boolean newVal){
+               supportsDistribution = newVal;
+       }
+
+       public boolean getSupportsIndividualAssociation(){
+               return supportsIndividualAssociation;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setSupportsIndividualAssociation(boolean newVal){
+               supportsIndividualAssociation = newVal;
+       }
+
+       public boolean getSupportsTaxonInteraction(){
+               return supportsTaxonInteraction;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setSupportsTaxonInteraction(boolean newVal){
+               supportsTaxonInteraction = newVal;
+       }
+
+       public boolean getSupportsCommonTaxonName(){
+               return supportsCommonTaxonName;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setSupportsCommonTaxonName(boolean newVal){
+               supportsCommonTaxonName = newVal;
+       }
+
+       public static final FeatureType DISTRIBUTION(){
+               return null;
+       }
+
+       /**
+        * special kind of OrganismInteraction
+        */
+       public static final FeatureType HYBRID_PARENT(){
+               return null;
+       }
+
+       public static final FeatureType COMMON_NAME(){
+               return null;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/IdentificationKey.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/IdentificationKey.java
new file mode 100644 (file)
index 0000000..bcdcb32
--- /dev/null
@@ -0,0 +1,42 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.description;
+
+
+import etaxonomy.cdm.model.taxon.Taxon;
+import etaxonomy.cdm.model.common.Media;
+import etaxonomy.cdm.model.common.VersionableEntity;
+import org.apache.log4j.Logger;
+
+/**
+ * Dichotomous or multifurcating
+ * authored keys (incl. legacy data)
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:52
+ */
+public class IdentificationKey extends Media VersionableEntity {
+       static Logger logger = Logger.getLogger(IdentificationKey.class);
+
+       private ArrayList coveredTaxa;
+
+       public ArrayList getCoveredTaxa(){
+               return coveredTaxa;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setCoveredTaxa(ArrayList newVal){
+               coveredTaxa = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/IndividualsAssociation.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/IndividualsAssociation.java
new file mode 100644 (file)
index 0000000..525f951
--- /dev/null
@@ -0,0 +1,54 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.description;
+
+
+import etaxonomy.cdm.model.common.MultilanguageString;
+import etaxonomy.cdm.model.occurrence.ObservationalUnit;
+import org.apache.log4j.Logger;
+
+/**
+ * {type is "host" or "hybrid_parent"}
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:53
+ */
+public class IndividualsAssociation extends FeatureBase {
+       static Logger logger = Logger.getLogger(IndividualsAssociation.class);
+
+       @Description("")
+       private MultilanguageString description;
+       private ObservationalUnit observationalUnit2;
+
+       public ObservationalUnit getObservationalUnit2(){
+               return observationalUnit2;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setObservationalUnit2(ObservationalUnit newVal){
+               observationalUnit2 = newVal;
+       }
+
+       public MultilanguageString getDescription(){
+               return description;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setDescription(MultilanguageString newVal){
+               description = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/MeasurementUnit.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/MeasurementUnit.java
new file mode 100644 (file)
index 0000000..256f50a
--- /dev/null
@@ -0,0 +1,26 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.description;
+
+
+import etaxonomy.cdm.model.common.EnumeratedTermBase;
+import org.apache.log4j.Logger;
+
+/**
+ * This class contains the measurement units such as "centimeter" or "degree
+ * Celsius"
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:59
+ */
+public class MeasurementUnit extends EnumeratedTermBase {
+       static Logger logger = Logger.getLogger(MeasurementUnit.class);
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/Modifier.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/Modifier.java
new file mode 100644 (file)
index 0000000..8d9e1dc
--- /dev/null
@@ -0,0 +1,26 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.description;
+
+
+import etaxonomy.cdm.model.common.EnumeratedTermBase;
+import org.apache.log4j.Logger;
+
+/**
+ * This class contains possible modulations for the InfoItems such as "variance",
+ * "maximum", "often", "probably"
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:00
+ */
+public class Modifier extends EnumeratedTermBase {
+       static Logger logger = Logger.getLogger(Modifier.class);
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/Paragraph.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/Paragraph.java
new file mode 100644 (file)
index 0000000..ab40756
--- /dev/null
@@ -0,0 +1,52 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.description;
+
+
+import etaxonomy.cdm.model.common.VersionableEntity;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:06
+ */
+public class Paragraph extends VersionableEntity {
+       static Logger logger = Logger.getLogger(Paragraph.class);
+
+       @Description("")
+       private String content;
+       private TextFormat format;
+
+       public TextFormat getFormat(){
+               return format;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setFormat(TextFormat newVal){
+               format = newVal;
+       }
+
+       public String getContent(){
+               return content;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setContent(String newVal){
+               content = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/PresenceAbsenceTermBase.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/PresenceAbsenceTermBase.java
new file mode 100644 (file)
index 0000000..414c686
--- /dev/null
@@ -0,0 +1,24 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.description;
+
+
+import etaxonomy.cdm.model.common.EnumeratedTermBase;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:09
+ */
+public abstract class PresenceAbsenceTermBase extends EnumeratedTermBase {
+       static Logger logger = Logger.getLogger(PresenceAbsenceTermBase.class);
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/PresenceTerm.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/PresenceTerm.java
new file mode 100644 (file)
index 0000000..fb1e1a5
--- /dev/null
@@ -0,0 +1,23 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.description;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:09
+ */
+public class PresenceTerm extends PresenceAbsenceTermBase {
+       static Logger logger = Logger.getLogger(PresenceTerm.class);
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/QuantitativeData.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/QuantitativeData.java
new file mode 100644 (file)
index 0000000..395888b
--- /dev/null
@@ -0,0 +1,70 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.description;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:11
+ */
+public class QuantitativeData extends FeatureBase {
+       static Logger logger = Logger.getLogger(QuantitativeData.class);
+
+       private MeasurementUnit unit;
+       private ArrayList statisticalValues;
+
+       public ArrayList getStatisticalValues(){
+               return statisticalValues;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setStatisticalValues(ArrayList newVal){
+               statisticalValues = newVal;
+       }
+
+       public MeasurementUnit getUnit(){
+               return unit;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setUnit(MeasurementUnit newVal){
+               unit = newVal;
+       }
+
+       @Transient
+       public float getMin(){
+               return null;
+       }
+
+       @Transient
+       public float getMax(){
+               return null;
+       }
+
+       @Transient
+       public float getTypicalLowerBoundary(){
+               return null;
+       }
+
+       @Transient
+       public float getTypicalUpperBoundary(){
+               return null;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/Scope.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/Scope.java
new file mode 100644 (file)
index 0000000..2f24aef
--- /dev/null
@@ -0,0 +1,23 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.description;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:15
+ */
+public class Scope extends Modifier {
+       static Logger logger = Logger.getLogger(Scope.class);
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/SeasonalTerm.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/SeasonalTerm.java
new file mode 100644 (file)
index 0000000..735fe01
--- /dev/null
@@ -0,0 +1,23 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.description;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:15
+ */
+public class SeasonalTerm extends Scope {
+       static Logger logger = Logger.getLogger(SeasonalTerm.class);
+
+}
\ No newline at end of file
similarity index 64%
rename from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/NomenclaturalReference.java
rename to cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/Sex.java
index 6c68b71229fb8a0a2aa671d08df368e6fe452a7f..ca4d6465af00ce5ccabb81bceb5b0d8c0bd0705a 100644 (file)
@@ -1,22 +1,23 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.publication;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:10\r
- */\r
-public interface NomenclaturalReference {\r
-\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.description;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:17
+ */
+public class Sex extends Scope {
+       static Logger logger = Logger.getLogger(Sex.class);
+
 }
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/Stage.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/Stage.java
new file mode 100644 (file)
index 0000000..d012b32
--- /dev/null
@@ -0,0 +1,23 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.description;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:18
+ */
+public class Stage extends Scope {
+       static Logger logger = Logger.getLogger(Stage.class);
+
+}
\ No newline at end of file
similarity index 56%
rename from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NameFactType.java
rename to cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/State.java
index 99901fdafec1ed57ca1bc3e5447369753d750899..87daf0c708ecf9d702aae20c652e8c40b7d0f6a0 100644 (file)
@@ -1,24 +1,24 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.name;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-\r
-/**\r
- * The list should be extensible at runtime through configuration. This needs to\r
- * be investigated.\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:08\r
- */\r
-public enum NameFactType {\r
-\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.description;
+
+
+import etaxonomy.cdm.model.common.EnumeratedTermBase;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:18
+ */
+public class State extends EnumeratedTermBase {
+       static Logger logger = Logger.getLogger(State.class);
+
 }
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/StateData.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/StateData.java
new file mode 100644 (file)
index 0000000..a21666d
--- /dev/null
@@ -0,0 +1,65 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.description;
+
+
+import etaxonomy.cdm.model.common.VersionableEntity;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:18
+ */
+public class StateData extends VersionableEntity {
+       static Logger logger = Logger.getLogger(StateData.class);
+
+       @Description("")
+       private String modifyingText;
+       private State state;
+       private ArrayList modifiers;
+
+       public State getState(){
+               return state;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setState(State newVal){
+               state = newVal;
+       }
+
+       public ArrayList getModifiers(){
+               return modifiers;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setModifiers(ArrayList newVal){
+               modifiers = newVal;
+       }
+
+       public String getModifyingText(){
+               return modifyingText;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setModifyingText(String newVal){
+               modifyingText = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/StatisticalMeasure.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/StatisticalMeasure.java
new file mode 100644 (file)
index 0000000..87ced14
--- /dev/null
@@ -0,0 +1,52 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.description;
+
+
+import etaxonomy.cdm.model.common.DefinedTermBase;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:19
+ */
+public class StatisticalMeasure extends DefinedTermBase {
+       static Logger logger = Logger.getLogger(StatisticalMeasure.class);
+
+       public static final StatisticalMeasure MIN(){
+               return null;
+       }
+
+       public static final StatisticalMeasure MAX(){
+               return null;
+       }
+
+       public static final StatisticalMeasure AVERAGE(){
+               return null;
+       }
+
+       public static final StatisticalMeasure SAMPLE_SIZE(){
+               return null;
+       }
+
+       public static final StatisticalMeasure VARIANCE(){
+               return null;
+       }
+
+       public static final StatisticalMeasure TYPICAL_LOWER_BOUNDARY(){
+               return null;
+       }
+
+       public static final StatisticalMeasure TYPICAL_UPPER_BOUNDARY(){
+               return null;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/StatisticalMeasurementValue.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/StatisticalMeasurementValue.java
new file mode 100644 (file)
index 0000000..d5a8349
--- /dev/null
@@ -0,0 +1,65 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.description;
+
+
+import etaxonomy.cdm.model.common.VersionableEntity;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:19
+ */
+public class StatisticalMeasurementValue extends VersionableEntity {
+       static Logger logger = Logger.getLogger(StatisticalMeasurementValue.class);
+
+       @Description("")
+       private float value;
+       private StatisticalMeasure type;
+       private ArrayList modifiers;
+
+       public StatisticalMeasure getType(){
+               return type;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setType(StatisticalMeasure newVal){
+               type = newVal;
+       }
+
+       public ArrayList getModifiers(){
+               return modifiers;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setModifiers(ArrayList newVal){
+               modifiers = newVal;
+       }
+
+       public float getValue(){
+               return value;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setValue(float newVal){
+               value = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/TaxonInteraction.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/TaxonInteraction.java
new file mode 100644 (file)
index 0000000..d8ea6fd
--- /dev/null
@@ -0,0 +1,54 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.description;
+
+
+import etaxonomy.cdm.model.common.MultilanguageString;
+import etaxonomy.cdm.model.taxon.TaxonBase;
+import org.apache.log4j.Logger;
+
+/**
+ * FIXME
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:21
+ */
+public class TaxonInteraction extends FeatureBase {
+       static Logger logger = Logger.getLogger(TaxonInteraction.class);
+
+       @Description("")
+       private MultilanguageString description;
+       private TaxonBase taxon2;
+
+       public TaxonBase getTaxon2(){
+               return taxon2;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setTaxon2(TaxonBase newVal){
+               taxon2 = newVal;
+       }
+
+       public MultilanguageString getDescription(){
+               return description;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setDescription(MultilanguageString newVal){
+               description = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/TextData.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/TextData.java
new file mode 100644 (file)
index 0000000..a285594
--- /dev/null
@@ -0,0 +1,51 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.description;
+
+
+import etaxonomy.cdm.model.common.Language;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:23
+ */
+public class TextData extends FeatureBase {
+       static Logger logger = Logger.getLogger(TextData.class);
+
+       private Language language;
+       private java.util.ArrayList m_Paragraph;
+
+       public java.util.ArrayList getM_Paragraph(){
+               return m_Paragraph;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setM_Paragraph(java.util.ArrayList newVal){
+               m_Paragraph = newVal;
+       }
+
+       public Language getLanguage(){
+               return language;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setLanguage(Language newVal){
+               language = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/TextFormat.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/description/TextFormat.java
new file mode 100644 (file)
index 0000000..4f5db20
--- /dev/null
@@ -0,0 +1,26 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.description;
+
+
+import etaxonomy.cdm.model.common.DefinedTermBase;
+import org.apache.log4j.Logger;
+
+/**
+ * kind of format used for structuring text. E.g. xml schema namespace, rdf, or
+ * any other format
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:24
+ */
+public class TextFormat extends DefinedTermBase {
+       static Logger logger = Logger.getLogger(TextFormat.class);
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/location/Continent.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/location/Continent.java
new file mode 100644 (file)
index 0000000..1120e38
--- /dev/null
@@ -0,0 +1,52 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.location;
+
+
+import etaxonomy.cdm.model.common.DefinedTermBase;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:42
+ */
+public class Continent extends DefinedTermBase {
+       static Logger logger = Logger.getLogger(Continent.class);
+
+       public static final Continent EUROPE(){
+               return null;
+       }
+
+       public static final Continent AFRICA(){
+               return null;
+       }
+
+       public static final Continent ASIA(){
+               return null;
+       }
+
+       public static final Continent NORTH_AMERICA(){
+               return null;
+       }
+
+       public static final Continent ANTARCTICA(){
+               return null;
+       }
+
+       public static final Continent SOUTH_AMERICA(){
+               return null;
+       }
+
+       public static final Continent OCEANIA(){
+               return null;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/location/NamedArea.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/location/NamedArea.java
new file mode 100644 (file)
index 0000000..c2e36a5
--- /dev/null
@@ -0,0 +1,122 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.location;
+
+
+import etaxonomy.cdm.model.common.EnumeratedTermBase;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:01
+ */
+public class NamedArea extends EnumeratedTermBase {
+       static Logger logger = Logger.getLogger(NamedArea.class);
+
+       //description of this area
+       @Description("description of this area")
+       private String description;
+       //description of time valid context of this area. e.g. year range
+       @Description("description of time valid context of this area. e.g. year range")
+       private TimePeriod validPeriod;
+       //Binary shape definition for user's defined area as polygon
+       @Description("Binary shape definition for user's defined area as polygon")
+       private Binary shapeFile;
+       private NamedAreaInSource source;
+       private ArrayList countriesOrWaterbodies;
+       private NamedAreaType type;
+       private NamedAreaLevel level;
+
+       public NamedAreaInSource getSource(){
+               return source;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setSource(NamedAreaInSource newVal){
+               source = newVal;
+       }
+
+       public ArrayList getCountriesOrWaterbodies(){
+               return countriesOrWaterbodies;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setCountriesOrWaterbodies(ArrayList newVal){
+               countriesOrWaterbodies = newVal;
+       }
+
+       public NamedAreaType getType(){
+               return type;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setType(NamedAreaType newVal){
+               type = newVal;
+       }
+
+       public NamedAreaLevel getLevel(){
+               return level;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setLevel(NamedAreaLevel newVal){
+               level = newVal;
+       }
+
+       public String getDescription(){
+               return description;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setDescription(String newVal){
+               description = newVal;
+       }
+
+       public TimePeriod getValidPeriod(){
+               return validPeriod;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setValidPeriod(TimePeriod newVal){
+               validPeriod = newVal;
+       }
+
+       public Binary getShapeFile(){
+               return shapeFile;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setShapeFile(Binary newVal){
+               shapeFile = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/location/NamedAreaInSource.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/location/NamedAreaInSource.java
new file mode 100644 (file)
index 0000000..5f71dd6
--- /dev/null
@@ -0,0 +1,24 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.location;
+
+
+import etaxonomy.cdm.model.common.EntityInSourceBase;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:02
+ */
+public class NamedAreaInSource extends EntityInSourceBase {
+       static Logger logger = Logger.getLogger(NamedAreaInSource.class);
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/location/NamedAreaLevel.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/location/NamedAreaLevel.java
new file mode 100644 (file)
index 0000000..deef824
--- /dev/null
@@ -0,0 +1,67 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.location;
+
+
+import etaxonomy.cdm.model.common.EnumeratedTermBase;
+import org.apache.log4j.Logger;
+
+/**
+ * Controlled vocabulary to diferenctiate levels of areas such as province, state,
+ * etc.
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:02
+ */
+public class NamedAreaLevel extends EnumeratedTermBase {
+       static Logger logger = Logger.getLogger(NamedAreaLevel.class);
+
+       /**
+        * continents
+        */
+       public static final NamedAreaLevel TDWG_LEVEL1(){
+               return null;
+       }
+
+       /**
+        * larger regions
+        */
+       public static final NamedAreaLevel TDWG_LEVEL2(){
+               return null;
+       }
+
+       /**
+        * mostly countries
+        */
+       public static final NamedAreaLevel TDWG_LEVEL3(){
+               return null;
+       }
+
+       public static final NamedAreaLevel TDWG_LEVEL4(){
+               return null;
+       }
+
+       public static final NamedAreaLevel NATURE_RESERVE(){
+               return null;
+       }
+
+       public static final NamedAreaLevel STATE(){
+               return null;
+       }
+
+       public static final NamedAreaLevel PROVINCE(){
+               return null;
+       }
+
+       public static final NamedAreaLevel TOWN(){
+               return null;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/location/NamedAreaType.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/location/NamedAreaType.java
new file mode 100644 (file)
index 0000000..782c9db
--- /dev/null
@@ -0,0 +1,39 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.location;
+
+
+import etaxonomy.cdm.model.common.DefinedTermBase;
+import org.apache.log4j.Logger;
+
+/**
+ * Controlled vocabulary to diferenctiate categories of areas
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:02
+ */
+public class NamedAreaType extends DefinedTermBase {
+       static Logger logger = Logger.getLogger(NamedAreaType.class);
+
+       /**
+        * The boundaries are given by natural factors (mountains, valleys, climate, etc.)
+        */
+       public static final NamedAreaType NATURAL_AREA(){
+               return null;
+       }
+
+       /**
+        * The boundaries depend on administration (county, state, reserve, etc.)
+        */
+       public static final NamedAreaType ADMINISTRATION_AREA(){
+               return null;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/location/Point.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/location/Point.java
new file mode 100644 (file)
index 0000000..a4cbb10
--- /dev/null
@@ -0,0 +1,81 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.location;
+
+
+import etaxonomy.cdm.model.common.VersionableEntity;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:08
+ */
+public class Point extends VersionableEntity {
+       static Logger logger = Logger.getLogger(Point.class);
+
+       @Description("")
+       private float longitude;
+       @Description("")
+       private float latitude;
+       //in Meters
+       @Description("in Meters")
+       private int errorRadius;
+       private ReferenceSystem referenceSystem;
+
+       public ReferenceSystem getReferenceSystem(){
+               return referenceSystem;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setReferenceSystem(ReferenceSystem newVal){
+               referenceSystem = newVal;
+       }
+
+       public float getLongitude(){
+               return longitude;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setLongitude(float newVal){
+               longitude = newVal;
+       }
+
+       public float getLatitude(){
+               return latitude;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setLatitude(float newVal){
+               latitude = newVal;
+       }
+
+       public int getErrorRadius(){
+               return errorRadius;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setErrorRadius(int newVal){
+               errorRadius = newVal;
+       }
+
+}
\ No newline at end of file
similarity index 50%
rename from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonFactType.java
rename to cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/location/ReferenceSystem.java
index 8e7227c03e72e1e549bb7d22943f9862befc0399..70954bd89c01a8aa4750114a715dd8beba57cd53 100644 (file)
@@ -1,24 +1,32 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.taxon;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-\r
-/**\r
- * The list should be extensible at runtime through configuration. This needs to\r
- * be investigated.\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:15\r
- */\r
-public enum TaxonFactType {\r
-\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.location;
+
+
+import etaxonomy.cdm.model.common.DefinedTermBase;
+import org.apache.log4j.Logger;
+
+/**
+ * Reference systems for coordinates also according to OGC (Open Geographical
+ * Consosrtium)
+ * The list should be extensible at runtime through configuration. This needs to
+ * be investigated.
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:14
+ */
+public class ReferenceSystem extends DefinedTermBase {
+       static Logger logger = Logger.getLogger(ReferenceSystem.class);
+
+       public static final ReferenceSystem WGS84(){
+               return null;
+       }
+
 }
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/location/WaterbodyOrCountry.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/location/WaterbodyOrCountry.java
new file mode 100644 (file)
index 0000000..e7cc2a5
--- /dev/null
@@ -0,0 +1,107 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.location;
+
+
+import etaxonomy.cdm.model.common.DefinedTermBase;
+import org.apache.log4j.Logger;
+
+/**
+ * +/- current ISO codes. year given with each entry
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:27
+ */
+public class WaterbodyOrCountry extends DefinedTermBase {
+       static Logger logger = Logger.getLogger(WaterbodyOrCountry.class);
+
+       @Description("")
+       private String iso2code;
+       @Description("")
+       private TimePeriod validPeriod;
+       private ArrayList continents;
+
+       public ArrayList getContinents(){
+               return continents;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setContinents(ArrayList newVal){
+               continents = newVal;
+       }
+
+       public String getIso2code(){
+               return iso2code;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setIso2code(String newVal){
+               iso2code = newVal;
+       }
+
+       public TimePeriod getValidPeriod(){
+               return validPeriod;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setValidPeriod(TimePeriod newVal){
+               validPeriod = newVal;
+       }
+
+       public static final WaterbodyOrCountry ARCTIC_OCEAN(){
+               return null;
+       }
+
+       public static final WaterbodyOrCountry ATLANTIC_OCEAN(){
+               return null;
+       }
+
+       public static final WaterbodyOrCountry PACIFIC_OCEAN(){
+               return null;
+       }
+
+       public static final WaterbodyOrCountry INDIAN_OCEAN(){
+               return null;
+       }
+
+       public static final WaterbodyOrCountry SOUTHERN_OCEAN(){
+               return null;
+       }
+
+       public static final WaterbodyOrCountry MEDITERRANEAN_SEA(){
+               return null;
+       }
+
+       public static final WaterbodyOrCountry BLACK_SEA(){
+               return null;
+       }
+
+       public static final WaterbodyOrCountry CASPIAN_SEA(){
+               return null;
+       }
+
+       public static final WaterbodyOrCountry RED_SEA(){
+               return null;
+       }
+
+       public static final WaterbodyOrCountry PERSIAN_GULF(){
+               return null;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/molecular/DnaSample.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/molecular/DnaSample.java
new file mode 100644 (file)
index 0000000..17e93d9
--- /dev/null
@@ -0,0 +1,112 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.molecular;
+
+
+import etaxonomy.cdm.model.occurrence.Collection;
+import etaxonomy.cdm.model.common.IdentifiableEntity;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:46
+ */
+public class DnaSample extends IdentifiableEntity {
+       static Logger logger = Logger.getLogger(DnaSample.class);
+
+       @Description("")
+       private String bankNumber;
+       //Notes on extraction, purification or amplification process
+       @Description("Notes on extraction, purification or amplification process")
+       private String productionNotes;
+       @Description("")
+       private Calendar dateProduced;
+       private ArrayList sequences;
+       private TissueSample extractedFrom;
+       private Collection storedAt;
+
+       public ArrayList getSequences(){
+               return sequences;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setSequences(ArrayList newVal){
+               sequences = newVal;
+       }
+
+       public Collection getStoredAt(){
+               return storedAt;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setStoredAt(Collection newVal){
+               storedAt = newVal;
+       }
+
+       public TissueSample getExtractedFrom(){
+               return extractedFrom;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setExtractedFrom(TissueSample newVal){
+               extractedFrom = newVal;
+       }
+
+       public String getBankNumber(){
+               return bankNumber;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setBankNumber(String newVal){
+               bankNumber = newVal;
+       }
+
+       public String getProductionNotes(){
+               return productionNotes;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setProductionNotes(String newVal){
+               productionNotes = newVal;
+       }
+
+       public Calendar getDateProduced(){
+               return dateProduced;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setDateProduced(Calendar newVal){
+               dateProduced = newVal;
+       }
+
+       public String generateTitle(){
+               return "";
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/molecular/GenBankAccession.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/molecular/GenBankAccession.java
new file mode 100644 (file)
index 0000000..4d30738
--- /dev/null
@@ -0,0 +1,53 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.molecular;
+
+
+import etaxonomy.cdm.model.common.VersionableEntity;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:50
+ */
+public class GenBankAccession extends VersionableEntity {
+       static Logger logger = Logger.getLogger(GenBankAccession.class);
+
+       @Description("")
+       private String accessionNumber;
+       @Description("")
+       private String uri;
+
+       public String getAccessionNumber(){
+               return accessionNumber;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setAccessionNumber(String newVal){
+               accessionNumber = newVal;
+       }
+
+       public String getUri(){
+               return uri;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setUri(String newVal){
+               uri = newVal;
+       }
+
+}
\ No newline at end of file
similarity index 55%
rename from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/view/Group.java
rename to cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/molecular/Locus.java
index 8cdd33b6a298ed50ed0409f2be9da2c69997517f..e5d9b1823d71e21bb67878e57a7dc4e28a16c6a7 100644 (file)
@@ -1,53 +1,54 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.view;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-import java.util.*;\r
-import javax.persistence.*;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:04\r
- */\r
-@Entity\r
-public class Group {\r
-       static Logger logger = Logger.getLogger(Group.class);\r
-\r
-       private String description;\r
-       private String location;\r
-\r
-       public String getDescription(){\r
-               return description;\r
-       }\r
-\r
-       public String getLocation(){\r
-               return location;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setDescription(String newVal){\r
-               description = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setLocation(String newVal){\r
-               location = newVal;\r
-       }\r
-\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.molecular;
+
+
+import etaxonomy.cdm.model.common.VersionableEntity;
+import org.apache.log4j.Logger;
+
+/**
+ * The region name of a DNA string. E.g. 18S, COX, etc.
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:58
+ */
+public class Locus extends VersionableEntity {
+       static Logger logger = Logger.getLogger(Locus.class);
+
+       @Description("")
+       private String name;
+       @Description("")
+       private String description;
+
+       public String getName(){
+               return name;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setName(String newVal){
+               name = newVal;
+       }
+
+       public String getDescription(){
+               return description;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setDescription(String newVal){
+               description = newVal;
+       }
+
 }
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/molecular/PhylogeneticTree.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/molecular/PhylogeneticTree.java
new file mode 100644 (file)
index 0000000..35e6c0e
--- /dev/null
@@ -0,0 +1,38 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.molecular;
+
+
+import etaxonomy.cdm.model.common.ReferencedMedia;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:08
+ */
+public class PhylogeneticTree extends ReferencedMedia {
+       static Logger logger = Logger.getLogger(PhylogeneticTree.class);
+
+       private ArrayList usedSequences;
+
+       public ArrayList getUsedSequences(){
+               return usedSequences;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setUsedSequences(ArrayList newVal){
+               usedSequences = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/molecular/Sequence.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/molecular/Sequence.java
new file mode 100644 (file)
index 0000000..618c1e8
--- /dev/null
@@ -0,0 +1,183 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.molecular;
+
+
+import etaxonomy.cdm.model.reference.ReferenceBase;
+import etaxonomy.cdm.model.reference.StrictReferenceBase;
+import etaxonomy.cdm.model.common.IdentifiableEntity;
+import etaxonomy.cdm.model.common.Media;
+import etaxonomy.cdm.model.common.IReferencedEntity;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:16
+ */
+public class Sequence extends IdentifiableEntity implements IReferencedEntity {
+       static Logger logger = Logger.getLogger(Sequence.class);
+
+       //the sequence as a string of base pairs. 5'->3'
+       @Description("the sequence as a string of base pairs. 5'->3'")
+       private String sequence;
+       //should be calculated in case sequence is set
+       @Description("should be calculated in case sequence is set")
+       private int length;
+       //should be calculated in case sequence is set
+       @Description("should be calculated in case sequence is set")
+       private Calendar dateSequenced;
+       //should be calculated in case sequence is set
+       @Description("should be calculated in case sequence is set")
+       private boolean isBarcode;
+       //the sequence as a string of base pairs. 5'->3'
+       @Description("the sequence as a string of base pairs. 5'->3'")
+       private String citationMicroReference;
+       private ReferenceBase publishedIn;
+       private ArrayList citations;
+       private ArrayList chromatograms;
+       private ArrayList genBankAccession;
+       private Locus locus;
+
+       public Locus getLocus(){
+               return locus;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setLocus(Locus newVal){
+               locus = newVal;
+       }
+
+       public ReferenceBase getPublishedIn(){
+               return publishedIn;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setPublishedIn(ReferenceBase newVal){
+               publishedIn = newVal;
+       }
+
+       public ArrayList getChromatograms(){
+               return chromatograms;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setChromatograms(ArrayList newVal){
+               chromatograms = newVal;
+       }
+
+       public ArrayList getCitations(){
+               return citations;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setCitations(ArrayList newVal){
+               citations = newVal;
+       }
+
+       public ArrayList getGenBankAccession(){
+               return genBankAccession;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setGenBankAccession(ArrayList newVal){
+               genBankAccession = newVal;
+       }
+
+       public String getSequence(){
+               return sequence;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setSequence(String newVal){
+               sequence = newVal;
+       }
+
+       public int getLength(){
+               return length;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setLength(int newVal){
+               length = newVal;
+       }
+
+       public Calendar getDateSequenced(){
+               return dateSequenced;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setDateSequenced(Calendar newVal){
+               dateSequenced = newVal;
+       }
+
+       public boolean isBarcode(){
+               return isBarcode;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setBarcode(boolean newVal){
+               isBarcode = newVal;
+       }
+
+       public String getCitationMicroReference(){
+               return citationMicroReference;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setCitationMicroReference(String newVal){
+               citationMicroReference = newVal;
+       }
+
+       @Transient
+       public StrictReferenceBase getCitation(){
+               return null;
+       }
+
+       @Transient
+       public String getCitation(){
+               return "";
+       }
+
+       public String generateTitle(){
+               return "";
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/molecular/TissueSample.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/molecular/TissueSample.java
new file mode 100644 (file)
index 0000000..07c7a79
--- /dev/null
@@ -0,0 +1,67 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.molecular;
+
+
+import etaxonomy.cdm.model.occurrence.ObservationalUnit;
+import etaxonomy.cdm.model.common.VersionableEntity;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:24
+ */
+public class TissueSample extends VersionableEntity {
+       static Logger logger = Logger.getLogger(TissueSample.class);
+
+       @Description("")
+       private String description;
+       @Description("")
+       private Calendar samplingDate;
+       private ObservationalUnit sampledFrom;
+
+       public ObservationalUnit getSampledFrom(){
+               return sampledFrom;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setSampledFrom(ObservationalUnit newVal){
+               sampledFrom = newVal;
+       }
+
+       public String getDescription(){
+               return description;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setDescription(String newVal){
+               description = newVal;
+       }
+
+       public Calendar getSamplingDate(){
+               return samplingDate;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setSamplingDate(Calendar newVal){
+               samplingDate = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/BacterialName.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/BacterialName.java
new file mode 100644 (file)
index 0000000..dde065b
--- /dev/null
@@ -0,0 +1,55 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.name;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * Taxon name class for bacteria
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:35
+ */
+public class BacterialName extends NonViralName {
+       static Logger logger = Logger.getLogger(BacterialName.class);
+
+       //Author team and year of the subgenus name
+       @Description("Author team and year of the subgenus name")
+       private String subGenusAuthorship;
+       //Approbation of name according to approved list, validation list,or validly published, paper in IJSB after 1980
+       @Description("Approbation of name according to approved list, validation list,or validly published, paper in IJSB after 1980")
+       private String nameApprobation;
+
+       public String getSubGenusAuthorship(){
+               return subGenusAuthorship;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setSubGenusAuthorship(String newVal){
+               subGenusAuthorship = newVal;
+       }
+
+       public String getNameApprobation(){
+               return nameApprobation;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setNameApprobation(String newVal){
+               nameApprobation = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/BotanicalName.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/BotanicalName.java
new file mode 100644 (file)
index 0000000..1a73a8e
--- /dev/null
@@ -0,0 +1,124 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.name;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * Taxon name class for plants
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:39
+ */
+public class BotanicalName extends NonViralName {
+       static Logger logger = Logger.getLogger(BotanicalName.class);
+
+       //if set: this name is a hybrid formula (a hybrid that does not have an own name) and no other hybrid flags may be set. A
+       //hybrid name  may not have either an authorteam nor other name components. 
+       @Description("if set: this name is a hybrid formula (a hybrid that does not have an own name) and no other hybrid flags may be set. A hybrid name  may not have either an authorteam nor other name components. ")
+       private boolean isHybridFormula = False;
+       @Description("")
+       private boolean isMonomHybrid = False;
+       @Description("")
+       private boolean isBinomHybrid = False;
+       @Description("")
+       private boolean isTrinomHybrid = False;
+       //Only for fungi: to indicate that the type of the name is asexual or not
+       @Description("Only for fungi: to indicate that the type of the name is asexual or not")
+       private boolean isAnamorphic;
+       private ArrayList parentRelationships;
+       private ArrayList childRelationships;
+
+       public ArrayList getParentRelationships(){
+               return parentRelationships;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setParentRelationships(ArrayList newVal){
+               parentRelationships = newVal;
+       }
+
+       public ArrayList getChildRelationships(){
+               return childRelationships;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setChildRelationships(ArrayList newVal){
+               childRelationships = newVal;
+       }
+
+       public boolean isHybridFormula(){
+               return isHybridFormula;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setHybridFormula(boolean newVal){
+               isHybridFormula = newVal;
+       }
+
+       public boolean isMonomHybrid(){
+               return isMonomHybrid;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setMonomHybrid(boolean newVal){
+               isMonomHybrid = newVal;
+       }
+
+       public boolean isBinomHybrid(){
+               return isBinomHybrid;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setBinomHybrid(boolean newVal){
+               isBinomHybrid = newVal;
+       }
+
+       public boolean isTrinomHybrid(){
+               return isTrinomHybrid;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setTrinomHybrid(boolean newVal){
+               isTrinomHybrid = newVal;
+       }
+
+       public boolean isAnamorphic(){
+               return isAnamorphic;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setAnamorphic(boolean newVal){
+               isAnamorphic = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/CultivarPlantName.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/CultivarPlantName.java
new file mode 100644 (file)
index 0000000..67a2a52
--- /dev/null
@@ -0,0 +1,42 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.name;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * Taxon name class for cultivars.
+ * {only possible for  CULTIVAR, GREX, CONVAR, CULTIVAR_GROUP, GRAFT_CHIMAERA and
+ * DENOMINATION_CLASS ranks}
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:42
+ */
+public class CultivarPlantName extends BotanicalName {
+       static Logger logger = Logger.getLogger(CultivarPlantName.class);
+
+       //the caracteristical name of the cultivar
+       @Description("the caracteristical name of the cultivar")
+       private String cultivarName;
+
+       public String getCultivarName(){
+               return cultivarName;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setCultivarName(String newVal){
+               cultivarName = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/HybridRelationship.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/HybridRelationship.java
new file mode 100644 (file)
index 0000000..f4ebea0
--- /dev/null
@@ -0,0 +1,81 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.name;
+
+
+import etaxonomy.cdm.model.common.ReferencedEntityBase;
+import org.apache.log4j.Logger;
+
+/**
+ * http://rs.tdwg.org/ontology/voc/TaxonName.rdf#NomenclaturalNote
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:51
+ */
+public class HybridRelationship extends ReferencedEntityBase {
+       static Logger logger = Logger.getLogger(HybridRelationship.class);
+
+       //The nomenclatural code rule considered. The article/note/recommendation in the code in question that is commented on in
+       //the note property.
+       @Description("The nomenclatural code rule considered. The article/note/recommendation in the code in question that is commented on in the note property.")
+       private String ruleConsidered;
+       private BotanicalName parentName;
+       private BotanicalName hybridName;
+       private HybridRelationshipType type;
+
+       public HybridRelationshipType getType(){
+               return type;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setType(HybridRelationshipType newVal){
+               type = newVal;
+       }
+
+       public BotanicalName getParentName(){
+               return parentName;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setParentName(BotanicalName newVal){
+               parentName = newVal;
+       }
+
+       public BotanicalName getHybridName(){
+               return hybridName;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setHybridName(BotanicalName newVal){
+               hybridName = newVal;
+       }
+
+       public String getRuleConsidered(){
+               return ruleConsidered;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setRuleConsidered(String newVal){
+               ruleConsidered = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/HybridRelationshipType.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/HybridRelationshipType.java
new file mode 100644 (file)
index 0000000..fd37e81
--- /dev/null
@@ -0,0 +1,43 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.name;
+
+
+import etaxonomy.cdm.model.common.EnumeratedTermBase;
+import org.apache.log4j.Logger;
+
+/**
+ * The list should be extensible at runtime through configuration. This needs to
+ * be investigated.
+ * 
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:51
+ */
+public class HybridRelationshipType extends EnumeratedTermBase {
+       static Logger logger = Logger.getLogger(HybridRelationshipType.class);
+
+       public static final HybridRelationshipType FIRST_PARENT(){
+               return null;
+       }
+
+       public static final HybridRelationshipType SECOND_PARENT(){
+               return null;
+       }
+
+       public static final HybridRelationshipType FEMALE_PARENT(){
+               return null;
+       }
+
+       public static final HybridRelationshipType MALE_PARENT(){
+               return null;
+       }
+
+}
\ No newline at end of file
similarity index 69%
rename from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/common/Fact.java
rename to cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/ITypeDesignation.java
index 12004aad6beca734033f1d691966b94531a039cf..b0f68948d1105e4fecec499e9d218dc986d2e1fb 100644 (file)
@@ -1,22 +1,22 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.common;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:03\r
- */\r
-public interface Fact {\r
-\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.name;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:55
+ */
+public interface ITypeDesignation {
+
 }
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NameFact.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NameFact.java
deleted file mode 100644 (file)
index 6cb3154..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.name;\r
-\r
-import eu.etaxonomy.cdm.model.publication.PublicationBase;\r
-import eu.etaxonomy.cdm.model.common.Fact;\r
-import eu.etaxonomy.cdm.model.common.Media;\r
-import eu.etaxonomy.cdm.model.common.FactBase;\r
-import org.apache.log4j.Logger;\r
-import java.util.*;\r
-import javax.persistence.*;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:08\r
- */\r
-@Entity\r
-public class NameFact extends FactBase implements Fact {\r
-       static Logger logger = Logger.getLogger(NameFact.class);\r
-\r
-       private ArrayList medias;\r
-       private PublicationBase citation;\r
-       private NameFactType type;\r
-\r
-       public PublicationBase getCitation(){\r
-               return citation;\r
-       }\r
-\r
-       public ArrayList getMedias(){\r
-               return medias;\r
-       }\r
-\r
-       public NameFactType getType(){\r
-               return type;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setCitation(PublicationBase newVal){\r
-               citation = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setMedias(ArrayList newVal){\r
-               medias = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setType(NameFactType newVal){\r
-               type = newVal;\r
-       }\r
-\r
-}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NameInSource.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NameInSource.java
new file mode 100644 (file)
index 0000000..a5b38c1
--- /dev/null
@@ -0,0 +1,24 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.name;
+
+
+import etaxonomy.cdm.model.common.EntityInSourceBase;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:03
+ */
+public class NameInSource extends EntityInSourceBase {
+       static Logger logger = Logger.getLogger(NameInSource.class);
+
+}
\ No newline at end of file
index bb58312d3eba695800dcbc821e9b1cdf3264e0ea..1129cc91efe9a7f4f9cbd3ac39d842a83743d27d 100644 (file)
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.name;\r
-\r
-\r
-import eu.etaxonomy.cdm.model.publication.PublicationBase;\r
-import eu.etaxonomy.cdm.model.common.VersionableEntity;\r
-import org.apache.log4j.Logger;\r
-import java.util.*;\r
-import javax.persistence.*;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:08\r
- */\r
-@Entity\r
-public class NameRelationship extends VersionableEntity {\r
-       static Logger logger = Logger.getLogger(NameRelationship.class);\r
-\r
-       private String citationMicroReference;\r
-       private String ruleConsidered;\r
-       private PublicationBase citation;\r
-       private NameRelationshipType type;\r
-       private TaxonName toName;\r
-       private TaxonName fromName;\r
-\r
-       @Transient\r
-       public PublicationBase getCitation(){\r
-               return citation;\r
-       }\r
-\r
-       public String getCitationMicroReference(){\r
-               return citationMicroReference;\r
-       }\r
-\r
-       @ManyToOne( cascade = {CascadeType.PERSIST, CascadeType.MERGE} )\r
-       public TaxonName getFromName(){\r
-               return fromName;\r
-       }\r
-\r
-       public String getRuleConsidered(){\r
-               return ruleConsidered;\r
-       }\r
-\r
-       @ManyToOne( cascade = {CascadeType.PERSIST, CascadeType.MERGE} )\r
-       public TaxonName getToName(){\r
-               return toName;\r
-       }\r
-\r
-       public NameRelationshipType getType(){\r
-               return type;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setCitation(PublicationBase newVal){\r
-               citation = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setCitationMicroReference(String newVal){\r
-               citationMicroReference = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setFromName(TaxonName newVal){\r
-               fromName = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setRuleConsidered(String newVal){\r
-               ruleConsidered = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setToName(TaxonName newVal){\r
-               toName = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setType(NameRelationshipType newVal){\r
-               type = newVal;\r
-       }\r
-\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.name;
+
+
+import etaxonomy.cdm.model.common.ReferencedEntityBase;
+import org.apache.log4j.Logger;
+
+/**
+ * http://rs.tdwg.org/ontology/voc/TaxonName.rdf#NomenclaturalNote
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:03
+ */
+public class NameRelationship extends ReferencedEntityBase {
+       static Logger logger = Logger.getLogger(NameRelationship.class);
+
+       //The nomenclatural code rule considered. The article/note/recommendation in the code in question that is commented on in
+       //the note property.
+       @Description("The nomenclatural code rule considered. The article/note/recommendation in the code in question that is commented on in the note property.")
+       private String ruleConsidered;
+       private TaxonNameBase fromName;
+       private NameRelationshipType type;
+       private TaxonNameBase toName;
+
+       public TaxonNameBase getFromName(){
+               return fromName;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setFromName(TaxonNameBase newVal){
+               fromName = newVal;
+       }
+
+       public NameRelationshipType getType(){
+               return type;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setType(NameRelationshipType newVal){
+               type = newVal;
+       }
+
+       public TaxonNameBase getToName(){
+               return toName;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setToName(TaxonNameBase newVal){
+               toName = newVal;
+       }
+
+       public String getRuleConsidered(){
+               return ruleConsidered;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setRuleConsidered(String newVal){
+               ruleConsidered = newVal;
+       }
+
 }
\ No newline at end of file
index 39067e9708abc1eaf85eb7649985ac54a3e37d74..849c46d47f3d574a26955c491ed8bddae1848d2f 100644 (file)
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.name;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-\r
-/**\r
- * Nomenclatural status are also included.\r
- * \r
- * The list should be extensible at runtime through configuration. This needs to\r
- * be investigated.\r
- * \r
- * \r
- * Subgroups are:\r
- * ================\r
- * \r
- * Typification:\r
- * -------------------\r
- * Type\r
- * ConservedType\r
- * RejectedType\r
- * SameType\r
- * LectoType\r
- * NeoType\r
- * \r
- * \r
- * Hyprid:\r
- * -----------------------\r
- * FirstParent\r
- * SecondParent\r
- * FemaleParent\r
- * MaleParent\r
- * \r
- * \r
- * Illegitimate:\r
- * ------------------------\r
- * Illegitimate,\r
- * Superfluous,\r
- * LaterHomonym,\r
- * TreatedAsLaterHomonym,\r
- * RejectedInFavour,\r
- * Rejected,\r
- * UtiqueRejected,\r
- * ConservedProp,\r
- * OrthographyConservedProp\r
- * \r
- * Legitimate:\r
- * ------------------------\r
- * Legitimate,\r
- * Basionym,\r
- * ReplacedSynonym,\r
- * Novum,\r
- * AlternativeName,\r
- * Alternativ,\r
- * ConservedAgainst,\r
- * Conserved,\r
- * OrthographyConserved,\r
- * RejectedProp,\r
- * UtiqueRejectedProp\r
- * \r
- * Invalid:\r
- * -----------------------------------\r
- * Invalid,\r
- * Nudum,\r
- * Provisional,\r
- * CombinationInvalid,\r
- * ValidatedByName,\r
- * LaterValidatedByName\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:09\r
- */\r
-public enum NameRelationshipType {\r
-       ORTHOGRAPHIC_VARIANT,\r
-       AMBIGUOUS,\r
-       DOUBTFUL,\r
-       CONFUSUM,\r
-       TYPE,\r
-       CONSERVED_TYPE,\r
-       REJECTED_TYPE,\r
-       SAME_TYPE,\r
-       LECTOTYPE,\r
-       NEOTYPE,\r
-       FIRST_PARENT,\r
-       SECOND_PARENT,\r
-       FEMALE_PARENT,\r
-       MALE_PARENT,\r
-       ILLEGITIMATE,\r
-       LATER_HOMONYM,\r
-       SUPERFLUOUS,\r
-       REJECTED_IN_FAVOR,\r
-       TREATED_AS_LATER_HOMONYM,\r
-       REJECTED,\r
-       UTIQUE_REJECTED,\r
-       CONSERVED_PROP,\r
-       ORTHOGRAPHY_CONSERVED_PROP,\r
-       LEGITIMATE,\r
-       ALTERNATIVE,\r
-       UTIQUE_REJECTED_PROP,\r
-       ORTHOGRAPHY_CONSERVED,\r
-       REJECTED_PROP,\r
-       CONSERVED,\r
-       CONSERVED_AGAINST,\r
-       ALTERNATIVE_NAME,\r
-       BASIONYM,\r
-       NOVUM,\r
-       REPLACED_SYNONYM,\r
-       SANCTIONED,\r
-       INVALID,\r
-       NUDUM,\r
-       COMBINATION_INVALID,\r
-       PROVISIONAL,\r
-       VALIDATED_BY_NAME,\r
-       LATER_VALIDATED_BY_NAME;\r
-\r
-       public boolean isHybridType(){\r
-               return false;\r
-       }\r
-\r
-       public boolean isInvalidType(){\r
-               return false;\r
-       }\r
-\r
-       public boolean isLegitimateType(){\r
-               return false;\r
-       }\r
-\r
-       public boolean isTypificationType(){\r
-               return false;\r
-       }\r
-\r
-       public boolean isIllegitimateType(){\r
-               return false;\r
-       }\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.name;
+
+
+import etaxonomy.cdm.model.common.EnumeratedTermBase;
+import org.apache.log4j.Logger;
+
+/**
+ * The list should be extensible at runtime through configuration. This needs to
+ * be investigated.
+ * 
+ * 
+ * Subgroups are:
+ * ================
+ * 
+ * 
+ * Illegitimate:
+ * ------------------------
+ * LaterHomonym,
+ * TreatedAsLaterHomonym,
+ * RejectedInFavour
+ * 
+ * Legitimate:
+ * ------------------------
+ * ReplacedSynonym,
+ * AlternativeName,
+ * ConservedAgainst,
+ * OrthographyConserved
+ * 
+ * Invalid:
+ * -----------------------------------
+ * ValidatedByName,
+ * LaterValidatedByName
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:03
+ */
+public class NameRelationshipType extends EnumeratedTermBase {
+       static Logger logger = Logger.getLogger(NameRelationshipType.class);
+
+       @Description("")
+       private static final int initializationClassUri = http://rs.tdwg.org/ontology/voc/TaxonName.rdf#NomenclaturalNoteTypeTerm;
+
+       public getInitializationClassUri(){
+               return initializationClassUri;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setInitializationClassUri(newVal){
+               initializationClassUri = newVal;
+       }
+
+       public boolean isInvalidType(){
+               //True, if enum is of type:
+               //Invalid,
+               //Nudum,
+               //Provisional,
+               //CombinationInvalid,
+               //ValidatedByName,
+               //LaterValidatedByName
+
+               return false;
+       }
+
+       public boolean isLegitimateType(){
+               //True, if enum is of type:
+               //Legitimate,
+               //Basionym,
+               //ReplacedSynonym,
+               //Novum,
+               //AlternativeName,
+               //Alternativ,
+               //ConservedAgainst,
+               //Conserved,
+               //OrthographyConserved,
+               //RejectedProp,
+               //UtiqueRejectedProp
+
+               return false;
+       }
+
+       public boolean isIllegitimateType(){
+               //True, if enum is of type:
+               //Illegitimate,
+               //Superfluous,
+               //LaterHomonym,
+               //TreatedAsLaterHomonym,
+               //RejectedInFavour,
+               //Rejected,
+               //UtiqueRejected,
+               //ConservedProp,
+               //OrthographyConservedProp
+
+               return false;
+       }
+
+       public static final NameRelationshipType ORTHOGRAPHIC_VARIANT(){
+               return null;
+       }
+
+       public static final NameRelationshipType REJECTED_IN_FAVOUR(){
+               return null;
+       }
+
+       public static final NameRelationshipType LATER_HOMONYM(){
+               return null;
+       }
+
+       public static final NameRelationshipType TREATED_AS_LATER_HOMONYM(){
+               return null;
+       }
+
+       public static final NameRelationshipType ALTERNATIVE_NAME(){
+               return null;
+       }
+
+       public static final NameRelationshipType BASIONYM(){
+               return null;
+       }
+
+       public static final NameRelationshipType REPLACED_SYNONYM(){
+               return null;
+       }
+
+       public static final NameRelationshipType CONSERVED_AGAINST(){
+               return null;
+       }
+
+       public static final NameRelationshipType VALIDATED_BY_NAME(){
+               return null;
+       }
+
+       public static final NameRelationshipType LATER_VALIDATED_BY_NAME(){
+               return null;
+       }
+
 }
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NameTypeDesignation.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NameTypeDesignation.java
new file mode 100644 (file)
index 0000000..7379f6d
--- /dev/null
@@ -0,0 +1,68 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.name;
+
+
+import etaxonomy.cdm.model.common.ReferencedEntityBase;
+import org.apache.log4j.Logger;
+
+/**
+ * {only for typified names which have a rank above "species", in this case the
+ * type has to be a "species" name}
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:04
+ */
+public class NameTypeDesignation extends ReferencedEntityBase implements ITypeDesignation {
+       static Logger logger = Logger.getLogger(NameTypeDesignation.class);
+
+       @Description("")
+       private boolean isRejectedType;
+       @Description("")
+       private boolean isConservedType;
+       private TaxonNameBase typeSpecies;
+
+       public TaxonNameBase getTypeSpecies(){
+               return typeSpecies;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setTypeSpecies(TaxonNameBase newVal){
+               typeSpecies = newVal;
+       }
+
+       public boolean isRejectedType(){
+               return isRejectedType;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setRejectedType(boolean newVal){
+               isRejectedType = newVal;
+       }
+
+       public boolean isConservedType(){
+               return isConservedType;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setConservedType(boolean newVal){
+               isConservedType = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalCode.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalCode.java
deleted file mode 100644 (file)
index aa65a86..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.name;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:09\r
- */\r
-public enum NomenclaturalCode {\r
-       ICBN,\r
-       ICZN,\r
-       BACTERIOLOGICAL,\r
-       ICNCP,\r
-       VIRAL;\r
-\r
-//     private ArrayList m_TaxonName;\r
-//\r
-//     public ArrayList getM_TaxonName(){\r
-//             return m_TaxonName;\r
-//     }\r
-//\r
-//     /**\r
-//      * \r
-//      * @param newVal\r
-//      */\r
-//     public void setM_TaxonName(ArrayList newVal){\r
-//             m_TaxonName = newVal;\r
-//     }\r
-}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalStatus.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalStatus.java
new file mode 100644 (file)
index 0000000..5aba1c8
--- /dev/null
@@ -0,0 +1,55 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.name;
+
+
+import etaxonomy.cdm.model.common.ReferencedEntityBase;
+import org.apache.log4j.Logger;
+
+/**
+ * http://rs.tdwg.org/ontology/voc/TaxonName.rdf#PublicationStatus
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:04
+ */
+public class NomenclaturalStatus extends ReferencedEntityBase {
+       static Logger logger = Logger.getLogger(NomenclaturalStatus.class);
+
+       //The nomenclatural code rule considered. The article/note/recommendation in the code in question that is commented on in
+       //the note property.
+       @Description("The nomenclatural code rule considered. The article/note/recommendation in the code in question that is commented on in the note property.")
+       private String ruleConsidered;
+       private NomenclaturalStatusType type;
+
+       public NomenclaturalStatusType getType(){
+               return type;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setType(NomenclaturalStatusType newVal){
+               type = newVal;
+       }
+
+       public String getRuleConsidered(){
+               return ruleConsidered;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setRuleConsidered(String newVal){
+               ruleConsidered = newVal;
+       }
+
+}
\ No newline at end of file
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
new file mode 100644 (file)
index 0000000..2ecdd52
--- /dev/null
@@ -0,0 +1,200 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.name;
+
+
+import etaxonomy.cdm.model.common.EnumeratedTermBase;
+import org.apache.log4j.Logger;
+
+/**
+ * The list should be extensible at runtime through configuration. This needs to
+ * be investigated.
+ * 
+ * http://rs.tdwg.org/ontology/voc/TaxonName.rdf#NomenclaturalNoteTypeTerm
+ * 
+ * Subgroups are:
+ * ================
+ * 
+ * Illegitimate:
+ * ------------------------
+ * Illegitimate,
+ * Superfluous,
+ * Rejected,
+ * UtiqueRejected,
+ * ConservedProp,
+ * OrthographyConservedProp
+ * 
+ * Legitimate:
+ * ------------------------
+ * Legitimate,
+ * Novum,
+ * Alternativ,
+ * Conserved,
+ * OrthographyConserved,
+ * RejectedProp,
+ * UtiqueRejectedProp
+ * 
+ * Invalid:
+ * -----------------------------------
+ * Invalid,
+ * Nudum,
+ * Provisional,
+ * CombinationInvalid
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:05
+ */
+public class NomenclaturalStatusType extends EnumeratedTermBase {
+       static Logger logger = Logger.getLogger(NomenclaturalStatusType.class);
+
+       @Description("")
+       private static final int ontologyClassUri = http://rs.tdwg.org/ontology/voc/TaxonName.rdf#PublicationStatus;
+
+       public getOntologyClassUri(){
+               return ontologyClassUri;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setOntologyClassUri(newVal){
+               ontologyClassUri = newVal;
+       }
+
+       public boolean isInvalidType(){
+               //True, if enum is of type:
+               //Invalid,
+               //Nudum,
+               //Provisional,
+               //CombinationInvalid,
+               //ValidatedByName,
+               //LaterValidatedByName
+
+               return false;
+       }
+
+       public boolean isLegitimateType(){
+               //True, if enum is of type:
+               //Legitimate,
+               //Basionym,
+               //ReplacedSynonym,
+               //Novum,
+               //AlternativeName,
+               //Alternativ,
+               //ConservedAgainst,
+               //Conserved,
+               //OrthographyConserved,
+               //RejectedProp,
+               //UtiqueRejectedProp
+
+               return false;
+       }
+
+       public boolean isIllegitimateType(){
+               //True, if enum is of type:
+               //Illegitimate,
+               //Superfluous,
+               //LaterHomonym,
+               //TreatedAsLaterHomonym,
+               //RejectedInFavour,
+               //Rejected,
+               //UtiqueRejected,
+               //ConservedProp,
+               //OrthographyConservedProp
+
+               return false;
+       }
+
+       public static final NomenclaturalStatusType AMBIGUOUS(){
+               return null;
+       }
+
+       public static final NomenclaturalStatusType DOUBTFUL(){
+               return null;
+       }
+
+       public static final NomenclaturalStatusType CONFUSUM(){
+               return null;
+       }
+
+       public static final NomenclaturalStatusType ILLEGITIMATE(){
+               return null;
+       }
+
+       public static final NomenclaturalStatusType SUPERFLUOUS(){
+               return null;
+       }
+
+       public static final NomenclaturalStatusType REJECTED(){
+               return null;
+       }
+
+       public static final NomenclaturalStatusType UTIQUE_REJECTED(){
+               return null;
+       }
+
+       public static final NomenclaturalStatusType CONSERVED_PROP(){
+               return null;
+       }
+
+       public static final NomenclaturalStatusType ORTHOGRAPHY_CONSERVED_PROP(){
+               return null;
+       }
+
+       public static final NomenclaturalStatusType LEGITIMATE(){
+               return null;
+       }
+
+       public static final NomenclaturalStatusType ALTERNATIVE(){
+               return null;
+       }
+
+       public static final NomenclaturalStatusType NOVUM(){
+               return null;
+       }
+
+       public static final NomenclaturalStatusType UTIQUE_REJECTED_PROP(){
+               return null;
+       }
+
+       public static final NomenclaturalStatusType ORTHOGRAPHY_CONSERVED(){
+               return null;
+       }
+
+       public static final NomenclaturalStatusType REJECTED_PROP(){
+               return null;
+       }
+
+       public static final NomenclaturalStatusType CONSERVED(){
+               return null;
+       }
+
+       public static final NomenclaturalStatusType SANCTIONED(){
+               return null;
+       }
+
+       public static final NomenclaturalStatusType INVALID(){
+               return null;
+       }
+
+       public static final NomenclaturalStatusType NUDUM(){
+               return null;
+       }
+
+       public static final NomenclaturalStatusType COMBINATION_INVALID(){
+               return null;
+       }
+
+       public static final NomenclaturalStatusType PROVISIONAL(){
+               return null;
+       }
+
+}
\ No newline at end of file
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
new file mode 100644 (file)
index 0000000..931119d
--- /dev/null
@@ -0,0 +1,128 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.name;
+
+
+import etaxonomy.cdm.model.agent.Team;
+import org.apache.log4j.Logger;
+
+/**
+ * Taxon name class for all non viral taxa.
+ * Parentetical authorship is derived from basionym relationship.
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:05
+ */
+public class NonViralName extends TaxonNameBase {
+       static Logger logger = Logger.getLogger(NonViralName.class);
+
+       //The suprageneric or the genus name
+       @Description("The suprageneric or the genus name")
+       private String uninomial;
+       //Genus subdivision epithet
+       @Description("Genus subdivision epithet")
+       private String infraGenericEpithet;
+       //species epithet
+       @Description("species epithet")
+       private String specificEpithet;
+       //Species subdivision epithet
+       @Description("Species subdivision epithet")
+       private String infraSpecificEpithet;
+       /**
+        * Author team that published the present combination
+        */
+       private Team combinationAuthorTeam;
+       /**
+        * Author team that contributed to the publication of the present combination
+        */
+       private Team exCombinationAuthorTeam;
+
+       public Team getCombinationAuthorTeam(){
+               return combinationAuthorTeam;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setCombinationAuthorTeam(Team newVal){
+               combinationAuthorTeam = newVal;
+       }
+
+       public Team getExCombinationAuthorTeam(){
+               return exCombinationAuthorTeam;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setExCombinationAuthorTeam(Team newVal){
+               exCombinationAuthorTeam = newVal;
+       }
+
+       public String getUninomial(){
+               return uninomial;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setUninomial(String newVal){
+               uninomial = newVal;
+       }
+
+       public String getInfraGenericEpithet(){
+               return infraGenericEpithet;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setInfraGenericEpithet(String newVal){
+               infraGenericEpithet = newVal;
+       }
+
+       public String getSpecificEpithet(){
+               return specificEpithet;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setSpecificEpithet(String newVal){
+               specificEpithet = newVal;
+       }
+
+       public String getInfraSpecificEpithet(){
+               return infraSpecificEpithet;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setInfraSpecificEpithet(String newVal){
+               infraSpecificEpithet = newVal;
+       }
+
+       /**
+        * returns concatenated und formated authorteams including basionym and
+        * combination authors 
+        */
+       @Transient
+       public String getFullAuthorship(){
+               return "";
+       }
+
+}
\ No newline at end of file
index 5627379a013a62ef3174b638f92e2fd9716133dd..6019c5145777b35a326beb4984a218364eb706d5 100644 (file)
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.name;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-\r
-/**\r
- * The list should be extensible at runtime through configuration. This needs to\r
- * be investigated.\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:11\r
- */\r
-public enum Rank {\r
-       EMPIRE,\r
-       DOMAIN,\r
-       SUPER_KINGDOM,\r
-       KINGDOM,\r
-       SUBKINGDOM,\r
-       INFRAKINGDOM,\r
-       SUPERPHYLUM,\r
-       PHYLUM,\r
-       SUBPHYLUM,\r
-       INFRAPHYLUM,\r
-       SUPERDIVISION,\r
-       DIVISION,\r
-       SUBDIVISION,\r
-       INFRADIVISION,\r
-       SUPERCLASS,\r
-       CLASS,\r
-       SUBCLASS,\r
-       INFRACLASS,\r
-       SUPERORDER,\r
-       ORDER,\r
-       SUBORDER,\r
-       INFRAORDER,\r
-       SUPERFAMILY,\r
-       FAMILY,\r
-       SUBFAMILY,\r
-       INFRAFAMILY,\r
-       SUPERTRIBE,\r
-       TRIBE,\r
-       SUBTRIBE,\r
-       INFRATRIBE,\r
-       SUPRAGENERIC_TAXON,\r
-       GENUS,\r
-       SUBGENUS,\r
-       INFRAGENUS,\r
-       SECTION,\r
-       SUBSECTION,\r
-       SERIES,\r
-       SUBSERIES,\r
-       SPECIES_AGGREGATE,\r
-       INFRAGENERIC_TAXON,\r
-       SPECIES,\r
-       SUBSPECIFIC_AGGREGATE,\r
-       SUBSPECIES,\r
-       INFRASPECIES,\r
-       VARIETY,\r
-       BIO_VARIETY,\r
-       PATHO_VARIETY,\r
-       SUB_VARIETY,\r
-       SUB_SUB_VARIETY,\r
-       FORM,\r
-       SPECIAL_FORM,\r
-       SUBFORM,\r
-       SUBSUBFORM,\r
-       INFRASPECIFIC_TAXON,\r
-       CANDIDATE,\r
-       DENOMINATION_CLASS,\r
-       GRAFT_CHIMAERA,\r
-       CULTIVAR_GROUP,\r
-       GREX,\r
-       CONVAR,\r
-       CULTIVAR;\r
-\r
-//     private ArrayList m_TaxonName;\r
-//\r
-//     public ArrayList getM_TaxonName(){\r
-//             return m_TaxonName;\r
-//     }\r
-//\r
-//     /**\r
-//      * \r
-//      * @param newVal\r
-//      */\r
-//     public void setM_TaxonName(ArrayList newVal){\r
-//             m_TaxonName = newVal;\r
-//     }\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.name;
+
+
+import etaxonomy.cdm.model.common.EnumeratedTermBase;
+import org.apache.log4j.Logger;
+
+/**
+ * This list should be extensible at runtime through configuration. This needs to
+ * be investigated.
+ * http://rs.tdwg.org/ontology/voc/TaxonRank
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:12
+ */
+public class Rank extends EnumeratedTermBase {
+       static Logger logger = Logger.getLogger(Rank.class);
+
+       @Description("")
+       private static final int ontologyClassUri = http://rs.tdwg.org/ontology/voc/TaxonRank#TaxonRankTerm;
+       private ArrayList m_TaxonNameBase;
+
+       public ArrayList getM_TaxonNameBase(){
+               return m_TaxonNameBase;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setM_TaxonNameBase(ArrayList newVal){
+               m_TaxonNameBase = newVal;
+       }
+
+       public getOntologyClassUri(){
+               return ontologyClassUri;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setOntologyClassUri(newVal){
+               ontologyClassUri = newVal;
+       }
+
+       public static final Rank EMPIRE(){
+               return null;
+       }
+
+       public static final Rank DOMAIN(){
+               return null;
+       }
+
+       public static final Rank SUPER_KINGDOM(){
+               return null;
+       }
+
+       public static final Rank KINGDOM(){
+               return null;
+       }
+
+       public static final Rank SUBKINGDOM(){
+               return null;
+       }
+
+       public static final Rank INFRAKINGDOM(){
+               return null;
+       }
+
+       public static final Rank SUPERPHYLUM(){
+               return null;
+       }
+
+       public static final Rank PHYLUM(){
+               return null;
+       }
+
+       public static final Rank SUBPHYLUM(){
+               return null;
+       }
+
+       public static final Rank INFRAPHYLUM(){
+               return null;
+       }
+
+       public static final Rank SUPERDIVISION(){
+               return null;
+       }
+
+       public static final Rank DIVISION(){
+               return null;
+       }
+
+       public static final Rank SUBDIVISION(){
+               return null;
+       }
+
+       public static final Rank INFRADIVISION(){
+               return null;
+       }
+
+       public static final Rank SUPERCLASS(){
+               return null;
+       }
+
+       public static final Rank CLASS(){
+               return null;
+       }
+
+       public static final Rank SUBCLASS(){
+               return null;
+       }
+
+       public static final Rank INFRACLASS(){
+               return null;
+       }
+
+       public static final Rank SUPERORDER(){
+               return null;
+       }
+
+       public static final Rank ORDER(){
+               return null;
+       }
+
+       public static final Rank SUBORDER(){
+               return null;
+       }
+
+       public static final Rank INFRAORDER(){
+               return null;
+       }
+
+       public static final Rank SUPERFAMILY(){
+               return null;
+       }
+
+       public static final Rank FAMILY(){
+               return null;
+       }
+
+       public static final Rank SUBFAMILY(){
+               return null;
+       }
+
+       public static final Rank INFRAFAMILY(){
+               return null;
+       }
+
+       public static final Rank SUPERTRIBE(){
+               return null;
+       }
+
+       public static final Rank TRIBE(){
+               return null;
+       }
+
+       public static final Rank SUBTRIBE(){
+               return null;
+       }
+
+       public static final Rank INFRATRIBE(){
+               return null;
+       }
+
+       public static final Rank SUPRAGENERIC_TAXON(){
+               return null;
+       }
+
+       public static final Rank GENUS(){
+               return null;
+       }
+
+       public static final Rank SUBGENUS(){
+               return null;
+       }
+
+       public static final Rank INFRAGENUS(){
+               return null;
+       }
+
+       public static final Rank SECTION(){
+               return null;
+       }
+
+       public static final Rank SUBSECTION(){
+               return null;
+       }
+
+       public static final Rank SERIES(){
+               return null;
+       }
+
+       public static final Rank SUBSERIES(){
+               return null;
+       }
+
+       public static final Rank SPECIES_AGGREGATE(){
+               return null;
+       }
+
+       public static final Rank INFRAGENERIC_TAXON(){
+               return null;
+       }
+
+       public static final Rank SPECIES(){
+               return null;
+       }
+
+       public static final Rank SUBSPECIFIC_AGGREGATE(){
+               return null;
+       }
+
+       public static final Rank SUBSPECIES(){
+               return null;
+       }
+
+       public static final Rank INFRASPECIES(){
+               return null;
+       }
+
+       public static final Rank VARIETY(){
+               return null;
+       }
+
+       public static final Rank BIO_VARIETY(){
+               return null;
+       }
+
+       public static final Rank PATHO_VARIETY(){
+               return null;
+       }
+
+       public static final Rank SUBVARIETY(){
+               return null;
+       }
+
+       public static final Rank SUBSUBVARIETY(){
+               return null;
+       }
+
+       public static final Rank CONVAR(){
+               return null;
+       }
+
+       public static final Rank FORM(){
+               return null;
+       }
+
+       public static final Rank SPECIAL_FORM(){
+               return null;
+       }
+
+       public static final Rank SUBFORM(){
+               return null;
+       }
+
+       public static final Rank SUBSUBFORM(){
+               return null;
+       }
+
+       public static final Rank INFRASPECIFIC_TAXON(){
+               return null;
+       }
+
+       public static final Rank CANDIDATE(){
+               return null;
+       }
+
+       public static final Rank DENOMINATION_CLASS(){
+               return null;
+       }
+
+       public static final Rank GREX(){
+               return null;
+       }
+
+       public static final Rank GRAFT_CHIMAERA(){
+               return null;
+       }
+
+       public static final Rank CULTIVAR_GROUP(){
+               return null;
+       }
+
+       public static final Rank CULTIVAR(){
+               return null;
+       }
+
 }
\ No newline at end of file
similarity index 52%
rename from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/TypeDesignation.java
rename to cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/SpecimenTypeDesignation.java
index 994d519c6edf6c8e1157aaacc4e5c802ac46501c..6773a46b84ca0f74fc21c7079bf6b6bf0448b228 100644 (file)
@@ -1,55 +1,53 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.name;\r
-\r
-\r
-import eu.etaxonomy.cdm.model.specimen.Specimen;\r
-import eu.etaxonomy.cdm.model.common.VersionableEntity;\r
-import org.apache.log4j.Logger;\r
-import java.util.*;\r
-import javax.persistence.*;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:17\r
- */\r
-@Entity\r
-public class TypeDesignation extends VersionableEntity {\r
-       static Logger logger = Logger.getLogger(TypeDesignation.class);\r
-\r
-       private Specimen typeSpecimen;\r
-       private TypeDesignationStatus typeStatus;\r
-\r
-       public Specimen getTypeSpecimen(){\r
-               return typeSpecimen;\r
-       }\r
-\r
-       public TypeDesignationStatus getTypeStatus(){\r
-               return typeStatus;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setTypeSpecimen(Specimen newVal){\r
-               typeSpecimen = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setTypeStatus(TypeDesignationStatus newVal){\r
-               typeStatus = newVal;\r
-       }\r
-\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.name;
+
+
+import etaxonomy.cdm.model.occurrence.ObservationalUnit;
+import etaxonomy.cdm.model.common.ReferencedEntityBase;
+import org.apache.log4j.Logger;
+
+/**
+ * {only for typified names which have the "species" rank or below}
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:17
+ */
+public class SpecimenTypeDesignation extends ReferencedEntityBase implements ITypeDesignation {
+       static Logger logger = Logger.getLogger(SpecimenTypeDesignation.class);
+
+       private ObservationalUnit typeSpecimen;
+       private TypeDesignationStatus typeStatus;
+
+       public ObservationalUnit getTypeSpecimen(){
+               return typeSpecimen;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setTypeSpecimen(ObservationalUnit newVal){
+               typeSpecimen = newVal;
+       }
+
+       public TypeDesignationStatus getTypeStatus(){
+               return typeStatus;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setTypeStatus(TypeDesignationStatus newVal){
+               typeStatus = newVal;
+       }
+
 }
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/TaxonName.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/TaxonName.java
deleted file mode 100644 (file)
index de8f266..0000000
+++ /dev/null
@@ -1,516 +0,0 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.name;\r
-\r
-\r
-import java.util.ArrayList;\r
-\r
-import javax.persistence.CascadeType;\r
-import javax.persistence.Entity;\r
-import javax.persistence.ManyToOne;\r
-import javax.persistence.Transient;\r
-\r
-import org.apache.log4j.Logger;\r
-\r
-import eu.etaxonomy.cdm.model.agent.Team;\r
-import eu.etaxonomy.cdm.model.common.IdentifiableEntity;\r
-import eu.etaxonomy.cdm.model.common.Source;\r
-import eu.etaxonomy.cdm.model.publication.NomenclaturalReference;\r
-import eu.etaxonomy.cdm.strategy.INameCacheStrategy;\r
-\r
-import javax.xml.bind.annotation.XmlElement;\r
-import javax.xml.bind.annotation.XmlRootElement;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:15\r
- */\r
-@XmlRootElement  //JAXP test dummy\r
-@Entity\r
-public class TaxonName extends IdentifiableEntity {\r
-       static Logger logger = Logger.getLogger(TaxonName.class);\r
-\r
-       private INameCacheStrategy cacheStrategy;\r
-       private String year;\r
-       \r
-       //TODO make private but then the Aspect class has problems !!\r
-       public TaxonName(){\r
-               \r
-       }\r
-       \r
-       public TaxonName(INameCacheStrategy cacheStrategy){\r
-               setCacheStrategy(cacheStrategy);\r
-       }\r
-       \r
-       //TODO inserted for PROTOTYPE\r
-       public String getYear(){\r
-               return this.year;\r
-       }\r
-       public void setYear(String strYear){\r
-               this.year = strYear;\r
-       }\r
-       \r
-       //TODO for PROTOTYPE\r
-       @Transient\r
-       public INameCacheStrategy getCacheStrategy() {\r
-               return cacheStrategy;\r
-       }\r
-       public void setCacheStrategy(INameCacheStrategy cacheStrategy) {\r
-               this.cacheStrategy = cacheStrategy;\r
-       }\r
-       \r
-       \r
-       //The complete author string and maybe year\r
-       private String authorship;\r
-       private String cultivarName;\r
-       //The full name including author strings and maybe year\r
-       private String fullName;\r
-       //Genus part of a name\r
-       private String genus;\r
-       private boolean hasProblem;\r
-       private String idInSource;\r
-       //Genus subdivision epithet\r
-       private String infragenericEpithet;\r
-       private String infraSpecificEpithet;\r
-       private boolean isAnamorphic;\r
-       //alternative naming: useFullName\r
-       //when not set this flag protects the detailed parsed attributes from being overwritten\r
-       private boolean isAtomised;\r
-       private boolean isBinomHybrid;\r
-       private boolean isCultivarGroup;\r
-       //if set: this name is a hybrid formula (a hybrid that does not have an own name) and no other hybrid flags may be set. A\r
-       //hybrid name  may not have either an authorteam nor other name components. \r
-       private boolean isHybridFormula;\r
-       private boolean isMonomHybrid;\r
-       private boolean isTrinomHybrid;\r
-       //The name without author strings and year\r
-       private String name;\r
-       private String nameInSource;\r
-       private String nomenclaturalMicroReference;\r
-       //The species epithet\r
-       private String specificEpithet;\r
-       //Name of taxon when rank is above genus\r
-       private String uninomial;\r
-       //Non-atomised addition to a name\r
-       private String unnamedNamePhrase;\r
-       private Rank rank;\r
-       private ArrayList inverseNameRelation;\r
-       private NomenclaturalCode nomenclaturalCode;\r
-       private ArrayList facts;\r
-       private ArrayList nameRelation;\r
-       private ArrayList typeDesignations;\r
-       private NomenclaturalReference nomenclaturalReference;\r
-       private Source source;\r
-       private Team authorTeam;\r
-       private Team exAuthorTeam;\r
-\r
-       public String getAuthorship(){\r
-               return authorship;\r
-       }\r
-\r
-       @ManyToOne(cascade = {CascadeType.PERSIST, CascadeType.MERGE}  )\r
-       public Team getAuthorTeam(){\r
-               return authorTeam;\r
-       }\r
-\r
-       @XmlElement\r
-       public String getCultivarName(){\r
-               return cultivarName;\r
-       }\r
-\r
-       @ManyToOne( cascade = {CascadeType.PERSIST, CascadeType.MERGE} )\r
-       public Team getExAuthorTeam(){\r
-               return exAuthorTeam;\r
-       }\r
-\r
-       public ArrayList getFacts(){\r
-               return facts;\r
-       }\r
-\r
-       public String getFullName(){\r
-               if (name == null){ \r
-                       return cacheStrategy.getFullNameCache(this);\r
-               }else{\r
-                       return fullName;\r
-               }\r
-       }\r
-\r
-       public String getGenus(){\r
-               return genus;\r
-       }\r
-\r
-       public boolean getHasProblem(){\r
-               return hasProblem;\r
-       }\r
-\r
-       public String getIdInSource(){\r
-               return idInSource;\r
-       }\r
-\r
-       public String getInfragenericEpithet(){\r
-               return infragenericEpithet;\r
-       }\r
-\r
-       public String getInfraSpecificEpithet(){\r
-               return infraSpecificEpithet;\r
-       }\r
-\r
-       public ArrayList getInverseNameRelation(){\r
-               return inverseNameRelation;\r
-       }\r
-\r
-       public String getName(){\r
-               if (name == null){ \r
-                       return cacheStrategy.getNameCache(this);\r
-               }else{\r
-                       return name;\r
-               }\r
-       }\r
-\r
-       public String getNameInSource(){\r
-               return nameInSource;\r
-       }\r
-\r
-       public ArrayList getNameRelation(){\r
-               return nameRelation;\r
-       }\r
-\r
-       public NomenclaturalCode getNomenclaturalCode(){\r
-               return nomenclaturalCode;\r
-       }\r
-\r
-       public String getNomenclaturalMicroReference(){\r
-               return nomenclaturalMicroReference;\r
-       }\r
-\r
-       @Transient\r
-       public NomenclaturalReference getNomenclaturalReference(){\r
-               return nomenclaturalReference;\r
-       }\r
-\r
-       @Transient\r
-       public String[] getProblems(){\r
-               return null;\r
-       }\r
-\r
-       public Rank getRank(){\r
-               return rank;\r
-       }\r
-\r
-       @Transient\r
-       public Source getSource(){\r
-               return source;\r
-       }\r
-\r
-       public String getSpecificEpithet(){\r
-               return specificEpithet;\r
-       }\r
-\r
-       public ArrayList getTypeDesignations(){\r
-               return typeDesignations;\r
-       }\r
-\r
-       public String getUninomial(){\r
-               return uninomial;\r
-       }\r
-\r
-       public String getUnnamedNamePhrase(){\r
-               return unnamedNamePhrase;\r
-       }\r
-       \r
-\r
-       public boolean isAnamorphic(){\r
-               return isAnamorphic;\r
-       }\r
-\r
-       public boolean isAtomised(){\r
-               return isAtomised;\r
-       }\r
-\r
-       public boolean isBinomHybrid(){\r
-               return isBinomHybrid;\r
-       }\r
-\r
-       public boolean isCultivarGroup(){\r
-               return isCultivarGroup;\r
-       }\r
-\r
-       public boolean isHybridFormula(){\r
-               return isHybridFormula;\r
-       }\r
-\r
-       public boolean isMonomHybrid(){\r
-               return isMonomHybrid;\r
-       }\r
-\r
-       public boolean isTrinomHybrid(){\r
-               return isTrinomHybrid;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param fullname\r
-        */\r
-       public boolean parseName(String fullname){\r
-               return false;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setAnamorphic(boolean newVal){\r
-               isAnamorphic = newVal;\r
-               \r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setAtomised(boolean newVal){\r
-               isAtomised = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setAuthorship(String newVal){\r
-               authorship = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setAuthorTeam(Team newVal){\r
-               authorTeam = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setBinomHybrid(boolean newVal){\r
-               isBinomHybrid = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setCultivarGroup(boolean newVal){\r
-               isCultivarGroup = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setCultivarName(String newVal){\r
-               cultivarName = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setExAuthorTeam(Team newVal){\r
-               exAuthorTeam = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setFacts(ArrayList newVal){\r
-               facts = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setFullName(String newVal){\r
-               fullName = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setGenus(String newVal){\r
-               genus = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setHasProblem(boolean newVal){\r
-               hasProblem = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setHybridFormula(boolean newVal){\r
-               isHybridFormula = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setIdInSource(String newVal){\r
-               idInSource = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setInfragenericEpithet(String newVal){\r
-               infragenericEpithet = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setInfraSpecificEpithet(String newVal){\r
-               infraSpecificEpithet = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setInverseNameRelation(ArrayList newVal){\r
-               inverseNameRelation = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setMonomHybrid(boolean newVal){\r
-               isMonomHybrid = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setName(String newVal){\r
-               name = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setNameInSource(String newVal){\r
-               nameInSource = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setNameRelation(ArrayList newVal){\r
-               nameRelation = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setNomenclaturalCode(NomenclaturalCode newVal){\r
-               nomenclaturalCode = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setNomenclaturalMicroReference(String newVal){\r
-               nomenclaturalMicroReference = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setNomenclaturalReference(NomenclaturalReference newVal){\r
-               nomenclaturalReference = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setRank(Rank newVal){\r
-               rank = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setSource(Source newVal){\r
-               source = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setSpecificEpithet(String newVal){\r
-               specificEpithet = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setTrinomHybrid(boolean newVal){\r
-               isTrinomHybrid = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setTypeDesignations(ArrayList newVal){\r
-               //super.changeSupport.firePropertyChange("typeDesignations", typeDesignations, newVal);\r
-               typeDesignations = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setUninomial(String newVal){\r
-               uninomial = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setUnnamedNamePhrase(String newVal){\r
-               unnamedNamePhrase = newVal;\r
-       }\r
-       \r
-}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/TaxonNameBase.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/TaxonNameBase.java
new file mode 100644 (file)
index 0000000..95950df
--- /dev/null
@@ -0,0 +1,246 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.name;
+
+
+import etaxonomy.cdm.model.reference.INomenclaturalReference;
+import etaxonomy.cdm.model.reference.StrictReferenceBase;
+import etaxonomy.cdm.model.common.IReferencedEntity;
+import etaxonomy.cdm.model.common.IdentifiableEntity;
+import org.apache.log4j.Logger;
+
+/**
+ * The upmost (abstract) class for scientific taxon names regardless of the any
+ * particular nomenclatural code. The scientific name including author strings and
+ * maybe year is stored in IdentifiableEntity.titleCache
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:22
+ */
+public abstract class TaxonNameBase extends IdentifiableEntity implements IReferencedEntity {
+       static Logger logger = Logger.getLogger(TaxonNameBase.class);
+
+       //The scientific name without author strings and year
+       @Description("The scientific name without author strings and year")
+       private String name;
+       //Non-atomised addition to a name not ruled by a nomenclatural code
+       @Description("Non-atomised addition to a name not ruled by a nomenclatural code")
+       private String appendedPhrase;
+       //Details of the nomenclatural reference (protologue). These are mostly (implicitly) pages but can also be figures or
+       //tables or any other element of a publication.
+       //{only if a nomenclatural reference exists}
+       @Description("Details of the nomenclatural reference (protologue). These are mostly (implicitly) pages but can also be figures or tables or any other element of a publication.
+       {only if a nomenclatural reference exists}")
+       private String nomenclaturalMicroReference;
+       //this flag will be set to true if the parseName method was unable to successfully parse the name
+       @Description("this flag will be set to true if the parseName method was unable to successfully parse the name")
+       private boolean hasProblem = False;
+       private Rank rank;
+       private ArrayList newCombinations;
+       private TaxonNameBase basionym;
+       /**
+        * if set, the Reference.isNomenclaturallyRelevant flag should be set to true!
+        */
+       private INomenclaturalReference nomenclaturalReference;
+       private ArrayList typeDesignations;
+       private ArrayList nameInSource;
+       private ArrayList nameRelations;
+       private ArrayList inverseNameRelations;
+       private ArrayList status;
+
+       public Rank getRank(){
+               return rank;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setRank(Rank newVal){
+               rank = newVal;
+       }
+
+       public ArrayList getNameRelations(){
+               return nameRelations;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setNameRelations(ArrayList newVal){
+               nameRelations = newVal;
+       }
+
+       public ArrayList getInverseNameRelations(){
+               return inverseNameRelations;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setInverseNameRelations(ArrayList newVal){
+               inverseNameRelations = newVal;
+       }
+
+       public ArrayList getTypeDesignations(){
+               return typeDesignations;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setTypeDesignations(ArrayList newVal){
+               typeDesignations = newVal;
+       }
+
+       public ArrayList getStatus(){
+               return status;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setStatus(ArrayList newVal){
+               status = newVal;
+       }
+
+       public INomenclaturalReference getNomenclaturalReference(){
+               return nomenclaturalReference;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setNomenclaturalReference(INomenclaturalReference newVal){
+               nomenclaturalReference = newVal;
+       }
+
+       public ArrayList getNameInSource(){
+               return nameInSource;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setNameInSource(ArrayList newVal){
+               nameInSource = newVal;
+       }
+
+       public ArrayList getNewCombinations(){
+               return newCombinations;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setNewCombinations(ArrayList newVal){
+               newCombinations = newVal;
+       }
+
+       public TaxonNameBase getBasionym(){
+               return basionym;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setBasionym(TaxonNameBase newVal){
+               basionym = newVal;
+       }
+
+       public String getName(){
+               return name;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setName(String newVal){
+               name = newVal;
+       }
+
+       public String getAppendedPhrase(){
+               return appendedPhrase;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setAppendedPhrase(String newVal){
+               appendedPhrase = newVal;
+       }
+
+       public String getNomenclaturalMicroReference(){
+               return nomenclaturalMicroReference;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setNomenclaturalMicroReference(String newVal){
+               nomenclaturalMicroReference = newVal;
+       }
+
+       public boolean getHasProblem(){
+               return hasProblem;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setHasProblem(boolean newVal){
+               hasProblem = newVal;
+       }
+
+       @Transient
+       public StrictReferenceBase getCitation(){
+               return null;
+       }
+
+       @Transient
+       public String getCitationString(){
+               return "";
+       }
+
+       @Transient
+       public String[] getProblems(){
+               return "";
+       }
+
+       /**
+        * returns year of according nomenclatural reference, null if nomenclatural
+        * reference does not exist
+        */
+       @Transient
+       public String getYear(){
+               return "";
+       }
+
+       /**
+        * 
+        * @param fullname
+        */
+       public boolean parseName(String fullname){
+               return false;
+       }
+
+}
\ No newline at end of file
index 59ff507b4b3f3ec55d3fbfd2da4f61173733a1e1..6f07300098ffa4820555b157ccda7637a1c876bb 100644 (file)
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.name;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-\r
-/**\r
- * The list should be extensible at runtime through configuration. This needs to\r
- * be investigated.\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:17\r
- */\r
-public enum TypeDesignationStatus {\r
-       HOLOTYPE,\r
-       LECTOTYPE,\r
-       NEOTYPE,\r
-       EPITYPE,\r
-       ISOLECTOTYPE,\r
-       ISONEOTYPE,\r
-       ISOTYPE,\r
-       PARANEOTYPE,\r
-       PARATYPE,\r
-       SECOND_STEP_LECTOTYPE,\r
-       SECOND_STEP_NEOTYPE,\r
-       SYNTYPE,\r
-       PARALECTOTYPE,\r
-       ISOEPITYPE,\r
-       ICONOTYPE,\r
-       PHOTOTYPE\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.name;
+
+
+import etaxonomy.cdm.model.common.EnumeratedTermBase;
+import org.apache.log4j.Logger;
+
+/**
+ * The list should be extensible at runtime through configuration. This needs to
+ * be investigated.
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:25
+ */
+public class TypeDesignationStatus extends EnumeratedTermBase {
+       static Logger logger = Logger.getLogger(TypeDesignationStatus.class);
+
+       @Description("")
+       private static final int initializationClassUri = http://rs.tdwg.org/ontology/voc/TaxonName#NomencalturalTypeTypeTerm;
+
+       public getInitializationClassUri(){
+               return initializationClassUri;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setInitializationClassUri(newVal){
+               initializationClassUri = newVal;
+       }
+
+       public static final TypeDesignationStatus HOLOTYPE(){
+               return null;
+       }
+
+       public static final TypeDesignationStatus LECTOTYPE(){
+               return null;
+       }
+
+       public static final TypeDesignationStatus NEOTYPE(){
+               return null;
+       }
+
+       public static final TypeDesignationStatus EPITYPE(){
+               return null;
+       }
+
+       public static final TypeDesignationStatus ISOLECTOTYPE(){
+               return null;
+       }
+
+       public static final TypeDesignationStatus ISONEOTYPE(){
+               return null;
+       }
+
+       public static final TypeDesignationStatus ISOTYPE(){
+               return null;
+       }
+
+       public static final TypeDesignationStatus PARANEOTYPE(){
+               return null;
+       }
+
+       public static final TypeDesignationStatus PARATYPE(){
+               return null;
+       }
+
+       public static final TypeDesignationStatus SECOND_STEP_LECTOTYPE(){
+               return null;
+       }
+
+       public static final TypeDesignationStatus SECOND_STEP_NEOTYPE(){
+               return null;
+       }
+
+       public static final TypeDesignationStatus SYNTYPE(){
+               return null;
+       }
+
+       public static final TypeDesignationStatus PARALECTOTYPE(){
+               return null;
+       }
+
+       public static final TypeDesignationStatus ISOEPITYPE(){
+               return null;
+       }
+
+       public static final TypeDesignationStatus ICONOTYPE(){
+               return null;
+       }
+
+       public static final TypeDesignationStatus PHOTOTYPE(){
+               return null;
+       }
+
 }
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/ViralName.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/ViralName.java
new file mode 100644 (file)
index 0000000..362a1ed
--- /dev/null
@@ -0,0 +1,43 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.name;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * use name attribute for the entire virus name!
+ * 
+ * examples see ICTVdb:
+ * http://www.ncbi.nlm.nih.gov/ICTVdb/Ictv/vn_indxA.htm
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:26
+ */
+public class ViralName extends TaxonNameBase {
+       static Logger logger = Logger.getLogger(ViralName.class);
+
+       //The accepted acronym for the Virus, e.g. PCV for Peanut Clump Virus
+       @Description("The accepted acronym for the Virus, e.g. PCV for Peanut Clump Virus")
+       private String acronym;
+
+       public String getAcronym(){
+               return acronym;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setAcronym(String newVal){
+               acronym = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/ZoologicalName.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/ZoologicalName.java
new file mode 100644 (file)
index 0000000..23f9c96
--- /dev/null
@@ -0,0 +1,45 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.name;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * Taxon name class for animals
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:27
+ */
+public class ZoologicalName extends NonViralName {
+       static Logger logger = Logger.getLogger(ZoologicalName.class);
+
+       //Name of the breed of an animal
+       @Description("Name of the breed of an animal")
+       private String breed;
+
+       public String getBreed(){
+               return breed;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setBreed(String newVal){
+               breed = newVal;
+       }
+
+       @Transient
+       public String getFullAuthorship(){
+               return "";
+       }
+
+}
\ No newline at end of file
similarity index 77%
rename from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/specimen/Collection.java
rename to cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/Collection.java
index c88fad18e866e3f176463030c3b66ca0bf54dd05..2c36b5d9c917503bae7cd3f43621587973bf76ad 100644 (file)
@@ -1,93 +1,99 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.specimen;\r
-\r
-\r
-import eu.etaxonomy.cdm.model.common.VersionableEntity;\r
-import org.apache.log4j.Logger;\r
-import java.util.*;\r
-import javax.persistence.*;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:01\r
- */\r
-@Entity\r
-public class Collection extends VersionableEntity {\r
-       static Logger logger = Logger.getLogger(Collection.class);\r
-\r
-       private String code;\r
-       private String codeStandard;\r
-       private String name;\r
-       private String townOrLocation;\r
-       private Institution institute;\r
-\r
-       public String getCode(){\r
-               return code;\r
-       }\r
-\r
-       public String getCodeStandard(){\r
-               return codeStandard;\r
-       }\r
-\r
-       public Institution getInstitute(){\r
-               return institute;\r
-       }\r
-\r
-       public String getName(){\r
-               return name;\r
-       }\r
-\r
-       public String getTownOrLocation(){\r
-               return townOrLocation;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setCode(String newVal){\r
-               code = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setCodeStandard(String newVal){\r
-               codeStandard = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setInstitute(Institution newVal){\r
-               institute = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setName(String newVal){\r
-               name = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setTownOrLocation(String newVal){\r
-               townOrLocation = newVal;\r
-       }\r
-\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.occurrence;
+
+
+import etaxonomy.cdm.model.agent.Institution;
+import etaxonomy.cdm.model.common.IdentifiableEntity;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:40
+ */
+public class Collection extends IdentifiableEntity {
+       static Logger logger = Logger.getLogger(Collection.class);
+
+       @Description("")
+       private String code;
+       @Description("")
+       private String codeStandard;
+       @Description("")
+       private String name;
+       @Description("")
+       private String townOrLocation;
+       private Institution institute;
+
+       public Institution getInstitute(){
+               return institute;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setInstitute(Institution newVal){
+               institute = newVal;
+       }
+
+       public String getCode(){
+               return code;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setCode(String newVal){
+               code = newVal;
+       }
+
+       public String getCodeStandard(){
+               return codeStandard;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setCodeStandard(String newVal){
+               codeStandard = newVal;
+       }
+
+       public String getName(){
+               return name;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setName(String newVal){
+               name = newVal;
+       }
+
+       public String getTownOrLocation(){
+               return townOrLocation;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setTownOrLocation(String newVal){
+               townOrLocation = newVal;
+       }
+
+       public String generateTitle(){
+               return "";
+       }
+
 }
\ No newline at end of file
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
new file mode 100644 (file)
index 0000000..fa9eaeb
--- /dev/null
@@ -0,0 +1,67 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.occurrence;
+
+
+import etaxonomy.cdm.model.taxon.Taxon;
+import etaxonomy.cdm.model.agent.Team;
+import etaxonomy.cdm.model.common.AnnotatableEntity;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:45
+ */
+public class Determination extends AnnotatableEntity {
+       static Logger logger = Logger.getLogger(Determination.class);
+
+       @Description("")
+       private Calendar identificationDate;
+       private Taxon taxon;
+       private Team identifierTeam;
+
+       public Taxon getTaxon(){
+               return taxon;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setTaxon(Taxon newVal){
+               taxon = newVal;
+       }
+
+       public Team getIdentifierTeam(){
+               return identifierTeam;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setIdentifierTeam(Team newVal){
+               identifierTeam = newVal;
+       }
+
+       public Calendar getIdentificationDate(){
+               return identificationDate;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setIdentificationDate(Calendar newVal){
+               identificationDate = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/Fossil.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/Fossil.java
new file mode 100644 (file)
index 0000000..6f6a228
--- /dev/null
@@ -0,0 +1,23 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.occurrence;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:49
+ */
+public class Fossil extends Specimen {
+       static Logger logger = Logger.getLogger(Fossil.class);
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/LivingIndividual.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/LivingIndividual.java
new file mode 100644 (file)
index 0000000..7d17001
--- /dev/null
@@ -0,0 +1,50 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.occurrence;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:57
+ */
+public class LivingIndividual extends Occurrence {
+       static Logger logger = Logger.getLogger(LivingIndividual.class);
+
+       private ArrayList parents;
+       private ArrayList offspring;
+
+       public ArrayList getParents(){
+               return parents;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setParents(ArrayList newVal){
+               parents = newVal;
+       }
+
+       public ArrayList getOffspring(){
+               return offspring;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setOffspring(ArrayList newVal){
+               offspring = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/Observation.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/Observation.java
new file mode 100644 (file)
index 0000000..e5ff303
--- /dev/null
@@ -0,0 +1,23 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.occurrence;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:05
+ */
+public class Observation extends Occurrence {
+       static Logger logger = Logger.getLogger(Observation.class);
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/ObservationalUnit.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/ObservationalUnit.java
new file mode 100644 (file)
index 0000000..9275360
--- /dev/null
@@ -0,0 +1,82 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.occurrence;
+
+
+import etaxonomy.cdm.model.common.MultilanguageString;
+import etaxonomy.cdm.model.description.Description;
+import etaxonomy.cdm.model.common.IdentifiableEntity;
+import org.apache.log4j.Logger;
+
+/**
+ * part of a specimen or observation that is being described or determined.
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:06
+ */
+public class ObservationalUnit extends IdentifiableEntity {
+       static Logger logger = Logger.getLogger(ObservationalUnit.class);
+
+       //Description defining the Observational unit in the context of the original Occurrence
+       @Description("Description defining the Observational unit in the context of the original Occurrence")
+       private MultilanguageString definition;
+       private ArrayList descriptions;
+       private ArrayList determinations;
+       private Occurrence occurence;
+
+       public ArrayList getDeterminations(){
+               return determinations;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setDeterminations(ArrayList newVal){
+               determinations = newVal;
+       }
+
+       public Occurrence getOccurence(){
+               return occurence;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setOccurence(Occurrence newVal){
+               occurence = newVal;
+       }
+
+       public ArrayList getDescriptions(){
+               return descriptions;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setDescriptions(ArrayList newVal){
+               descriptions = newVal;
+       }
+
+       public MultilanguageString getDefinition(){
+               return definition;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setDefinition(MultilanguageString newVal){
+               definition = newVal;
+       }
+
+}
\ No newline at end of file
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
new file mode 100644 (file)
index 0000000..0a728cb
--- /dev/null
@@ -0,0 +1,129 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.occurrence;
+
+
+import etaxonomy.cdm.model.location.Point;
+import etaxonomy.cdm.model.agent.Team;
+import etaxonomy.cdm.model.location.NamedArea;
+import etaxonomy.cdm.model.common.IdentifiableEntity;
+import etaxonomy.cdm.model.common.Media;
+import org.apache.log4j.Logger;
+
+/**
+ * type figures are observations with at least a figure object in media
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:06
+ */
+public class Occurrence extends IdentifiableEntity {
+       static Logger logger = Logger.getLogger(Occurrence.class);
+
+       //Locality name (as free text) where this occurrence happened 
+       @Description("Locality name (as free text) where this occurrence happened ")
+       private String locality;
+       //Date on which this occurrence happened 
+       @Description("Date on which this occurrence happened ")
+       private Calendar eventDate;
+       private ArrayList media;
+       private Collection collection;
+       private Point exactLocation;
+       private NamedArea namedArea;
+       private Team collector;
+
+       public Collection getCollection(){
+               return collection;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setCollection(Collection newVal){
+               collection = newVal;
+       }
+
+       public Point getExactLocation(){
+               return exactLocation;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setExactLocation(Point newVal){
+               exactLocation = newVal;
+       }
+
+       public ArrayList getMedia(){
+               return media;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setMedia(ArrayList newVal){
+               media = newVal;
+       }
+
+       public Team getCollector(){
+               return collector;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setCollector(Team newVal){
+               collector = newVal;
+       }
+
+       public NamedArea getNamedArea(){
+               return namedArea;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setNamedArea(NamedArea newVal){
+               namedArea = newVal;
+       }
+
+       public String getLocality(){
+               return locality;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setLocality(String newVal){
+               locality = newVal;
+       }
+
+       public Calendar getEventDate(){
+               return eventDate;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setEventDate(Calendar newVal){
+               eventDate = newVal;
+       }
+
+       public String generateTitle(){
+               return "";
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/PreservationMethod.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/PreservationMethod.java
new file mode 100644 (file)
index 0000000..b9e4259
--- /dev/null
@@ -0,0 +1,39 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.occurrence;
+
+
+import etaxonomy.cdm.model.common.DefinedTermBase;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:09
+ */
+public class PreservationMethod extends DefinedTermBase {
+       static Logger logger = Logger.getLogger(PreservationMethod.class);
+
+       @Description("")
+       private static final int initializationClassUri = http://rs.tdwg.org/ontology/voc/Collection.rdf#SpecimenPreservationMethodTypeTerm;
+
+       public getInitializationClassUri(){
+               return initializationClassUri;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setInitializationClassUri(newVal){
+               initializationClassUri = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/Specimen.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/occurrence/Specimen.java
new file mode 100644 (file)
index 0000000..90a329b
--- /dev/null
@@ -0,0 +1,50 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.occurrence;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:17
+ */
+public class Specimen extends Occurrence {
+       static Logger logger = Logger.getLogger(Specimen.class);
+
+       private PreservationMethod preservation;
+       private Specimen derivedFrom;
+
+       public PreservationMethod getPreservation(){
+               return preservation;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setPreservation(PreservationMethod newVal){
+               preservation = newVal;
+       }
+
+       public Specimen getDerivedFrom(){
+               return derivedFrom;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setDerivedFrom(Specimen newVal){
+               derivedFrom = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/BookSection.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/BookSection.java
deleted file mode 100644 (file)
index 88dd5bb..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.publication;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-import java.util.*;\r
-import javax.persistence.*;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:00\r
- */\r
-@Entity\r
-public class BookSection extends PublicationBase implements NomenclaturalReference {\r
-       static Logger logger = Logger.getLogger(BookSection.class);\r
-\r
-       private Book inBook;\r
-\r
-       public Book getInBook(){\r
-               return inBook;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setInBook(Book newVal){\r
-               inBook = newVal;\r
-       }\r
-\r
-}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/PublicationBase.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/PublicationBase.java
deleted file mode 100644 (file)
index 43a984f..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.publication;\r
-\r
-\r
-import eu.etaxonomy.cdm.model.agent.Team;\r
-import eu.etaxonomy.cdm.model.common.NameAlias;\r
-import eu.etaxonomy.cdm.model.common.IdentifiableEntity;\r
-import org.apache.log4j.Logger;\r
-import java.util.*;\r
-import javax.persistence.*;\r
-\r
-/**\r
- * A year() method is required to get the year of publication out of the\r
- * datePublished field\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:11\r
- */\r
-@Entity\r
-public abstract class PublicationBase extends IdentifiableEntity {\r
-       static Logger logger = Logger.getLogger(PublicationBase.class);\r
-\r
-       private String datePublished;\r
-       private String doi;\r
-       private String pages;\r
-       private String placePublished;\r
-       private String publisher;\r
-       private String title;\r
-       private String url;\r
-       private ArrayList otherTitles;\r
-       private Team authorship;\r
-\r
-       public Team getAuthorship(){\r
-               return authorship;\r
-       }\r
-\r
-       public String getDatePublished(){\r
-               return datePublished;\r
-       }\r
-\r
-       public String getDoi(){\r
-               return doi;\r
-       }\r
-\r
-       public ArrayList getOtherTitles(){\r
-               return otherTitles;\r
-       }\r
-\r
-       public String getPages(){\r
-               return pages;\r
-       }\r
-\r
-       public String getPlacePublished(){\r
-               return placePublished;\r
-       }\r
-\r
-       public String getPublisher(){\r
-               return publisher;\r
-       }\r
-\r
-       public String getTitle(){\r
-               return title;\r
-       }\r
-\r
-       public String getUrl(){\r
-               return url;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param datePublished\r
-        */\r
-       @Transient\r
-       public int getYear(String datePublished){\r
-               return 0;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setAuthorship(Team newVal){\r
-               authorship = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setDatePublished(String newVal){\r
-               datePublished = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setDoi(String newVal){\r
-               doi = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setOtherTitles(ArrayList newVal){\r
-               otherTitles = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setPages(String newVal){\r
-               pages = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setPlacePublished(String newVal){\r
-               placePublished = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setPublisher(String newVal){\r
-               publisher = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setTitle(String newVal){\r
-               title = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setUrl(String newVal){\r
-               url = newVal;\r
-       }\r
-\r
-}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/Unpublished.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/Unpublished.java
deleted file mode 100644 (file)
index 254702f..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.publication;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:17\r
- */\r
-public class Unpublished extends PublicationBase {\r
-       static Logger logger = Logger.getLogger(Unpublished.class);\r
-\r
-}
\ No newline at end of file
similarity index 52%
rename from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/Article.java
rename to cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/Article.java
index 16df815cdd1c5bd5391459354e4d82ad42ed7f4a..b41550f18c6787fe1bde7dde7a94663e07eec02f 100644 (file)
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.publication;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-import java.util.*;\r
-import javax.persistence.*;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:35:59\r
- */\r
-@Entity\r
-public class Article extends PublicationBase implements NomenclaturalReference {\r
-       static Logger logger = Logger.getLogger(Article.class);\r
-\r
-       private String series;\r
-       private String volume;\r
-       private Journal inJournal;\r
-\r
-       public Journal getInJournal(){\r
-               return inJournal;\r
-       }\r
-\r
-       public String getSeries(){\r
-               return series;\r
-       }\r
-\r
-       public String getVolume(){\r
-               return volume;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setInJournal(Journal newVal){\r
-               inJournal = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setSeries(String newVal){\r
-               series = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setVolume(String newVal){\r
-               volume = newVal;\r
-       }\r
-\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.reference;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:35
+ */
+public class Article extends StrictReferenceBase implements INomenclaturalReference {
+       static Logger logger = Logger.getLogger(Article.class);
+
+       @Description("")
+       private String series;
+       @Description("")
+       private String volume;
+       @Description("")
+       private String pages;
+       private Journal inJournal;
+
+       public Journal getInJournal(){
+               return inJournal;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setInJournal(Journal newVal){
+               inJournal = newVal;
+       }
+
+       public String getSeries(){
+               return series;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setSeries(String newVal){
+               series = newVal;
+       }
+
+       public String getVolume(){
+               return volume;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setVolume(String newVal){
+               volume = newVal;
+       }
+
+       public String getPages(){
+               return pages;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setPages(String newVal){
+               pages = newVal;
+       }
+
+       /**
+        * returns a formatted string containing the entire reference citation including
+        * authors
+        */
+       @Transient
+       public String getCitation(){
+               return "";
+       }
+
+       /**
+        * returns a formatted string containing the reference citation excluding authors
+        * as used in a taxon name
+        */
+       @Transient
+       public String getNomenclaturalCitation(){
+               return "";
+       }
+
+       @Transient
+       public String getYear(){
+               return "";
+       }
+
 }
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/BibtexEntryType.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/BibtexEntryType.java
new file mode 100644 (file)
index 0000000..ba7c996
--- /dev/null
@@ -0,0 +1,154 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.reference;
+
+
+import etaxonomy.cdm.model.common.EnumeratedTermBase;
+import org.apache.log4j.Logger;
+
+/**
+ * Bibtex bibliography entries are split by types
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:36
+ */
+public class BibtexEntryType extends EnumeratedTermBase {
+       static Logger logger = Logger.getLogger(BibtexEntryType.class);
+
+       /**
+        * An article from a journal or magazine.
+        * Required fields: author, title, journal, year
+        * Optional fields: volume, number, pages, month, note
+        */
+       public static final BibtexEntryType ARTICLE(){
+               return null;
+       }
+
+       /**
+        * A book with an explicit publisher.
+        * Required fields: author/editor, title, publisher, year
+        * Optional fields: volume, series, address, edition, month, note
+        */
+       public static final BibtexEntryType BOOK(){
+               return null;
+       }
+
+       /**
+        * A work that is printed and bound, but without a named publisher or sponsoring
+        * institution.
+        * Required fields: title
+        * Optional fields: author, howpublished, address, month, year, note
+        */
+       public static final BibtexEntryType BOOKLET(){
+               return null;
+       }
+
+       /**
+        * A part of a book, which may be a chapter (or section or whatever) and/or a
+        * range of pages.
+        * Required fields: author/editor, title, chapter/pages, publisher, year
+        * Optional fields: volume, series, address, edition, month, note
+        */
+       public static final BibtexEntryType INBOOK(){
+               return null;
+       }
+
+       /**
+        * A part of a book having its own title.
+        * Required fields: author, title, booktitle, year
+        * Optional fields: editor, pages, organization, publisher, address, month, note
+        */
+       public static final BibtexEntryType INCOLLECTION(){
+               return null;
+       }
+
+       /**
+        * The proceedings of a conference.
+        * Required fields: title, year
+        * Optional fields: editor, publisher, organization, address, month, note
+        */
+       public static final BibtexEntryType PROCEEDINGS(){
+               return null;
+       }
+
+       /**
+        * An article in a conference proceedings.
+        * Required fields: author, title, booktitle, year
+        * Optional fields: editor, pages, organization, publisher, address, month, note
+        */
+       public static final BibtexEntryType INPROCEEDINGS(){
+               return null;
+       }
+
+       /**
+        * The same as inproceedings.
+        * Required fields: author, title, booktitle, year
+        * Optional fields: editor, pages, organization, publisher, address, month, note
+        */
+       public static final BibtexEntryType CONFERENCE(){
+               return null;
+       }
+
+       /**
+        * Technical documentation.
+        * Required fields: title
+        * Optional fields: author, organization, address, edition, month, year, note
+        */
+       public static final BibtexEntryType MANUAL(){
+               return null;
+       }
+
+       /**
+        * A Master's thesis.
+        * Required fields: author, title, school, year
+        * Optional fields: address, month, note
+        */
+       public static final BibtexEntryType MASTERTHESIS(){
+               return null;
+       }
+
+       /**
+        * A Ph.D. thesis.
+        * Required fields: author, title, school, year
+        * Optional fields: address, month, note
+        */
+       public static final BibtexEntryType PHDTHESIS(){
+               return null;
+       }
+
+       /**
+        * A report published by a school or other institution, usually numbered within a
+        * series.
+        * Required fields: author, title, institution, year
+        * Optional fields: type, number, address, month, note
+        */
+       public static final BibtexEntryType TECHREPORT(){
+               return null;
+       }
+
+       /**
+        * A document having an author and title, but not formally published.
+        * Required fields: author, title, note
+        * Optional fields: month, year
+        */
+       public static final BibtexEntryType UNPUBLISHED(){
+               return null;
+       }
+
+       /**
+        * For use when nothing else fits.
+        * Required fields: none
+        * Optional fields: author, title, howpublished, month, year, note
+        */
+       public static final BibtexEntryType MISC(){
+               return null;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/BibtexReference.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/BibtexReference.java
new file mode 100644 (file)
index 0000000..75dd398
--- /dev/null
@@ -0,0 +1,453 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.reference;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:36
+ */
+public class BibtexReference extends ReferenceBase implements INomenclaturalReference {
+       static Logger logger = Logger.getLogger(BibtexReference.class);
+
+       //The name(s) of the author(s) (in the case of more than one author, separated by and)
+       @Description("The name(s) of the author(s) (in the case of more than one author, separated by and)")
+       private String author;
+       //The journal or magazine the work was published in
+
+       @Description("The journal or magazine the work was published in 
+       ")
+       private String journal;
+       //The title of the book, if only part of it is being cited
+       @Description("The title of the book, if only part of it is being cited")
+       private String booktitle;
+       //The chapter number
+       @Description("The chapter number")
+       private String chapter;
+       //The title of the work
+
+       @Description("The title of the work 
+       ")
+       private String title;
+       //The series of books the book was published in (e.g. "The Hardy Boys")
+
+       @Description("The series of books the book was published in (e.g. "The Hardy Boys") 
+       ")
+       private String series;
+       //The edition of a book, long form (such as "first" or "second")
+       @Description("The edition of a book, long form (such as "first" or "second")")
+       private String edition;
+       //The volume of a journal or multi-volume book
+
+       @Description("The volume of a journal or multi-volume book 
+       ")
+       private String volume;
+       //The "number" of a journal, magazine, or tech-report, if applicable. (Most publications have a "volume", but no "number"
+       //field.)
+       //
+
+       @Description("The "number" of a journal, magazine, or tech-report, if applicable. (Most publications have a "volume", but no "number" field.) 
+       
+       ")
+       private String number;
+       //Page numbers, separated either by commas or double-hyphens
+
+       @Description("Page numbers, separated either by commas or double-hyphens 
+       ")
+       private String pages;
+       //An annotation for annotated bibliography styles (not typical)
+       @Description("An annotation for annotated bibliography styles (not typical)")
+       private String annote;
+       //The name(s) of the editor(s)
+
+       @Description("The name(s) of the editor(s) 
+       ")
+       private String editor;
+       //The institution that was involved in the publishing, but not necessarily the publisher
+
+       @Description("The institution that was involved in the publishing, but not necessarily the publisher 
+       ")
+       private String institution;
+       //The school where the thesis was written 
+       @Description("The school where the thesis was written ")
+       private String school;
+       //The conference sponsor
+
+       @Description("The conference sponsor 
+       ")
+       private String organization;
+       //The publisher's name
+       //
+
+       @Description("The publisher's name 
+       
+       ")
+       private String publisher;
+       //Publisher's address (usually just the city, but can be the full address for lesser-known publishers)
+       @Description("Publisher's address (usually just the city, but can be the full address for lesser-known publishers)")
+       private String address;
+       //How it was published, if the publishing method is nonstandard
+
+       @Description("How it was published, if the publishing method is nonstandard 
+       ")
+       private String howpublished;
+       //The type of tech-report, for example, "Research Note"
+       //
+
+       @Description("The type of tech-report, for example, "Research Note" 
+       
+       ")
+       private String type;
+       //The month of publication (or, if unpublished, the month of creation)
+       //
+
+       @Description("The month of publication (or, if unpublished, the month of creation) 
+       
+       ")
+       private String month;
+       //The year of publication (or, if unpublished, the year of creation)
+
+       @Description("The year of publication (or, if unpublished, the year of creation) 
+       ")
+       private String year;
+       //A specification of an electronic publication, often a preprint or a technical report
+
+       @Description("A specification of an electronic publication, often a preprint or a technical report 
+       ")
+       private String eprint;
+       //Miscellaneous extra information
+       //
+
+       @Description("Miscellaneous extra information 
+       
+       ")
+       private String note;
+       private BibtexReference crossref;
+
+       public BibtexReference getCrossref(){
+               return crossref;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setCrossref(BibtexReference newVal){
+               crossref = newVal;
+       }
+
+       public String getAuthor(){
+               return author;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setAuthor(String newVal){
+               author = newVal;
+       }
+
+       public String getJournal(){
+               return journal;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setJournal(String newVal){
+               journal = newVal;
+       }
+
+       public String getBooktitle(){
+               return booktitle;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setBooktitle(String newVal){
+               booktitle = newVal;
+       }
+
+       public String getChapter(){
+               return chapter;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setChapter(String newVal){
+               chapter = newVal;
+       }
+
+       public String getTitle(){
+               return title;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setTitle(String newVal){
+               title = newVal;
+       }
+
+       public String getSeries(){
+               return series;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setSeries(String newVal){
+               series = newVal;
+       }
+
+       public String getEdition(){
+               return edition;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setEdition(String newVal){
+               edition = newVal;
+       }
+
+       public String getVolume(){
+               return volume;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setVolume(String newVal){
+               volume = newVal;
+       }
+
+       public String getNumber(){
+               return number;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setNumber(String newVal){
+               number = newVal;
+       }
+
+       public String getPages(){
+               return pages;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setPages(String newVal){
+               pages = newVal;
+       }
+
+       public String getAnnote(){
+               return annote;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setAnnote(String newVal){
+               annote = newVal;
+       }
+
+       public String getEditor(){
+               return editor;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setEditor(String newVal){
+               editor = newVal;
+       }
+
+       public String getInstitution(){
+               return institution;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setInstitution(String newVal){
+               institution = newVal;
+       }
+
+       public String getSchool(){
+               return school;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setSchool(String newVal){
+               school = newVal;
+       }
+
+       public String getOrganization(){
+               return organization;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setOrganization(String newVal){
+               organization = newVal;
+       }
+
+       public String getPublisher(){
+               return publisher;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setPublisher(String newVal){
+               publisher = newVal;
+       }
+
+       public String getAddress(){
+               return address;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setAddress(String newVal){
+               address = newVal;
+       }
+
+       public String getHowpublished(){
+               return howpublished;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setHowpublished(String newVal){
+               howpublished = newVal;
+       }
+
+       public String getType(){
+               return type;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setType(String newVal){
+               type = newVal;
+       }
+
+       public String getMonth(){
+               return month;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setMonth(String newVal){
+               month = newVal;
+       }
+
+       public String getYear(){
+               return year;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setYear(String newVal){
+               year = newVal;
+       }
+
+       public String getEprint(){
+               return eprint;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setEprint(String newVal){
+               eprint = newVal;
+       }
+
+       public String getNote(){
+               return note;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setNote(String newVal){
+               note = newVal;
+       }
+
+       /**
+        * returns a formatted string containing the entire reference citation including
+        * authors
+        */
+       @Transient
+       public String getCitation(){
+               return "";
+       }
+
+       /**
+        * returns a formatted string containing the reference citation excluding authors
+        * as used in a taxon name
+        */
+       @Transient
+       public String getNomenclaturalCitation(){
+               return "";
+       }
+
+       @Transient
+       public int getYear(){
+               return 0;
+       }
+
+       @Transient
+       public String getYear(){
+               return "";
+       }
+
+}
\ No newline at end of file
similarity index 53%
rename from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/Book.java
rename to cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/Book.java
index 52d31eb4f5f5893430708445ca44e60ed888497d..b2d30ac95f90bd6905357ab932e9562191b20f52 100644 (file)
@@ -1,79 +1,75 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.publication;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-import java.util.*;\r
-import javax.persistence.*;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:00\r
- */\r
-@Entity\r
-public class Book extends PublicationBase implements NomenclaturalReference {\r
-       static Logger logger = Logger.getLogger(Book.class);\r
-\r
-       private String edition;\r
-       private String editor;\r
-       private String isbn;\r
-       private BookSeries inSeries;\r
-\r
-       public String getEdition(){\r
-               return edition;\r
-       }\r
-\r
-       public String getEditor(){\r
-               return editor;\r
-       }\r
-\r
-       public BookSeries getInSeries(){\r
-               return inSeries;\r
-       }\r
-\r
-       public String getIsbn(){\r
-               return isbn;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setEdition(String newVal){\r
-               edition = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setEditor(String newVal){\r
-               editor = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setInSeries(BookSeries newVal){\r
-               inSeries = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setIsbn(String newVal){\r
-               isbn = newVal;\r
-       }\r
-\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.reference;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:37
+ */
+public class Book extends PrintedUnitBase implements INomenclaturalReference {
+       static Logger logger = Logger.getLogger(Book.class);
+
+       @Description("")
+       private String edition;
+       @Description("")
+       private String isbn;
+
+       public String getEdition(){
+               return edition;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setEdition(String newVal){
+               edition = newVal;
+       }
+
+       public String getIsbn(){
+               return isbn;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setIsbn(String newVal){
+               isbn = newVal;
+       }
+
+       /**
+        * returns a formatted string containing the entire reference citation including
+        * authors
+        */
+       @Transient
+       public String getCitation(){
+               return "";
+       }
+
+       /**
+        * returns a formatted string containing the reference citation excluding authors
+        * as used in a taxon name
+        */
+       @Transient
+       public String getNomenclaturalCitation(){
+               return "";
+       }
+
+       @Transient
+       public String getYear(){
+               return "";
+       }
+
 }
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/BookSection.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/BookSection.java
new file mode 100644 (file)
index 0000000..8946a22
--- /dev/null
@@ -0,0 +1,60 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.reference;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:38
+ */
+public class BookSection extends SectionBase implements INomenclaturalReference {
+       static Logger logger = Logger.getLogger(BookSection.class);
+
+       private Book inBook;
+
+       public Book getInBook(){
+               return inBook;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setInBook(Book newVal){
+               inBook = newVal;
+       }
+
+       /**
+        * returns a formatted string containing the entire reference citation including
+        * authors
+        */
+       @Transient
+       public String getCitation(){
+               return "";
+       }
+
+       /**
+        * returns a formatted string containing the reference citation excluding authors
+        * as used in a taxon name
+        */
+       @Transient
+       public String getNomenclaturalCitation(){
+               return "";
+       }
+
+       @Transient
+       public String getYear(){
+               return "";
+       }
+
+}
\ No newline at end of file
similarity index 76%
rename from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/CdDvd.java
rename to cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/CdDvd.java
index 004ddda97804d9216d0ccd43c81a6cad0ff832ce..1f749573d2293d08c7367f913df3e008bec7dcb3 100644 (file)
@@ -1,23 +1,23 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.publication;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:01\r
- */\r
-public class CdDvd extends PublicationBase {\r
-       static Logger logger = Logger.getLogger(CdDvd.class);\r
-\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.reference;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:39
+ */
+public class CdDvd extends PublicationBase {
+       static Logger logger = Logger.getLogger(CdDvd.class);
+
 }
\ No newline at end of file
similarity index 67%
rename from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/ConferenceProceedings.java
rename to cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/ConferenceProceedings.java
index 924cf069580ee5ed0a2a026b028f3f7465c6a3d0..a13a63ada579170ed07169e9a72fd14138596ac2 100644 (file)
@@ -1,23 +1,23 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.publication;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:02\r
- */\r
-public class ConferenceProceedings extends PublicationBase {\r
-       static Logger logger = Logger.getLogger(ConferenceProceedings.class);\r
-\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.reference;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:41
+ */
+public class ConferenceProceedings extends StrictReferenceBase {
+       static Logger logger = Logger.getLogger(ConferenceProceedings.class);
+
 }
\ No newline at end of file
similarity index 77%
rename from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/Database.java
rename to cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/Database.java
index 9e832ae3767f3638d98fd1770f09055ab4fe8d95..f2a5ba175a4cc64f36dd9896cec03ad8b5acfad9 100644 (file)
@@ -1,23 +1,23 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.publication;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:03\r
- */\r
-public class Database extends PublicationBase {\r
-       static Logger logger = Logger.getLogger(Database.class);\r
-\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.reference;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:43
+ */
+public class Database extends PublicationBase {
+       static Logger logger = Logger.getLogger(Database.class);
+
 }
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/Generic.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/Generic.java
new file mode 100644 (file)
index 0000000..24e824e
--- /dev/null
@@ -0,0 +1,134 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.reference;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * This class is to represent all references which cannot be clearly assigned to a
+ * specific reference type. Therefore attributes which are only used by a unique
+ * reference type are not necessary here.
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:50
+ */
+public class Generic extends StrictReferenceBase implements INomenclaturalReference {
+       static Logger logger = Logger.getLogger(Generic.class);
+
+       @Description("")
+       private String publisher;
+       @Description("")
+       private String placePublished;
+       @Description("")
+       private String editor;
+       @Description("")
+       private String series;
+       @Description("")
+       private String volume;
+       @Description("")
+       private String pages;
+
+       public String getPublisher(){
+               return publisher;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setPublisher(String newVal){
+               publisher = newVal;
+       }
+
+       public String getPlacePublished(){
+               return placePublished;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setPlacePublished(String newVal){
+               placePublished = newVal;
+       }
+
+       public String getEditor(){
+               return editor;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setEditor(String newVal){
+               editor = newVal;
+       }
+
+       public String getSeries(){
+               return series;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setSeries(String newVal){
+               series = newVal;
+       }
+
+       public String getVolume(){
+               return volume;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setVolume(String newVal){
+               volume = newVal;
+       }
+
+       public String getPages(){
+               return pages;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setPages(String newVal){
+               pages = newVal;
+       }
+
+       /**
+        * returns a formatted string containing the entire reference citation including
+        * authors
+        */
+       @Transient
+       public String getCitation(){
+               return "";
+       }
+
+       /**
+        * returns a formatted string containing the reference citation excluding authors
+        * as used in a taxon name
+        */
+       @Transient
+       public String getNomenclaturalCitation(){
+               return "";
+       }
+
+       @Transient
+       public String getYear(){
+               return "";
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/INomenclaturalReference.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/INomenclaturalReference.java
new file mode 100644 (file)
index 0000000..57f6c82
--- /dev/null
@@ -0,0 +1,32 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.reference;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:54
+ */
+public interface INomenclaturalReference {
+
+       /**
+        * returns a formatted string containing the reference citation excluding authors
+        * as used in a taxon name
+        */
+       @Transient
+       public String getNomenclaturalCitation();
+
+       @Transient
+       public String getYear();
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/InProceedings.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/InProceedings.java
new file mode 100644 (file)
index 0000000..2ce994f
--- /dev/null
@@ -0,0 +1,37 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.reference;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:54
+ */
+public class InProceedings extends SectionBase {
+       static Logger logger = Logger.getLogger(InProceedings.class);
+
+       private Proceedings inProceedings;
+
+       public Proceedings getInProceedings(){
+               return inProceedings;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setInProceedings(Proceedings newVal){
+               inProceedings = newVal;
+       }
+
+}
\ No newline at end of file
similarity index 80%
rename from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/Journal.java
rename to cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/Journal.java
index 17579143f25a2384ec2f479e77395953e0e01044..e167de3c5c00adf2a27e02636b0d3b59d7ed62d7 100644 (file)
@@ -1,37 +1,38 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.publication;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:05\r
- */\r
-public class Journal extends PublicationBase {\r
-       static Logger logger = Logger.getLogger(Journal.class);\r
-\r
-       private String issn;\r
-\r
-       public String getIssn(){\r
-               return issn;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setIssn(String newVal){\r
-               issn = newVal;\r
-       }\r
-\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.reference;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:56
+ */
+public class Journal extends PublicationBase {
+       static Logger logger = Logger.getLogger(Journal.class);
+
+       @Description("")
+       private String issn;
+
+       public String getIssn(){
+               return issn;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setIssn(String newVal){
+               issn = newVal;
+       }
+
 }
\ No newline at end of file
similarity index 76%
rename from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/Map.java
rename to cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/Map.java
index 770aa261ebce44c065a4ae5c74626b90141277f4..8057dd9d466d8e000e5dbff7dfc551ed7b3c3902 100644 (file)
@@ -1,23 +1,23 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.publication;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:06\r
- */\r
-public class Map extends PublicationBase {\r
-       static Logger logger = Logger.getLogger(Map.class);\r
-\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.reference;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:58
+ */
+public class Map extends PublicationBase {
+       static Logger logger = Logger.getLogger(Map.class);
+
 }
\ No newline at end of file
similarity index 68%
rename from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/Patent.java
rename to cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/Patent.java
index c1b493b6a938b12684e9d7bec907897584bc9908..0d10eed7266fc144b197e4f482f6c2e03050a372 100644 (file)
@@ -1,23 +1,23 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.publication;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:10\r
- */\r
-public class Patent extends PublicationBase {\r
-       static Logger logger = Logger.getLogger(Patent.class);\r
-\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.reference;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:07
+ */
+public class Patent extends StrictReferenceBase {
+       static Logger logger = Logger.getLogger(Patent.class);
+
 }
\ No newline at end of file
similarity index 67%
rename from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/PersonalCommunication.java
rename to cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/PersonalCommunication.java
index db1ddc5414204fdcee4ce17aa0ab6be9bc731d8d..e36ae5292446b72dfd111ca8e1a70474455f3001 100644 (file)
@@ -1,23 +1,23 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.publication;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:10\r
- */\r
-public class PersonalCommunication extends PublicationBase {\r
-       static Logger logger = Logger.getLogger(PersonalCommunication.class);\r
-\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.reference;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:07
+ */
+public class PersonalCommunication extends StrictReferenceBase {
+       static Logger logger = Logger.getLogger(PersonalCommunication.class);
+
 }
\ No newline at end of file
similarity index 61%
rename from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/BookSeries.java
rename to cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/PrintSeries.java
index 149543c14f97ecbe11b80673dd22a351a5cf6414..7c45c5d351293077cc973b7d7e3d8c0f3bf72191 100644 (file)
@@ -1,40 +1,38 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.publication;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-import java.util.*;\r
-import javax.persistence.*;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:01\r
- */\r
-@Entity\r
-public class BookSeries extends PublicationBase {\r
-       static Logger logger = Logger.getLogger(BookSeries.class);\r
-\r
-       private String series;\r
-\r
-       public String getSeries(){\r
-               return series;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setSeries(String newVal){\r
-               series = newVal;\r
-       }\r
-\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.reference;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:10
+ */
+public class PrintSeries extends PublicationBase {
+       static Logger logger = Logger.getLogger(PrintSeries.class);
+
+       @Description("")
+       private String series;
+
+       public String getSeries(){
+               return series;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setSeries(String newVal){
+               series = newVal;
+       }
+
 }
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/PrintedUnitBase.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/PrintedUnitBase.java
new file mode 100644 (file)
index 0000000..a4a6976
--- /dev/null
@@ -0,0 +1,79 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.reference;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:10
+ */
+public abstract class PrintedUnitBase extends PublicationBase {
+       static Logger logger = Logger.getLogger(PrintedUnitBase.class);
+
+       @Description("")
+       private String editor;
+       @Description("")
+       private String volume;
+       @Description("")
+       private String pages;
+       private PrintSeries inSeries;
+
+       public PrintSeries getInSeries(){
+               return inSeries;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setInSeries(PrintSeries newVal){
+               inSeries = newVal;
+       }
+
+       public String getEditor(){
+               return editor;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setEditor(String newVal){
+               editor = newVal;
+       }
+
+       public String getVolume(){
+               return volume;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setVolume(String newVal){
+               volume = newVal;
+       }
+
+       public String getPages(){
+               return pages;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setPages(String newVal){
+               pages = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/Proceedings.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/Proceedings.java
new file mode 100644 (file)
index 0000000..ebd2ab7
--- /dev/null
@@ -0,0 +1,39 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.reference;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:10
+ */
+public class Proceedings extends PrintedUnitBase {
+       static Logger logger = Logger.getLogger(Proceedings.class);
+
+       //The conference sponsor
+       @Description("The conference sponsor")
+       private String organization;
+
+       public String getOrganization(){
+               return organization;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setOrganization(String newVal){
+               organization = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/PublicationBase.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/PublicationBase.java
new file mode 100644 (file)
index 0000000..f16f740
--- /dev/null
@@ -0,0 +1,52 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.reference;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:11
+ */
+public abstract class PublicationBase extends StrictReferenceBase {
+       static Logger logger = Logger.getLogger(PublicationBase.class);
+
+       @Description("")
+       private String publisher;
+       @Description("")
+       private String placePublished;
+
+       public String getPublisher(){
+               return publisher;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setPublisher(String newVal){
+               publisher = newVal;
+       }
+
+       public String getPlacePublished(){
+               return placePublished;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setPlacePublished(String newVal){
+               placePublished = newVal;
+       }
+
+}
\ No newline at end of file
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
new file mode 100644 (file)
index 0000000..2524231
--- /dev/null
@@ -0,0 +1,94 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.reference;
+
+
+import etaxonomy.cdm.model.agent.Team;
+import etaxonomy.cdm.model.common.IdentifiableEntity;
+import org.apache.log4j.Logger;
+
+/**
+ * A year() method is required to get the year of publication out of the
+ * datePublished field
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:12
+ */
+public abstract class ReferenceBase extends IdentifiableEntity {
+       static Logger logger = Logger.getLogger(ReferenceBase.class);
+
+       //URIs like DOIs, LSIDs or Handles for this reference 
+       @Description("URIs like DOIs, LSIDs or Handles for this reference ")
+       private String uri;
+       //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
+       @Description("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 ArrayList referenceInSource;
+       private Team authorTeam;
+
+       public ArrayList getReferenceInSource(){
+               return referenceInSource;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setReferenceInSource(ArrayList newVal){
+               referenceInSource = newVal;
+       }
+
+       public Team getAuthorTeam(){
+               return authorTeam;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setAuthorTeam(Team newVal){
+               authorTeam = newVal;
+       }
+
+       public String getUri(){
+               return uri;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setUri(String newVal){
+               uri = newVal;
+       }
+
+       public boolean isNomenclaturallyRelevant(){
+               return isNomenclaturallyRelevant;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setNomenclaturallyRelevant(boolean newVal){
+               isNomenclaturallyRelevant = newVal;
+       }
+
+       /**
+        * returns a formatted string containing the entire reference citation including
+        * authors
+        */
+       @Transient
+       public String getCitation(){
+               return "";
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/ReferenceInSource.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/ReferenceInSource.java
new file mode 100644 (file)
index 0000000..2ef5126
--- /dev/null
@@ -0,0 +1,24 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.reference;
+
+
+import etaxonomy.cdm.model.common.EntityInSourceBase;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:13
+ */
+public class ReferenceInSource extends EntityInSourceBase {
+       static Logger logger = Logger.getLogger(ReferenceInSource.class);
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/Report.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/Report.java
new file mode 100644 (file)
index 0000000..caad63b
--- /dev/null
@@ -0,0 +1,39 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.reference;
+
+
+import etaxonomy.cdm.model.agent.Institution;
+import org.apache.log4j.Logger;
+
+/**
+ * publisher is "institution" in BibTex ???
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:14
+ */
+public class Report extends PublicationBase {
+       static Logger logger = Logger.getLogger(Report.class);
+
+       private Institution institution;
+
+       public Institution getInstitution(){
+               return institution;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setInstitution(Institution newVal){
+               institution = newVal;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/SectionBase.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/SectionBase.java
new file mode 100644 (file)
index 0000000..d13ac35
--- /dev/null
@@ -0,0 +1,43 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.reference;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:16
+ */
+public abstract class SectionBase extends StrictReferenceBase {
+       static Logger logger = Logger.getLogger(SectionBase.class);
+
+       @Description("")
+       private String pages;
+
+       public String getPages(){
+               return pages;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setPages(String newVal){
+               pages = newVal;
+       }
+
+       @Transient
+       public PrintedUnitBase getPrintedUnit(){
+               return null;
+       }
+
+}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/StrictReferenceBase.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/StrictReferenceBase.java
new file mode 100644 (file)
index 0000000..a576cf4
--- /dev/null
@@ -0,0 +1,72 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.reference;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * A year() method is required to get the year of publication out of the
+ * datePublished field
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:19
+ */
+public abstract class StrictReferenceBase extends ReferenceBase {
+       static Logger logger = Logger.getLogger(StrictReferenceBase.class);
+
+       //Title of the reference
+       @Description("Title of the reference")
+       private String title;
+       //The date range assigned to the reference.
+       //ISO Date range like. Flexible, year can be left out, etc
+       @Description("The date range assigned to the reference.
+       ISO Date range like. Flexible, year can be left out, etc")
+       private DateRange datePublished;
+
+       public String getTitle(){
+               return title;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setTitle(String newVal){
+               title = newVal;
+       }
+
+       public DateRange getDatePublished(){
+               return datePublished;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setDatePublished(DateRange newVal){
+               datePublished = newVal;
+       }
+
+       /**
+        * returns a formatted string containing the entire reference citation including
+        * authors
+        */
+       @Transient
+       public String getCitation(){
+               return "";
+       }
+
+       @Transient
+       public int getYear(){
+               return 0;
+       }
+
+}
\ No newline at end of file
similarity index 56%
rename from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/Thesis.java
rename to cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/Thesis.java
index 6a81eed8abdec151edd6ca5728384409562f506c..76d694069e9f33ca5d84cdde09e58b36bd979b52 100644 (file)
@@ -1,23 +1,38 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.publication;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:16\r
- */\r
-public class Thesis extends PublicationBase {\r
-       static Logger logger = Logger.getLogger(Thesis.class);\r
-\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.reference;
+
+
+import etaxonomy.cdm.model.agent.Institution;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:24
+ */
+public class Thesis extends PublicationBase {
+       static Logger logger = Logger.getLogger(Thesis.class);
+
+       private Institution school;
+
+       public Institution getSchool(){
+               return school;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setSchool(Institution newVal){
+               school = newVal;
+       }
+
 }
\ No newline at end of file
similarity index 77%
rename from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/publication/WebPage.java
rename to cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/reference/WebPage.java
index cfcc5257e3046433e7f30ae7f3b9b0417f07bbc4..c6b15d87c689b34c18d72a65385a517a970cf6f4 100644 (file)
@@ -1,23 +1,23 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.publication;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:19\r
- */\r
-public class WebPage extends PublicationBase {\r
-       static Logger logger = Logger.getLogger(WebPage.class);\r
-\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.reference;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:27
+ */
+public class WebPage extends PublicationBase {
+       static Logger logger = Logger.getLogger(WebPage.class);
+
 }
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/specimen/Country.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/specimen/Country.java
deleted file mode 100644 (file)
index 391a125..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.specimen;\r
-\r
-\r
-import eu.etaxonomy.cdm.model.common.VersionableEntity;\r
-import org.apache.log4j.Logger;\r
-import java.util.*;\r
-import javax.persistence.*;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:03\r
- */\r
-@Entity\r
-public class Country extends VersionableEntity {\r
-       static Logger logger = Logger.getLogger(Country.class);\r
-\r
-       private String name;\r
-\r
-       public String getName(){\r
-               return name;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setName(String newVal){\r
-               name = newVal;\r
-       }\r
-\r
-}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/specimen/Institution.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/specimen/Institution.java
deleted file mode 100644 (file)
index ba1e452..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.specimen;\r
-\r
-\r
-import eu.etaxonomy.cdm.model.common.VersionableEntity;\r
-import org.apache.log4j.Logger;\r
-import java.util.*;\r
-import javax.persistence.*;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:05\r
- */\r
-@Entity\r
-public class Institution extends VersionableEntity {\r
-       static Logger logger = Logger.getLogger(Institution.class);\r
-\r
-       private String code;\r
-       private String name;\r
-       private String townOrLocation;\r
-\r
-       public String getCode(){\r
-               return code;\r
-       }\r
-\r
-       public String getName(){\r
-               return name;\r
-       }\r
-\r
-       public String getTownOrLocation(){\r
-               return townOrLocation;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setCode(String newVal){\r
-               code = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setName(String newVal){\r
-               name = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setTownOrLocation(String newVal){\r
-               townOrLocation = newVal;\r
-       }\r
-\r
-}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/specimen/Locality.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/specimen/Locality.java
deleted file mode 100644 (file)
index 501f410..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.specimen;\r
-\r
-\r
-import eu.etaxonomy.cdm.model.common.VersionableEntity;\r
-import org.apache.log4j.Logger;\r
-import java.util.*;\r
-import javax.persistence.*;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:06\r
- */\r
-@Entity\r
-public class Locality extends VersionableEntity {\r
-       static Logger logger = Logger.getLogger(Locality.class);\r
-\r
-       private String name;\r
-       private Region region;\r
-\r
-       public String getName(){\r
-               return name;\r
-       }\r
-\r
-       public Region getRegion(){\r
-               return region;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setName(String newVal){\r
-               name = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setRegion(Region newVal){\r
-               region = newVal;\r
-       }\r
-\r
-}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/specimen/MaterialCategory.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/specimen/MaterialCategory.java
deleted file mode 100644 (file)
index 6d2dc3c..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.specimen;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-\r
-/**\r
- * The list should be extensible at runtime through configuration. This needs to\r
- * be investigated.\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:06\r
- */\r
-public enum MaterialCategory {\r
-       SPECIMEN,\r
-       CULTURE,\r
-       FOSSIL,\r
-       OBSERVATION\r
-}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/specimen/Region.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/specimen/Region.java
deleted file mode 100644 (file)
index aafffbb..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.specimen;\r
-\r
-\r
-import eu.etaxonomy.cdm.model.common.VersionableEntity;\r
-import org.apache.log4j.Logger;\r
-import java.util.*;\r
-import javax.persistence.*;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:12\r
- */\r
-@Entity\r
-public class Region extends VersionableEntity {\r
-       static Logger logger = Logger.getLogger(Region.class);\r
-\r
-       private String name;\r
-       private Country country;\r
-\r
-       public Country getCountry(){\r
-               return country;\r
-       }\r
-\r
-       public String getName(){\r
-               return name;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setCountry(Country newVal){\r
-               country = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setName(String newVal){\r
-               name = newVal;\r
-       }\r
-\r
-}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/specimen/Specimen.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/specimen/Specimen.java
deleted file mode 100644 (file)
index 0f36d96..0000000
+++ /dev/null
@@ -1,160 +0,0 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.specimen;\r
-\r
-\r
-import eu.etaxonomy.cdm.model.agent.Team;\r
-import eu.etaxonomy.cdm.model.common.IdentifiableEntity;\r
-import org.apache.log4j.Logger;\r
-import java.util.*;\r
-import javax.persistence.*;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:13\r
- */\r
-@Entity\r
-public class Specimen extends IdentifiableEntity {\r
-       static Logger logger = Logger.getLogger(Specimen.class);\r
-\r
-       private String citation;\r
-       private Calendar collectingDate;\r
-       private String coordinates;\r
-       //Elevation in meter above sea level\r
-       private int elevation;\r
-       private float latitude;\r
-       private float longitude;\r
-       private Locality locality;\r
-       private MaterialCategory material;\r
-       private Team collector;\r
-       private Collection collection;\r
-\r
-       public String getCitation(){\r
-               return citation;\r
-       }\r
-\r
-       public Calendar getCollectingDate(){\r
-               return collectingDate;\r
-       }\r
-\r
-       public Collection getCollection(){\r
-               return collection;\r
-       }\r
-\r
-       public Team getCollector(){\r
-               return collector;\r
-       }\r
-\r
-       public String getCoordinates(){\r
-               return coordinates;\r
-       }\r
-\r
-       public int getElevation(){\r
-               return elevation;\r
-       }\r
-\r
-       public float getLatitude(){\r
-               return latitude;\r
-       }\r
-\r
-       public Locality getLocality(){\r
-               return locality;\r
-       }\r
-\r
-       public float getLongitude(){\r
-               return longitude;\r
-       }\r
-\r
-       public MaterialCategory getMaterial(){\r
-               return material;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setCitation(String newVal){\r
-               citation = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setCollectingDate(Calendar newVal){\r
-               collectingDate = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setCollection(Collection newVal){\r
-               collection = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setCollector(Team newVal){\r
-               collector = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setCoordinates(String newVal){\r
-               coordinates = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setElevation(int newVal){\r
-               elevation = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setLatitude(float newVal){\r
-               latitude = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setLocality(Locality newVal){\r
-               locality = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setLongitude(float newVal){\r
-               longitude = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setMaterial(MaterialCategory newVal){\r
-               material = newVal;\r
-       }\r
-\r
-}
\ No newline at end of file
index 9c37fc596eb17a5fd4f0aa8804e9ddfdb4818e36..4be60d05c9d42927407b2ab391f8f46d20d4373c 100644 (file)
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.taxon;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:02\r
- */\r
-public enum ConceptRelationshipType {\r
-       TAXONOMICALLY_INCLUDED_IN,\r
-       MISAPPLIED_NAME_FOR,\r
-       INVALID_DESIGNATION_FOR,\r
-       CONTRADICTION,\r
-       CONGRUENT_TO,\r
-       INCLUDED_IN,\r
-       CONGRUENT_TO_OR_INCLUDED_IN,\r
-       INCLUDES,\r
-       CONGRUENT_TO_OR_INCLUDES,\r
-       INCLUDED_IN_OR_INCLUDES,\r
-       CONGRUENT_TO_OR_INCLUDED_IN_OR_INCLUDES,\r
-       OVERLAPS,\r
-       CONGRUENT_TO_OR_OVERLAPS,\r
-       INCLUDED_IN_OR_OVERLAPS,\r
-       CONGRUENT_TO_OR_INCLUDED_IN_OR_OVERLAPS,\r
-       INCLUDES_OR_OVERLAPS,\r
-       CONGRUENT_TO_OR_INCLUDES_OR_OVERLAPS,\r
-       INCLUDED_IN_OR_INCLUDES_OR_OVERLAPS,\r
-       DOES_NOT_EXCLUDE,\r
-       EXCLUDES,\r
-       CONGRUENT_TO_OR_EXCLUDES,\r
-       INCLUDED_IN_OR_EXCLUDES,\r
-       CONGRUENT_TO_OR_INCLUDED_IN_OR_EXCLUDES,\r
-       INCLUDES_OR_EXCLUDES,\r
-       CONGRUENT_TO_OR_INCLUDES_OR_EXCLUDES,\r
-       INCLUDED_IN_OR_INCLUDES_OR_EXCLUDES,\r
-       DOES_NOT_OVERLAP,\r
-       OVERLAPS_OR_EXCLUDES,\r
-       CONGRUENT_TO_OR_OVERLAPS_OR_EXCLUDES,\r
-       INCLUDED_IN_OR_OVERLAPS_OR_EXCLUDES,\r
-       DOES_NOT_INCLUDE,\r
-       INCLUDES_OR_OVERLAPS_OR_EXCLUDES,\r
-       NOT_INCLUDED_IN,\r
-       NOT_CONGRUENT_TO,\r
-       ALL_RELATIONSHIPS\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.taxon;
+
+
+import etaxonomy.cdm.model.common.EnumeratedTermBase;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:14:41
+ */
+public class ConceptRelationshipType extends EnumeratedTermBase {
+       static Logger logger = Logger.getLogger(ConceptRelationshipType.class);
+
+       @Description("")
+       private static final int initializationClassUri = http://rs.tdwg.org/ontology/voc/TaxonConcept#TaxonRelationshipTerm;
+
+       public getInitializationClassUri(){
+               return initializationClassUri;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setInitializationClassUri(newVal){
+               initializationClassUri = newVal;
+       }
+
+       public static final ConceptRelationshipType TAXONOMICALLY_INCLUDED_IN(){
+               return null;
+       }
+
+       public static final ConceptRelationshipType MISAPPLIED_NAME_FOR(){
+               return null;
+       }
+
+       public static final ConceptRelationshipType INVALID_DESIGNATION_FOR(){
+               return null;
+       }
+
+       public static final ConceptRelationshipType CONTRADICTION(){
+               return null;
+       }
+
+       public static final ConceptRelationshipType CONGRUENT_TO(){
+               return null;
+       }
+
+       public static final ConceptRelationshipType INCLUDED_IN(){
+               return null;
+       }
+
+       public static final ConceptRelationshipType CONGRUENT_TO_OR_INCLUDED_IN(){
+               return null;
+       }
+
+       public static final ConceptRelationshipType INCLUDES(){
+               return null;
+       }
+
+       public static final ConceptRelationshipType CONGRUENT_TO_OR_INCLUDES(){
+               return null;
+       }
+
+       public static final ConceptRelationshipType INCLUDED_IN_OR_INCLUDES(){
+               return null;
+       }
+
+       public static final ConceptRelationshipType CONGRUENT_TO_OR_INCLUDED_IN_OR_INCLUDES(){
+               return null;
+       }
+
+       public static final ConceptRelationshipType OVERLAPS(){
+               return null;
+       }
+
+       public static final ConceptRelationshipType CONGRUENT_TO_OR_OVERLAPS(){
+               return null;
+       }
+
+       public static final ConceptRelationshipType INCLUDED_IN_OR_OVERLAPS(){
+               return null;
+       }
+
+       public static final ConceptRelationshipType CONGRUENT_TO_OR_INCLUDED_IN_OR_OVERLAPS(){
+               return null;
+       }
+
+       public static final ConceptRelationshipType INCLUDES_OR_OVERLAPS(){
+               return null;
+       }
+
+       public static final ConceptRelationshipType CONGRUENT_TO_OR_INCLUDES_OR_OVERLAPS(){
+               return null;
+       }
+
+       public static final ConceptRelationshipType INCLUDED_IN_OR_INCLUDES_OR_OVERLAPS(){
+               return null;
+       }
+
+       public static final ConceptRelationshipType DOES_NOT_EXCLUDE(){
+               return null;
+       }
+
+       public static final ConceptRelationshipType EXCLUDES(){
+               return null;
+       }
+
+       public static final ConceptRelationshipType CONGRUENT_TO_OR_EXCLUDES(){
+               return null;
+       }
+
+       public static final ConceptRelationshipType INCLUDED_IN_OR_EXCLUDES(){
+               return null;
+       }
+
+       public static final ConceptRelationshipType CONGRUENT_TO_OR_INCLUDED_IN_OR_EXCLUDES(){
+               return null;
+       }
+
+       public static final ConceptRelationshipType INCLUDES_OR_EXCLUDES(){
+               return null;
+       }
+
+       public static final ConceptRelationshipType CONGRUENT_TO_OR_INCLUDES_OR_EXCLUDES(){
+               return null;
+       }
+
+       public static final ConceptRelationshipType INCLUDED_IN_OR_INCLUDES_OR_EXCLUDES(){
+               return null;
+       }
+
+       public static final ConceptRelationshipType DOES_NOT_OVERLAP(){
+               return null;
+       }
+
+       public static final ConceptRelationshipType OVERLAPS_OR_EXCLUDES(){
+               return null;
+       }
+
+       public static final ConceptRelationshipType CONGRUENT_TO_OR_OVERLAPS_OR_EXCLUDES(){
+               return null;
+       }
+
+       public static final ConceptRelationshipType INCLUDED_IN_OR_OVERLAPS_OR_EXCLUDES(){
+               return null;
+       }
+
+       public static final ConceptRelationshipType DOES_NOT_INCLUDE(){
+               return null;
+       }
+
+       public static final ConceptRelationshipType INCLUDES_OR_OVERLAPS_OR_EXCLUDES(){
+               return null;
+       }
+
+       public static final ConceptRelationshipType NOT_INCLUDED_IN(){
+               return null;
+       }
+
+       public static final ConceptRelationshipType NOT_CONGRUENT_TO(){
+               return null;
+       }
+
+       public static final ConceptRelationshipType ALL_RELATIONSHIPS(){
+               return null;
+       }
+
 }
\ No newline at end of file
similarity index 64%
rename from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/taxon/SynonymTaxon.java
rename to cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/taxon/Synonym.java
index aab9149fab1e7c1ea228ab7d571816386bb91c94..47f2857fea28e79f49826dab971b0dd3580cb765 100644 (file)
@@ -1,40 +1,37 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.taxon;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-import java.util.*;\r
-import javax.persistence.*;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:14\r
- */\r
-@Entity\r
-public class SynonymTaxon extends TaxonBase {\r
-       static Logger logger = Logger.getLogger(SynonymTaxon.class);\r
-\r
-       private ArrayList synoynmRelations;\r
-\r
-       public ArrayList getSynoynmRelations(){\r
-               return synoynmRelations;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setSynoynmRelations(ArrayList newVal){\r
-               synoynmRelations = newVal;\r
-       }\r
-\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.taxon;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:20
+ */
+public class Synonym extends TaxonBase {
+       static Logger logger = Logger.getLogger(Synonym.class);
+
+       private ArrayList synoynmRelations;
+
+       public ArrayList getSynoynmRelations(){
+               return synoynmRelations;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setSynoynmRelations(ArrayList newVal){
+               synoynmRelations = newVal;
+       }
+
 }
\ No newline at end of file
index bd124da04b238a279f0f3c5661e65833eeef494c..38f94beba6c78494c86e1915f6786c2081c3ef3c 100644 (file)
@@ -1,67 +1,64 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.taxon;\r
-\r
-\r
-import eu.etaxonomy.cdm.model.common.VersionableEntity;\r
-import org.apache.log4j.Logger;\r
-import java.util.*;\r
-import javax.persistence.*;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:13\r
- */\r
-@Entity\r
-public class SynonymRelationship extends VersionableEntity {\r
-       static Logger logger = Logger.getLogger(SynonymRelationship.class);\r
-\r
-       private AcceptedTaxon acceptedTaxon;\r
-       private SynonymRelationshipType type;\r
-       private SynonymTaxon synoynm;\r
-\r
-       public AcceptedTaxon getAcceptedTaxon(){\r
-               return acceptedTaxon;\r
-       }\r
-\r
-       public SynonymTaxon getSynoynm(){\r
-               return synoynm;\r
-       }\r
-\r
-       public SynonymRelationshipType getType(){\r
-               return type;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setAcceptedTaxon(AcceptedTaxon newVal){\r
-               acceptedTaxon = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setSynoynm(SynonymTaxon newVal){\r
-               synoynm = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setType(SynonymRelationshipType newVal){\r
-               type = newVal;\r
-       }\r
-\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.taxon;
+
+
+import etaxonomy.cdm.model.common.ReferencedEntityBase;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:20
+ */
+public class SynonymRelationship extends ReferencedEntityBase {
+       static Logger logger = Logger.getLogger(SynonymRelationship.class);
+
+       private Synonym synoynm;
+       private Taxon acceptedTaxon;
+       private SynonymRelationshipType type;
+
+       public Taxon getAcceptedTaxon(){
+               return acceptedTaxon;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setAcceptedTaxon(Taxon newVal){
+               acceptedTaxon = newVal;
+       }
+
+       public SynonymRelationshipType getType(){
+               return type;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setType(SynonymRelationshipType newVal){
+               type = newVal;
+       }
+
+       public Synonym getSynoynm(){
+               return synoynm;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setSynoynm(Synonym newVal){
+               synoynm = newVal;
+       }
+
 }
\ No newline at end of file
index 8ac2a00512c5a33811f85c2360af77958539c319..e497ca2118a2485ab885f9d3eef162e93c2a366f 100644 (file)
@@ -1,30 +1,59 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.taxon;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:13\r
- */\r
-public enum SynonymRelationshipType {\r
-       SYNONYM_OF,\r
-       PRO_PARTE_SYNONYM_OF,\r
-       PARTIAL_SYNONYM_OF,\r
-       HOMOTYPIC_SYNONYM_OF,\r
-       HETEROTYPIC_SYNONYM_OF,\r
-       PRO_PARTE_AND_HOMOTYPIC_SYNONYM_OF,\r
-       PRO_PARTE_AND_HETEROTYPIC_SYNONYM_OF,\r
-       PARTIAL_AND_HOMOTYPIC_SYNONYM_OF,\r
-       PARTIAL_AND_HETEROTYPIC_SYNONYM_OF\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.taxon;
+
+
+import etaxonomy.cdm.model.common.EnumeratedTermBase;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:20
+ */
+public class SynonymRelationshipType extends EnumeratedTermBase {
+       static Logger logger = Logger.getLogger(SynonymRelationshipType.class);
+
+       @Description("")
+       private static final int initializationClassUri = http://rs.tdwg.org/ontology/voc/TaxonConcept#TaxonRelationshipTerm;
+
+       public getInitializationClassUri(){
+               return initializationClassUri;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setInitializationClassUri(newVal){
+               initializationClassUri = newVal;
+       }
+
+       public static final SynonymRelationshipType SYNONYM_OF(){
+               return null;
+       }
+
+       public static final SynonymRelationshipType PRO_PARTE_SYNONYM_OF(){
+               return null;
+       }
+
+       public static final SynonymRelationshipType PARTIAL_SYNONYM_OF(){
+               return null;
+       }
+
+       public static final SynonymRelationshipType HOMOTYPIC_SYNONYM_OF(){
+               return null;
+       }
+
+       public static final SynonymRelationshipType HETEROTYPIC_SYNONYM_OF(){
+               return null;
+       }
+
 }
\ No newline at end of file
similarity index 63%
rename from cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/taxon/AcceptedTaxon.java
rename to cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/taxon/Taxon.java
index 29f74ec7f7ca81e2966fa90076e065fc26d619ce..4d75fffe300ded6aec4486c2914a5a5ec55a26b8 100644 (file)
@@ -1,93 +1,90 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.taxon;\r
-\r
-\r
-import eu.etaxonomy.cdm.model.common.Media;\r
-import org.apache.log4j.Logger;\r
-import java.util.*;\r
-import javax.persistence.*;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:35:59\r
- */\r
-@Entity\r
-public class AcceptedTaxon extends TaxonBase {\r
-       static Logger logger = Logger.getLogger(AcceptedTaxon.class);\r
-\r
-       private ArrayList facts;\r
-       private ArrayList inverseSynonymRelations;\r
-       private ArrayList medias;\r
-       private ArrayList taxonRelations;\r
-       private ArrayList inverseTaxonRelations;\r
-\r
-       public ArrayList getFacts(){\r
-               return facts;\r
-       }\r
-\r
-       public ArrayList getInverseSynonymRelations(){\r
-               return inverseSynonymRelations;\r
-       }\r
-\r
-       public ArrayList getInverseTaxonRelations(){\r
-               return inverseTaxonRelations;\r
-       }\r
-\r
-       public ArrayList getMedias(){\r
-               return medias;\r
-       }\r
-\r
-       public ArrayList getTaxonRelations(){\r
-               return taxonRelations;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setFacts(ArrayList newVal){\r
-               facts = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setInverseSynonymRelations(ArrayList newVal){\r
-               inverseSynonymRelations = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setInverseTaxonRelations(ArrayList newVal){\r
-               inverseTaxonRelations = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setMedias(ArrayList newVal){\r
-               medias = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setTaxonRelations(ArrayList newVal){\r
-               taxonRelations = newVal;\r
-       }\r
-\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.taxon;
+
+
+import etaxonomy.cdm.model.description.Description;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:20
+ */
+public class Taxon extends TaxonBase {
+       static Logger logger = Logger.getLogger(Taxon.class);
+
+       private ArrayList descriptions;
+       private ArrayList inverseSynonymRelations;
+       private ArrayList taxonInSource;
+       private ArrayList taxonRelations;
+       private ArrayList inverseTaxonRelations;
+
+       public ArrayList getTaxonInSource(){
+               return taxonInSource;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setTaxonInSource(ArrayList newVal){
+               taxonInSource = newVal;
+       }
+
+       public ArrayList getDescriptions(){
+               return descriptions;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setDescriptions(ArrayList newVal){
+               descriptions = newVal;
+       }
+
+       public ArrayList getInverseSynonymRelations(){
+               return inverseSynonymRelations;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setInverseSynonymRelations(ArrayList newVal){
+               inverseSynonymRelations = newVal;
+       }
+
+       public ArrayList getTaxonRelations(){
+               return taxonRelations;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setTaxonRelations(ArrayList newVal){
+               taxonRelations = newVal;
+       }
+
+       public ArrayList getInverseTaxonRelations(){
+               return inverseTaxonRelations;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setInverseTaxonRelations(ArrayList newVal){
+               inverseTaxonRelations = newVal;
+       }
+
 }
\ No newline at end of file
index 6f5833da79d9da985ad45e92a170dec24266de86..67e04e69e402d84e88c566f9d06c477778af4daf 100644 (file)
@@ -1,69 +1,55 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.taxon;\r
-\r
-\r
-import eu.etaxonomy.cdm.model.name.TaxonName;\r
-import eu.etaxonomy.cdm.model.publication.PublicationBase;\r
-import eu.etaxonomy.cdm.model.common.IdentifiableEntity;\r
-import org.apache.log4j.Logger;\r
-import java.util.*;\r
-import javax.persistence.*;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:14\r
- */\r
-@Entity\r
-public abstract class TaxonBase extends IdentifiableEntity {\r
-       static Logger logger = Logger.getLogger(TaxonBase.class);\r
-\r
-       private boolean isDoubtful;\r
-       private PublicationBase sec;\r
-       private TaxonName name;\r
-\r
-       public TaxonName getName(){\r
-               return name;\r
-       }\r
-\r
-       public PublicationBase getSec(){\r
-               return sec;\r
-       }\r
-\r
-       public boolean isDoubtful(){\r
-               return isDoubtful;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setDoubtful(boolean newVal){\r
-               isDoubtful = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setName(TaxonName newVal){\r
-               name = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setSec(PublicationBase newVal){\r
-               sec = newVal;\r
-       }\r
-\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.taxon;
+
+
+import etaxonomy.cdm.model.name.TaxonNameBase;
+import etaxonomy.cdm.model.common.IdentifiableEntity;
+import org.apache.log4j.Logger;
+
+/**
+ * {unique name within view/treatment}
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:21
+ */
+public abstract class TaxonBase extends IdentifiableEntity {
+       static Logger logger = Logger.getLogger(TaxonBase.class);
+
+       //The assignement to the Taxon or to the Synonym class is not definitive
+       @Description("The assignement to the Taxon or to the Synonym class is not definitive")
+       private boolean isDoubtful;
+       private TaxonNameBase name;
+
+       public TaxonNameBase getName(){
+               return name;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setName(TaxonNameBase newVal){
+               name = newVal;
+       }
+
+       public boolean isDoubtful(){
+               return isDoubtful;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setDoubtful(boolean newVal){
+               isDoubtful = newVal;
+       }
+
 }
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonFact.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonFact.java
deleted file mode 100644 (file)
index e5511a3..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.taxon;\r
-\r
-\r
-import eu.etaxonomy.cdm.model.publication.PublicationBase;\r
-import eu.etaxonomy.cdm.model.common.FactBase;\r
-import eu.etaxonomy.cdm.model.common.Media;\r
-import eu.etaxonomy.cdm.model.common.Fact;\r
-import org.apache.log4j.Logger;\r
-import java.util.*;\r
-import javax.persistence.*;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:14\r
- */\r
-@Entity\r
-public class TaxonFact extends FactBase implements Fact {\r
-       static Logger logger = Logger.getLogger(TaxonFact.class);\r
-\r
-       private TaxonFactType type;\r
-       private PublicationBase citation;\r
-       private ArrayList medias;\r
-\r
-       public PublicationBase getCitation(){\r
-               return citation;\r
-       }\r
-\r
-       public ArrayList getMedias(){\r
-               return medias;\r
-       }\r
-\r
-       public TaxonFactType getType(){\r
-               return type;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setCitation(PublicationBase newVal){\r
-               citation = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setMedias(ArrayList newVal){\r
-               medias = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setType(TaxonFactType newVal){\r
-               type = newVal;\r
-       }\r
-\r
-}
\ No newline at end of file
diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonInSource.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonInSource.java
new file mode 100644 (file)
index 0000000..544729d
--- /dev/null
@@ -0,0 +1,24 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.taxon;
+
+
+import etaxonomy.cdm.model.common.EntityInSourceBase;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:21
+ */
+public class TaxonInSource extends EntityInSourceBase {
+       static Logger logger = Logger.getLogger(TaxonInSource.class);
+
+}
\ No newline at end of file
index 3265778d2d8f2021ffcc23759940d0444257ba73..205f42010976913e1cdd9938afbb174f7666b990 100644 (file)
@@ -1,81 +1,64 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.taxon;\r
-\r
-\r
-import eu.etaxonomy.cdm.model.publication.PublicationBase;\r
-import eu.etaxonomy.cdm.model.common.VersionableEntity;\r
-import org.apache.log4j.Logger;\r
-import java.util.*;\r
-import javax.persistence.*;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:16\r
- */\r
-@Entity\r
-public class TaxonRelationship extends VersionableEntity {\r
-       static Logger logger = Logger.getLogger(TaxonRelationship.class);\r
-\r
-       private PublicationBase citation;\r
-       private AcceptedTaxon fromTaxon;\r
-       private AcceptedTaxon toTaxon;\r
-       private ConceptRelationshipType type;\r
-\r
-       public PublicationBase getCitation(){\r
-               return citation;\r
-       }\r
-\r
-       public AcceptedTaxon getFromTaxon(){\r
-               return fromTaxon;\r
-       }\r
-\r
-       public AcceptedTaxon getToTaxon(){\r
-               return toTaxon;\r
-       }\r
-\r
-       public ConceptRelationshipType getType(){\r
-               return type;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setCitation(PublicationBase newVal){\r
-               citation = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setFromTaxon(AcceptedTaxon newVal){\r
-               fromTaxon = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setToTaxon(AcceptedTaxon newVal){\r
-               toTaxon = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setType(ConceptRelationshipType newVal){\r
-               type = newVal;\r
-       }\r
-\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.taxon;
+
+
+import etaxonomy.cdm.model.common.ReferencedEntityBase;
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:23
+ */
+public class TaxonRelationship extends ReferencedEntityBase {
+       static Logger logger = Logger.getLogger(TaxonRelationship.class);
+
+       private ConceptRelationshipType type;
+       private Taxon fromTaxon;
+       private Taxon toTaxon;
+
+       public ConceptRelationshipType getType(){
+               return type;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setType(ConceptRelationshipType newVal){
+               type = newVal;
+       }
+
+       public Taxon getFromTaxon(){
+               return fromTaxon;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setFromTaxon(Taxon newVal){
+               fromTaxon = newVal;
+       }
+
+       public Taxon getToTaxon(){
+               return toTaxon;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setToTaxon(Taxon newVal){
+               toTaxon = newVal;
+       }
+
 }
\ No newline at end of file
index 041b40e1c87ebc1f679a1970cd645777cc42529b..604af82bca0c5e72e4e78c79e4ab851e890783e1 100644 (file)
@@ -1,92 +1,93 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.view;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-import java.util.*;\r
-import javax.persistence.*;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:18\r
- */\r
-@Entity\r
-public class User {\r
-       static Logger logger = Logger.getLogger(User.class);\r
-\r
-       private int created;\r
-       private String email;\r
-       private String name;\r
-       private String openID;\r
-       private ArrayList views;\r
-\r
-       public int getCreated(){\r
-               return created;\r
-       }\r
-\r
-       public String getEmail(){\r
-               return email;\r
-       }\r
-\r
-       public String getName(){\r
-               return name;\r
-       }\r
-\r
-       public String getOpenID(){\r
-               return openID;\r
-       }\r
-\r
-       public ArrayList getViews(){\r
-               return views;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setCreated(int newVal){\r
-               created = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setEmail(String newVal){\r
-               email = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setName(String newVal){\r
-               name = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setOpenID(String newVal){\r
-               openID = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setViews(ArrayList newVal){\r
-               views = newVal;\r
-       }\r
-\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.view;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:25
+ */
+public class User {
+       static Logger logger = Logger.getLogger(User.class);
+
+       @Description("")
+       private String name;
+       @Description("")
+       private String email;
+       @Description("")
+       private String openID;
+       @Description("")
+       private Calendar created;
+       private ArrayList views;
+
+       public ArrayList getViews(){
+               return views;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setViews(ArrayList newVal){
+               views = newVal;
+       }
+
+       public String getName(){
+               return name;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setName(String newVal){
+               name = newVal;
+       }
+
+       public String getEmail(){
+               return email;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setEmail(String newVal){
+               email = newVal;
+       }
+
+       public String getOpenID(){
+               return openID;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setOpenID(String newVal){
+               openID = newVal;
+       }
+
+       public Calendar getCreated(){
+               return created;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setCreated(Calendar newVal){
+               created = newVal;
+       }
+
 }
\ No newline at end of file
index 67cbc7e142924b1a5dd3e5c6ad8d2a23f46d2812..cf61800426695ac6f423656522c31b97081be045 100644 (file)
@@ -1,81 +1,80 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.view;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-import java.util.*;\r
-import javax.persistence.*;\r
-\r
-/**\r
- * use ARCHIVE view/dataset to maintain an archive. All members of that view will\r
- * never be changed\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 18:36:19\r
- */\r
-@Entity\r
-public class View {\r
-       static Logger logger = Logger.getLogger(View.class);\r
-\r
-       private String description;\r
-       private String name;\r
-       private java.util.ArrayList superView;\r
-       private ArrayList users;\r
-\r
-       public String getDescription(){\r
-               return description;\r
-       }\r
-\r
-       public String getName(){\r
-               return name;\r
-       }\r
-\r
-       public java.util.ArrayList getSuperView(){\r
-               return superView;\r
-       }\r
-\r
-       public ArrayList getUsers(){\r
-               return users;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setDescription(String newVal){\r
-               description = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setName(String newVal){\r
-               name = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setSuperView(java.util.ArrayList newVal){\r
-               superView = newVal;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param newVal\r
-        */\r
-       public void setUsers(ArrayList newVal){\r
-               users = newVal;\r
-       }\r
-\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package etaxonomy.cdm.model.view;
+
+
+import org.apache.log4j.Logger;
+
+/**
+ * use ARCHIVE view/dataset to maintain an archive. All members of that view will
+ * never be changed
+ * @author m.doering
+ * @version 1.0
+ * @created 02-Nov-2007 18:15:26
+ */
+public class View {
+       static Logger logger = Logger.getLogger(View.class);
+
+       @Description("")
+       private String name;
+       @Description("")
+       private String description;
+       private ArrayList users;
+       private java.util.ArrayList superView;
+
+       public java.util.ArrayList getSuperView(){
+               return superView;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setSuperView(java.util.ArrayList newVal){
+               superView = newVal;
+       }
+
+       public ArrayList getUsers(){
+               return users;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setUsers(ArrayList newVal){
+               users = newVal;
+       }
+
+       public String getName(){
+               return name;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setName(String newVal){
+               name = newVal;
+       }
+
+       public String getDescription(){
+               return description;
+       }
+
+       /**
+        * 
+        * @param newVal
+        */
+       public void setDescription(String newVal){
+               description = newVal;
+       }
+
 }
\ No newline at end of file