ref #8162 adapt cdmlip to new term package structure

diff --git a/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/CondensedDistributionComposerBase.java b/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/CondensedDistributionComposerBase.java
index fd4e1ec9722a955a4d263bea03e306c5e57fc43e..5666c590556b54874465cc700e18711de605986c 100644 (file)
--- a/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/CondensedDistributionComposerBase.java
+++ b/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/CondensedDistributionComposerBase.java
@@ -16,9 +16,9 @@ import java.util.Set;
 import java.util.UUID;
 
 import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.Representation;
 import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;
 import eu.etaxonomy.cdm.model.location.NamedArea;
+import eu.etaxonomy.cdm.model.term.Representation;
 
 /**
  * Base class for Distribution Composers

diff --git a/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/EditGeoService.java b/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/EditGeoService.java
index 86ed3e8f44595805622fa11661b97bcf1e874d44..972153e2532258ab39b21719c482ed5d982cba00 100644 (file)
--- a/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/EditGeoService.java
+++ b/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/EditGeoService.java
@@ -35,10 +35,8 @@ import eu.etaxonomy.cdm.api.service.dto.DistributionInfoDTO.InfoPart;
 import eu.etaxonomy.cdm.api.utility.DescriptionUtility;
 import eu.etaxonomy.cdm.api.utility.DistributionOrder;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.MarkerType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.description.Distribution;
 import eu.etaxonomy.cdm.model.description.Feature;
@@ -52,6 +50,8 @@ import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
 import eu.etaxonomy.cdm.model.occurrence.GatheringEvent;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.persistence.dao.common.IDefinedTermDao;
 import eu.etaxonomy.cdm.persistence.dao.common.ITermVocabularyDao;
 import eu.etaxonomy.cdm.persistence.dao.description.IDescriptionDao;

diff --git a/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/EditGeoServiceUtilities.java b/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/EditGeoServiceUtilities.java
index 0b2c01ecdefd3b16c985c2dc1e4dacc45dba03b8..2f89fa35d62136131c571233980a776fbb41540a 100644 (file)
--- a/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/EditGeoServiceUtilities.java
+++ b/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/EditGeoServiceUtilities.java
@@ -42,9 +42,6 @@ import eu.etaxonomy.cdm.api.utility.DescriptionUtility;
 import eu.etaxonomy.cdm.common.CdmUtils;\r
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
-import eu.etaxonomy.cdm.model.common.Representation;\r
-import eu.etaxonomy.cdm.model.common.TermType;\r
-import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
 import eu.etaxonomy.cdm.model.description.Distribution;\r
 import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;\r
 import eu.etaxonomy.cdm.model.location.Country;\r
@@ -52,6 +49,9 @@ import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.location.NamedAreaLevel;\r
 import eu.etaxonomy.cdm.model.location.Point;\r
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;\r
+import eu.etaxonomy.cdm.model.term.Representation;\r
+import eu.etaxonomy.cdm.model.term.TermType;\r
+import eu.etaxonomy.cdm.model.term.TermVocabulary;\r
 import eu.etaxonomy.cdm.persistence.dao.common.IDefinedTermDao;\r
 \r
 /**\r

diff --git a/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/FloraCubaCondensedDistributionComposerOld.java b/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/FloraCubaCondensedDistributionComposerOld.java
index 494b4d66a96b86f323f3a78e630284633a169bc9..11a2773748a4785ee88d2307737ac6ab3c804b1d 100644 (file)
--- a/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/FloraCubaCondensedDistributionComposerOld.java
+++ b/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/FloraCubaCondensedDistributionComposerOld.java
@@ -20,12 +20,12 @@ import org.apache.log4j.Logger;
 import eu.etaxonomy.cdm.api.service.dto.CondensedDistribution;
 import eu.etaxonomy.cdm.common.UTF8;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary;
 import eu.etaxonomy.cdm.model.description.Distribution;
 import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;
 import eu.etaxonomy.cdm.model.location.NamedArea;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.OrderedTermVocabulary;
 
 /**
  * @author a.mueller

diff --git a/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/ShpAttributesToNamedAreaMapper.java b/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/ShpAttributesToNamedAreaMapper.java
index d0797b8fb35c4ddaf3b558b3315be46d13b36701..e570fb4b0dcb5d2463ecf5a67ec8f6f266b47cd3 100644 (file)
--- a/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/ShpAttributesToNamedAreaMapper.java
+++ b/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/ShpAttributesToNamedAreaMapper.java
@@ -19,8 +19,8 @@ import org.apache.commons.lang.ArrayUtils;
 import org.apache.log4j.Logger;
 
 import au.com.bytecode.opencsv.CSVReader;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.location.NamedArea;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 /**
  * Reads csv data containing the attributes from a shape file and adds the

diff --git a/cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/geo/EditGeoServiceTest.java b/cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/geo/EditGeoServiceTest.java
index 79a4888ad8bb5e6b4207cc8e496a2f65c5328ec1..ddc097d45a4a393753c9beb2fa5d1e8004dc4724 100644 (file)
--- a/cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/geo/EditGeoServiceTest.java
+++ b/cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/geo/EditGeoServiceTest.java
@@ -46,11 +46,8 @@ import eu.etaxonomy.cdm.api.utility.DescriptionUtility;
 import eu.etaxonomy.cdm.common.StreamUtils;
 import eu.etaxonomy.cdm.common.UriUtils;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.MarkerType;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.description.Distribution;
 import eu.etaxonomy.cdm.model.description.Feature;
@@ -61,6 +58,9 @@ import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.location.NamedAreaLevel;
 import eu.etaxonomy.cdm.model.location.NamedAreaType;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.persistence.dao.common.IDefinedTermDao;
 import eu.etaxonomy.cdm.test.integration.CdmTransactionalIntegrationTest;
 

diff --git a/cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/geo/FloraCubaCondensedDistributionComposerTest.java b/cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/geo/FloraCubaCondensedDistributionComposerTest.java
index 446db2f7b63510e99629e3deb517b870ae7b12c9..ce21db1b7386c0a0de40499c86f03f84aca4be33 100644 (file)
--- a/cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/geo/FloraCubaCondensedDistributionComposerTest.java
+++ b/cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/geo/FloraCubaCondensedDistributionComposerTest.java
@@ -19,12 +19,12 @@ import org.junit.Ignore;
 import org.junit.Test;
 
 import eu.etaxonomy.cdm.api.service.dto.CondensedDistribution;
-import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.description.Distribution;
 import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;
 import eu.etaxonomy.cdm.model.location.NamedArea;
+import eu.etaxonomy.cdm.model.term.OrderedTermVocabulary;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.test.TermTestBase;
 
 /**

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTransformer.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTransformer.java
index 97216311ab693ff86fd92cd1877262d0dee29446..85c350842de6736c245da830f10808dd2f5e85bc 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTransformer.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTransformer.java
@@ -17,7 +17,6 @@ import org.apache.log4j.Logger;
 \r
 import eu.etaxonomy.cdm.common.ResultWrapper;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
-import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary;\r
 import eu.etaxonomy.cdm.model.common.RelationshipBase;\r
 import eu.etaxonomy.cdm.model.common.RelationshipTermBase;\r
 import eu.etaxonomy.cdm.model.description.Feature;\r
@@ -36,6 +35,7 @@ import eu.etaxonomy.cdm.model.taxon.SynonymType;
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;\r
+import eu.etaxonomy.cdm.model.term.OrderedTermVocabulary;\r
 import eu.etaxonomy.cdm.strategy.exceptions.UnknownCdmTypeException;\r
 \r
 /**\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/cdmLight/CdmLightClassificationExport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/cdmLight/CdmLightClassificationExport.java
index abf8168def298a34430bb90c67a93dad5871052f..74ccc83c5936a91d24ed97f0cb87a2742554be59 100755 (executable)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/cdmLight/CdmLightClassificationExport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/cdmLight/CdmLightClassificationExport.java
@@ -40,7 +40,6 @@ import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
 import eu.etaxonomy.cdm.model.common.Annotation;
 import eu.etaxonomy.cdm.model.common.AnnotationType;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.ICdmBase;
 import eu.etaxonomy.cdm.model.common.IIdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.Language;
@@ -80,6 +79,7 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
 import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDtoByRankAndNameComparator;
 import eu.etaxonomy.cdm.strategy.cache.TagEnum;

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmImportBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmImportBase.java
index e2cabebce03c3c3780e52b5f24f15edb3652af17..63c16f5f6a4f94b9c212771eea779a3acbbb13cb 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmImportBase.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmImportBase.java
@@ -33,8 +33,6 @@ import eu.etaxonomy.cdm.model.agent.Team;
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
 import eu.etaxonomy.cdm.model.common.AnnotationType;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.ExtensionType;
 import eu.etaxonomy.cdm.model.common.ICdmBase;
 import eu.etaxonomy.cdm.model.common.IOriginalSource;
@@ -44,10 +42,7 @@ import eu.etaxonomy.cdm.model.common.IdentifiableSource;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.Marker;
 import eu.etaxonomy.cdm.model.common.MarkerType;
-import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary;
 import eu.etaxonomy.cdm.model.common.OriginalSourceType;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.description.DescriptionElementSource;
@@ -79,6 +74,11 @@ import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.OrderedTermVocabulary;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 /**
  * @author a.mueller

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ImportStateBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ImportStateBase.java
index 2b68ac57632fe378ce5393a0888914f37df44301..a5e9a1df8e05c2e6f7549e386a3f842bb0ac56a3 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ImportStateBase.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ImportStateBase.java
@@ -19,8 +19,6 @@ import eu.etaxonomy.cdm.api.service.IService;
 import eu.etaxonomy.cdm.io.common.mapping.IInputTransformer;\r
 import eu.etaxonomy.cdm.model.common.AnnotationType;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
-import eu.etaxonomy.cdm.model.common.DefinedTerm;\r
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.common.ExtensionType;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
 import eu.etaxonomy.cdm.model.common.MarkerType;\r
@@ -36,6 +34,8 @@ import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.reference.Reference;\r
 import eu.etaxonomy.cdm.model.taxon.Classification;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;\r
+import eu.etaxonomy.cdm.model.term.DefinedTerm;\r
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;\r
 \r
 /**\r
  * @author a.mueller\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportAnnotationMapper.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportAnnotationMapper.java
index b49d80b163928609cf1a7bda71d64fed2ddec10b..a6580182c621e033dd0d1dc7275bcd2ca6cb2416 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportAnnotationMapper.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportAnnotationMapper.java
@@ -24,9 +24,9 @@ import eu.etaxonomy.cdm.model.common.AnnotatableEntity;
 import eu.etaxonomy.cdm.model.common.Annotation;\r
 import eu.etaxonomy.cdm.model.common.AnnotationType;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
-import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;\r
+import eu.etaxonomy.cdm.model.term.TermVocabulary;\r
 \r
 /**\r
  * This class maps a database attribute to CDM annotation added to the target class\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportDefinedTermCreationMapperBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportDefinedTermCreationMapperBase.java
index 1679ddccaa088049ceb72e6431bc3f3a6cab69a2..f191683ad96e8eb510a313f7d0822a9cd5b4a195 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportDefinedTermCreationMapperBase.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportDefinedTermCreationMapperBase.java
@@ -16,9 +16,9 @@ import java.util.UUID;
 import org.apache.log4j.Logger;\r
 \r
 import eu.etaxonomy.cdm.io.common.DbImportStateBase;\r
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.common.VersionableEntity;\r
 import eu.etaxonomy.cdm.model.reference.Reference;\r
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;\r
 \r
 /**\r
  * This class either retrieves a defined Term from the database or creates and saves it in the database.\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportExtensionMapper.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportExtensionMapper.java
index 0072e50fbd8357177de1711ed777cb830d282ea3..b189a76e46aafc6057bb01f6ca4a3ec968b78705 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportExtensionMapper.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportExtensionMapper.java
@@ -27,7 +27,7 @@ import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.Extension;\r
 import eu.etaxonomy.cdm.model.common.ExtensionType;\r
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;\r
-import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
+import eu.etaxonomy.cdm.model.term.TermVocabulary;\r
 \r
 /**\r
  * This class maps a database attribute to CDM extension added to the target class\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportExtensionTypeCreationMapper.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportExtensionTypeCreationMapper.java
index 76ef1c84bafb8a91096f3302c7fd24f45d718432..3ef61c839a3e9e46ce1eb847dd0a144c28a61e6c 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportExtensionTypeCreationMapper.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportExtensionTypeCreationMapper.java
@@ -1,8 +1,8 @@
 /**\r
 * Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
+* European Distributed Institute of Taxonomy\r
 * http://www.e-taxonomy.eu\r
-* \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
@@ -21,7 +21,7 @@ import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 \r
 /**\r
  * This class retrives or creates an existing or a new extension type.\r
- * \r
+ *\r
  * @see DbImportDefinedTermCreationMapperBase\r
  * @author a.mueller\r
  * @since 11.03.2010\r
@@ -33,9 +33,9 @@ public class DbImportExtensionTypeCreationMapper<STATE extends DbImportStateBase
 \r
 //******************************** FACTORY METHOD ***************************************************/\r
 \r
-       \r
+\r
        /**\r
-        * \r
+        *\r
         * @param dbIdAttribute\r
         * @parem extensionTypeNamespace\r
         * @param dbTermAttribute\r
@@ -46,10 +46,10 @@ public class DbImportExtensionTypeCreationMapper<STATE extends DbImportStateBase
        public static DbImportExtensionTypeCreationMapper<?> NewInstance(String dbIdAttribute, String extensionTypeNamespace, String dbTermAttribute, String dbLabelAttribute, String dbLabelAbbrevAttribute){\r
                return new DbImportExtensionTypeCreationMapper(dbIdAttribute, extensionTypeNamespace, dbTermAttribute, dbLabelAttribute, dbLabelAbbrevAttribute);\r
        }\r
-       \r
-       \r
+\r
+\r
 //     /**\r
-//      * Creates a Distribution with status <code>status</code> and adds it to the description of a taxon. \r
+//      * Creates a Distribution with status <code>status</code> and adds it to the description of a taxon.\r
 //      * @param dbIdAttribute\r
 //      * @param objectToCreateNamespace\r
 //      * @param dbTaxonFkAttribute\r
@@ -60,10 +60,10 @@ public class DbImportExtensionTypeCreationMapper<STATE extends DbImportStateBase
 //     public static DbImportFeatureCreationMapper<?> NewInstance(String dbIdAttribute, String dbTermAttribute, String dbLabelAttribute, String dbLabelAbbrevAttribute){\r
 //             return new DbImportFeatureCreationMapper(dbIdAttribute, objectToCreateNamespace, dbTaxonFkAttribute, taxonNamespace, dbTextAttribute, language, feature, format);\r
 //     }\r
-       \r
+\r
 //******************************* ATTRIBUTES ***************************************/\r
 \r
-       \r
+\r
 //********************************* CONSTRUCTOR ****************************************/\r
 \r
        /**\r
@@ -79,47 +79,28 @@ public class DbImportExtensionTypeCreationMapper<STATE extends DbImportStateBase
 \r
 //************************************ METHODS *******************************************/\r
 \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.common.mapping.DbImportDefinedTermCreationMapperBase#getTermFromState(java.lang.String)\r
-        */\r
        @Override\r
        protected ExtensionType getTermFromState(UUID uuid) {\r
                return getState().getExtensionType(uuid);\r
        }\r
 \r
-\r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.common.mapping.DbImportDefinedTermCreationMapperBase#getTermFromTransformer(java.sql.ResultSet)\r
-        */\r
        @Override\r
        protected ExtensionType getTermFromTransformer(String key, IInputTransformer transformer) throws UndefinedTransformerMethodException {\r
                return transformer.getExtensionTypeByKey(key);\r
        }\r
 \r
-\r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.common.mapping.DbImportDefinedTermCreationMapperBase#getUuidFromTransformer(java.sql.ResultSet)\r
-        */\r
        @Override\r
        protected UUID getUuidFromTransformer(String key, IInputTransformer transformer) throws UndefinedTransformerMethodException {\r
                UUID uuid = transformer.getExtensionTypeUuid(key);\r
                return uuid;\r
        }\r
 \r
-\r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.common.mapping.DbImportDefinedTermCreationMapperBase#saveTermToState(java.lang.String, eu.etaxonomy.cdm.model.common.DefinedTermBase)\r
-        */\r
        @Override\r
        protected void saveTermToState(ExtensionType extensionType) {\r
                getState().putExtensionType(extensionType);\r
-               \r
-       }\r
 \r
+       }\r
 \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.common.mapping.DbImportDefinedTermCreationMapperBase#createDefinedTerm(java.sql.ResultSet)\r
-        */\r
        @Override\r
        protected ExtensionType createDefinedTerm(ResultSet rs) throws SQLException {\r
                String term = this.getStringDbValue(rs, dbTermAttribute);\r
@@ -131,8 +112,6 @@ public class DbImportExtensionTypeCreationMapper<STATE extends DbImportStateBase
                }else{\r
                        return null;\r
                }\r
-       \r
-       }\r
-\r
 \r
+       }\r
 }\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportFeatureCreationMapper.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportFeatureCreationMapper.java
index 82e31ce1a371345464137334161288667e3894f1..6dcfbff6dd0ec76ddeab52495aa3ff74e06e5535 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportFeatureCreationMapper.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportFeatureCreationMapper.java
@@ -1,8 +1,8 @@
 /**\r
 * Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
+* European Distributed Institute of Taxonomy\r
 * http://www.e-taxonomy.eu\r
-* \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
@@ -21,11 +21,10 @@ import eu.etaxonomy.cdm.model.description.Feature;
 \r
 /**\r
  * This class retrives or creates an existing or a new feature.\r
- * \r
+ *\r
  * @see DbImportDefinedTermCreationMapperBase\r
  * @author a.mueller\r
  * @since 11.03.2010\r
- * @version 1.0\r
  */\r
 public class DbImportFeatureCreationMapper<STATE extends DbImportStateBase<?,?>> extends DbImportDefinedTermCreationMapperBase<Feature, DescriptionElementBase, DbImportStateBase<?,?>> {\r
        @SuppressWarnings("unused")\r
@@ -33,9 +32,9 @@ public class DbImportFeatureCreationMapper<STATE extends DbImportStateBase<?,?>>
 \r
 //******************************** FACTORY METHOD ***************************************************/\r
 \r
-       \r
+\r
        /**\r
-        * \r
+        *\r
         * @param dbIdAttribute\r
         * @param dbTermAttribute\r
         * @param dbLabelAttribute\r
@@ -45,10 +44,10 @@ public class DbImportFeatureCreationMapper<STATE extends DbImportStateBase<?,?>>
        public static DbImportFeatureCreationMapper<?> NewInstance(String dbIdAttribute, String featureNamespace, String dbTermAttribute, String dbLabelAttribute, String dbLabelAbbrevAttribute){\r
                return new DbImportFeatureCreationMapper(dbIdAttribute, featureNamespace, dbTermAttribute, dbLabelAttribute, dbLabelAbbrevAttribute);\r
        }\r
-       \r
-       \r
+\r
+\r
 //     /**\r
-//      * Creates a Distribution with status <code>status</code> and adds it to the description of a taxon. \r
+//      * Creates a Distribution with status <code>status</code> and adds it to the description of a taxon.\r
 //      * @param dbIdAttribute\r
 //      * @param objectToCreateNamespace\r
 //      * @param dbTaxonFkAttribute\r
@@ -59,10 +58,10 @@ public class DbImportFeatureCreationMapper<STATE extends DbImportStateBase<?,?>>
 //     public static DbImportFeatureCreationMapper<?> NewInstance(String dbIdAttribute, String dbTermAttribute, String dbLabelAttribute, String dbLabelAbbrevAttribute){\r
 //             return new DbImportFeatureCreationMapper(dbIdAttribute, objectToCreateNamespace, dbTaxonFkAttribute, taxonNamespace, dbTextAttribute, language, feature, format);\r
 //     }\r
-       \r
+\r
 //******************************* ATTRIBUTES ***************************************/\r
 \r
-       \r
+\r
 //********************************* CONSTRUCTOR ****************************************/\r
        /**\r
         * @param dbIdAttribute\r
@@ -76,48 +75,28 @@ public class DbImportFeatureCreationMapper<STATE extends DbImportStateBase<?,?>>
 \r
 //************************************ METHODS *******************************************/\r
 \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.common.mapping.DbImportDefinedTermCreationMapperBase#getTermFromState(java.lang.String)\r
-        */\r
        @Override\r
        protected Feature getTermFromState(UUID uuid) {\r
                return getState().getFeature(uuid);\r
        }\r
 \r
-\r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.common.mapping.DbImportDefinedTermCreationMapperBase#getTermFromTransformer(java.sql.ResultSet)\r
-        */\r
        @Override\r
        protected Feature getTermFromTransformer(String key, IInputTransformer transformer) throws UndefinedTransformerMethodException {\r
                return transformer.getFeatureByKey(key);\r
        }\r
 \r
-\r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.common.mapping.DbImportDefinedTermCreationMapperBase#getUuidFromTransformer(java.sql.ResultSet)\r
-        */\r
        @Override\r
        protected UUID getUuidFromTransformer(String key, IInputTransformer transformer) throws UndefinedTransformerMethodException {\r
                UUID uuid = transformer.getFeatureUuid(key);\r
                return uuid;\r
        }\r
 \r
-\r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.common.mapping.DbImportDefinedTermCreationMapperBase#saveTermToState(java.lang.String, eu.etaxonomy.cdm.model.common.DefinedTermBase)\r
-        */\r
        @Override\r
        protected void saveTermToState(Feature feature) {\r
                getState().putFeature(feature);\r
-               \r
-       }\r
 \r
+       }\r
 \r
-//\r
-//     /* (non-Javadoc)\r
-//      * @see eu.etaxonomy.cdm.io.common.mapping.DbImportObjectCreationMapperBase#createObject(java.sql.ResultSet)\r
-//      */\r
 //     @Override\r
 //     protected Feature createObject(ResultSet rs) throws SQLException {\r
 //             String term = this.getStringDbValue(rs, dbTermAttribute);\r
@@ -131,10 +110,6 @@ public class DbImportFeatureCreationMapper<STATE extends DbImportStateBase<?,?>>
 //             }\r
 //     }\r
 \r
-\r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.common.mapping.DbImportDefinedTermCreationMapperBase#createDefinedTerm(java.sql.ResultSet)\r
-        */\r
        @Override\r
        protected Feature createDefinedTerm(ResultSet rs) throws SQLException {\r
                String term = this.getStringDbValue(rs, dbTermAttribute);\r
@@ -148,5 +123,4 @@ public class DbImportFeatureCreationMapper<STATE extends DbImportStateBase<?,?>>
                }\r
        }\r
 \r
-\r
 }\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportMarkerMapper.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportMarkerMapper.java
index 72abf2d36cbaeda93a0e855e7cb03264fb7018aa..566f1177bec51b9d58b0056d5fe59ae367c5d4ac 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportMarkerMapper.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportMarkerMapper.java
@@ -26,7 +26,7 @@ import eu.etaxonomy.cdm.model.common.AnnotatableEntity;
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
 import eu.etaxonomy.cdm.model.common.Marker;\r
 import eu.etaxonomy.cdm.model.common.MarkerType;\r
-import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
+import eu.etaxonomy.cdm.model.term.TermVocabulary;\r
 \r
 /**\r
  * This class maps a database attribute to CDM extension added to the target class\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportSupplementCreationMapperBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportSupplementCreationMapperBase.java
index 6951fa9abe44b6ca9f07affc1607afbe0811fa2c..8482374ac7f55bbf60a19770e2bf5a41e7ccebbc 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportSupplementCreationMapperBase.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportSupplementCreationMapperBase.java
@@ -19,9 +19,9 @@ import eu.etaxonomy.cdm.io.common.DbImportStateBase;
 import eu.etaxonomy.cdm.model.common.AnnotatableEntity;\r
 import eu.etaxonomy.cdm.model.common.Annotation;\r
 import eu.etaxonomy.cdm.model.common.AnnotationType;\r
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
 import eu.etaxonomy.cdm.model.common.VersionableEntity;\r
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;\r
 \r
 /**\r
  * @author a.mueller\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/IInputTransformer.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/IInputTransformer.java
index 0b82bfdf1fe56d0eb85e4a7a0a66f442e8c659bd..50f4820d5a54e4f93ebf6ad482cebfa3cd11b8a2 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/IInputTransformer.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/IInputTransformer.java
@@ -11,7 +11,6 @@ package eu.etaxonomy.cdm.io.common.mapping;
 
 import java.util.UUID;
 
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.ExtensionType;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.MarkerType;
@@ -25,6 +24,7 @@ import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus;
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 
 
 /**

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/InputTransformerBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/InputTransformerBase.java
index 774a93725a911db51ae7631667e6817bd8f246e7..8c80b9a07dcadebfa544188afc6c199d77300743 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/InputTransformerBase.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/InputTransformerBase.java
@@ -16,7 +16,6 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 
 import eu.etaxonomy.cdm.common.CdmUtils;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.ExtensionType;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.MarkerType;
@@ -30,6 +29,7 @@ import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus;
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 
 /**
  * @author a.mueller

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/csv/redlist/demo/CsvDemoExportTransformer.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/csv/redlist/demo/CsvDemoExportTransformer.java
index 8ca6eab655a789d6e4ce093a6e39e785088ff03b..4ac8e5c1010b4fb0a608dfae0b50a81cc834c4aa 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/csv/redlist/demo/CsvDemoExportTransformer.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/csv/redlist/demo/CsvDemoExportTransformer.java
@@ -16,12 +16,12 @@ import org.apache.log4j.Logger;
 \r
 import eu.etaxonomy.cdm.io.common.mapping.InputTransformerBase;\r
 import eu.etaxonomy.cdm.io.dwca.out.TermMapping;\r
-import eu.etaxonomy.cdm.model.common.DefinedTerm;\r
 import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;\r
 import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus;\r
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;\r
+import eu.etaxonomy.cdm.model.term.DefinedTerm;\r
 \r
 /**\r
  * @author a.mueller\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/csv/redlist/demo/CsvDemoRecordBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/csv/redlist/demo/CsvDemoRecordBase.java
index 173980db4811288cd1e63c7dd4c80af3d5891e5b..7ae1c7252678468aa561aaa5097492c1ef4c5efb 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/csv/redlist/demo/CsvDemoRecordBase.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/csv/redlist/demo/CsvDemoRecordBase.java
@@ -28,7 +28,6 @@ import eu.etaxonomy.cdm.io.stream.terms.TermUri;
 import eu.etaxonomy.cdm.model.agent.AgentBase;\r
 import eu.etaxonomy.cdm.model.common.Annotation;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
-import eu.etaxonomy.cdm.model.common.DefinedTerm;\r
 import eu.etaxonomy.cdm.model.common.LSID;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
 import eu.etaxonomy.cdm.model.common.TimePeriod;\r
@@ -42,6 +41,7 @@ import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;\r
 import eu.etaxonomy.cdm.model.name.TypeDesignationStatusBase;\r
+import eu.etaxonomy.cdm.model.term.DefinedTerm;\r
 \r
 /**\r
  * @author a.mueller, a.oppermann\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/csv/redlist/out/CsvRecordBaseRedlist.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/csv/redlist/out/CsvRecordBaseRedlist.java
index ca939030c44854046b888140299ccbe8dba67625..6fecb2723bdb3e7e5dac4de295c10a7504438603 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/csv/redlist/out/CsvRecordBaseRedlist.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/csv/redlist/out/CsvRecordBaseRedlist.java
@@ -28,7 +28,6 @@ import eu.etaxonomy.cdm.io.stream.terms.TermUri;
 import eu.etaxonomy.cdm.model.agent.AgentBase;\r
 import eu.etaxonomy.cdm.model.common.Annotation;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
-import eu.etaxonomy.cdm.model.common.DefinedTerm;\r
 import eu.etaxonomy.cdm.model.common.LSID;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
 import eu.etaxonomy.cdm.model.common.TimePeriod;\r
@@ -42,6 +41,7 @@ import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;\r
 import eu.etaxonomy.cdm.model.name.TypeDesignationStatusBase;\r
+import eu.etaxonomy.cdm.model.term.DefinedTerm;\r
 \r
 /**\r
  * @author a.mueller\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/csv/redlist/out/CsvTaxExportTransformerRedlist.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/csv/redlist/out/CsvTaxExportTransformerRedlist.java
index 8c7e48d73e2bfb03fbb715b10eb27d5c21fbd95c..79b27491d487bd1e6b5e9f2e9215b61a03c4f3df 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/csv/redlist/out/CsvTaxExportTransformerRedlist.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/csv/redlist/out/CsvTaxExportTransformerRedlist.java
@@ -16,12 +16,12 @@ import org.apache.log4j.Logger;
 \r
 import eu.etaxonomy.cdm.io.common.mapping.InputTransformerBase;\r
 import eu.etaxonomy.cdm.io.dwca.out.TermMapping;\r
-import eu.etaxonomy.cdm.model.common.DefinedTerm;\r
 import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;\r
 import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus;\r
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;\r
+import eu.etaxonomy.cdm.model.term.DefinedTerm;\r
 \r
 /**\r
  * @author a.mueller\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/descriptive/owl/out/OwlExport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/descriptive/owl/out/OwlExport.java
index e05b6c3928319f783dd2d7ddcb5a6293ff1a7c56..7b3b5c1f83298a5f12282b613cfa2f2dd41f690c 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/descriptive/owl/out/OwlExport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/descriptive/owl/out/OwlExport.java
@@ -22,9 +22,9 @@ import com.hp.hpl.jena.rdf.model.Resource;
 
 import eu.etaxonomy.cdm.io.common.CdmExportBase;
 import eu.etaxonomy.cdm.io.common.mapping.out.IExportTransformer;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.description.FeatureNode;
 import eu.etaxonomy.cdm.model.description.FeatureTree;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
 
 /**
  * @author pplitzner

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/descriptive/word/out/WordExport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/descriptive/word/out/WordExport.java
index 4fa6c1662d38109b71f2c7c3e27b392fd0c11ff7..fa45af8dd1d02c1148511084863c4599ebbb8172 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/descriptive/word/out/WordExport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/descriptive/word/out/WordExport.java
@@ -19,9 +19,9 @@ import org.springframework.transaction.TransactionStatus;
 
 import eu.etaxonomy.cdm.io.common.CdmExportBase;
 import eu.etaxonomy.cdm.io.common.mapping.out.IExportTransformer;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.description.FeatureNode;
 import eu.etaxonomy.cdm.model.description.FeatureTree;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
 
 /**
  *

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/distribution/excelupdate/ExcelDistributionUpdate.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/distribution/excelupdate/ExcelDistributionUpdate.java
index 6b63eaa8d141d26f11ccf0dbb0bbe9d8efa4fbe1..d570d090accd78f79930eff86cc9c70b048c9939 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/distribution/excelupdate/ExcelDistributionUpdate.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/distribution/excelupdate/ExcelDistributionUpdate.java
@@ -23,8 +23,6 @@ import eu.etaxonomy.cdm.io.common.ImportResult;
 import eu.etaxonomy.cdm.io.excel.common.ExcelImportBase;
 import eu.etaxonomy.cdm.io.excel.common.ExcelRowBase;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.description.Distribution;
@@ -32,6 +30,8 @@ import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 /**
  * This Import class updates existing distributions with the new state

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/in/DwcTaxonStreamItem2CdmTaxonConverter.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/in/DwcTaxonStreamItem2CdmTaxonConverter.java
index d1135c477c204feb1bdb1d36a9e4bbf35f2b87ef..f520b3ab50e3ab84977812f34f2c715cad9e73f0 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/in/DwcTaxonStreamItem2CdmTaxonConverter.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/in/DwcTaxonStreamItem2CdmTaxonConverter.java
@@ -35,8 +35,6 @@ import eu.etaxonomy.cdm.io.stream.StreamItem;
 import eu.etaxonomy.cdm.io.stream.terms.TermUri;
 import eu.etaxonomy.cdm.model.common.Annotation;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.Extension;
 import eu.etaxonomy.cdm.model.common.ExtensionType;
 import eu.etaxonomy.cdm.model.common.IdentifiableSource;
@@ -60,6 +58,8 @@ import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
 import eu.etaxonomy.cdm.strategy.exceptions.StringNotParsableException;
 import eu.etaxonomy.cdm.strategy.exceptions.UnknownCdmTypeException;
 import eu.etaxonomy.cdm.strategy.parser.NonViralNameParserImpl;

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/in/GbifDistributionCsv2CdmConverter.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/in/GbifDistributionCsv2CdmConverter.java
index c7974115fd493093bb0cb36f8cd67051d313687e..42117c74d1e927e7f3b0f4e848d489ce5294c26c 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/in/GbifDistributionCsv2CdmConverter.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/in/GbifDistributionCsv2CdmConverter.java
@@ -28,13 +28,13 @@ import eu.etaxonomy.cdm.io.stream.PartitionableConverterBase;
 import eu.etaxonomy.cdm.io.stream.StreamItem;\r
 import eu.etaxonomy.cdm.io.stream.terms.TermUri;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
-import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
 import eu.etaxonomy.cdm.model.description.Distribution;\r
 import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;\r
 import eu.etaxonomy.cdm.model.description.TaxonDescription;\r
 import eu.etaxonomy.cdm.model.location.NamedArea;\r
 import eu.etaxonomy.cdm.model.reference.Reference;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
+import eu.etaxonomy.cdm.model.term.TermVocabulary;\r
 \r
 /**\r
  * @author a.mueller\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/out/DwcaDistributionRecord.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/out/DwcaDistributionRecord.java
index 42e9235460a112cdc5afbbd96a8ba6d1fbb88763..2d749ebbdd1c7a4a5cc6899045c0dbf829a6328d 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/out/DwcaDistributionRecord.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/out/DwcaDistributionRecord.java
@@ -16,11 +16,11 @@ import org.apache.log4j.Logger;
 \r
 import eu.etaxonomy.cdm.io.stream.terms.TermUri;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
-import eu.etaxonomy.cdm.model.common.DefinedTerm;\r
 import eu.etaxonomy.cdm.model.common.TimePeriod;\r
 import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;\r
 import eu.etaxonomy.cdm.model.location.Country;\r
 import eu.etaxonomy.cdm.model.location.NamedArea;\r
+import eu.etaxonomy.cdm.model.term.DefinedTerm;\r
 \r
 /**\r
  * @author a.mueller\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/out/DwcaRecordBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/out/DwcaRecordBase.java
index 697b93c4b7a06b097b692ceec18244d230bf7d65..389b72353d747aaa19daf9b8dc1a935e92f60654 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/out/DwcaRecordBase.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/out/DwcaRecordBase.java
@@ -27,7 +27,6 @@ import eu.etaxonomy.cdm.io.stream.terms.TermUri;
 import eu.etaxonomy.cdm.model.agent.AgentBase;\r
 import eu.etaxonomy.cdm.model.common.Annotation;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
-import eu.etaxonomy.cdm.model.common.DefinedTerm;\r
 import eu.etaxonomy.cdm.model.common.ICdmBase;\r
 import eu.etaxonomy.cdm.model.common.LSID;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
@@ -42,6 +41,7 @@ import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;\r
 import eu.etaxonomy.cdm.model.name.TypeDesignationStatusBase;\r
+import eu.etaxonomy.cdm.model.term.DefinedTerm;\r
 \r
 /**\r
  * @author a.mueller\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/out/DwcaTaxExportTransformer.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/out/DwcaTaxExportTransformer.java
index 5cd5e71e79cd5daab2e672d8f3f061dbe45f52d9..d06710f8ecf2802a1eb194a39c9f30e02dff074c 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/out/DwcaTaxExportTransformer.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/out/DwcaTaxExportTransformer.java
@@ -14,12 +14,12 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;\r
 \r
 import eu.etaxonomy.cdm.io.common.mapping.out.ExportTransformerBase;\r
-import eu.etaxonomy.cdm.model.common.DefinedTerm;\r
 import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;\r
 import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus;\r
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;\r
+import eu.etaxonomy.cdm.model.term.DefinedTerm;\r
 \r
 /**\r
  * @author a.mueller\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/out/DwcaTypesRecord.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/out/DwcaTypesRecord.java
index f0ff3f6836119d9c790d680724ed976de13e7ce7..3b48eec50bdfa8b9d2baf436ed8fbde8127ab5f3 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/out/DwcaTypesRecord.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/out/DwcaTypesRecord.java
@@ -15,11 +15,11 @@ import org.apache.log4j.Logger;
 \r
 import eu.etaxonomy.cdm.io.stream.terms.TermUri;\r
 import eu.etaxonomy.cdm.model.agent.AgentBase;\r
-import eu.etaxonomy.cdm.model.common.DefinedTerm;\r
 import eu.etaxonomy.cdm.model.common.TimePeriod;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.name.TypeDesignationStatusBase;\r
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;\r
+import eu.etaxonomy.cdm.model.term.DefinedTerm;\r
 \r
 /**\r
  * @author a.mueller\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/out/DwcaVernacularRecord.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/out/DwcaVernacularRecord.java
index f9caca57bbb1ed1d372b41d20fc15521a6353804..0ff7b6d6115e25e90d2db10cc45d11c5570222de 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/out/DwcaVernacularRecord.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/out/DwcaVernacularRecord.java
@@ -14,9 +14,9 @@ import java.net.URISyntaxException;
 import org.apache.log4j.Logger;\r
 \r
 import eu.etaxonomy.cdm.io.stream.terms.TermUri;\r
-import eu.etaxonomy.cdm.model.common.DefinedTerm;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
 import eu.etaxonomy.cdm.model.location.NamedArea;\r
+import eu.etaxonomy.cdm.model.term.DefinedTerm;\r
 \r
 /**\r
  * @author a.mueller\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/taxa/NormalExplicitImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/taxa/NormalExplicitImport.java
index 9afc3a4220b9e202d27b4d7e0126902813243b84..36b51a4b991be7277a4a02550db6515bb6f94e9f 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/taxa/NormalExplicitImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/taxa/NormalExplicitImport.java
@@ -31,7 +31,6 @@ import eu.etaxonomy.cdm.io.tcsrdf.TcsRdfTransformer;
 import eu.etaxonomy.cdm.model.agent.Team;
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.Extension;
 import eu.etaxonomy.cdm.model.common.ExtensionType;
 import eu.etaxonomy.cdm.model.common.Identifier;
@@ -64,6 +63,7 @@ import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.SynonymType;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.persistence.dto.MergeResult;
 import eu.etaxonomy.cdm.strategy.exceptions.StringNotParsableException;
 import eu.etaxonomy.cdm.strategy.exceptions.UnknownCdmTypeException;

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/identifier/IdentifierImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/identifier/IdentifierImport.java
index f5d55adab88461ad32573db79338bf967d1ebd53..265ac0d000bd79e8ab9fb92ea8eeae9a7ca2f958 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/identifier/IdentifierImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/identifier/IdentifierImport.java
@@ -23,11 +23,11 @@ import org.springframework.transaction.TransactionStatus;
 import au.com.bytecode.opencsv.CSVReader;
 import eu.etaxonomy.cdm.io.common.SimpleImport;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.Identifier;
-import eu.etaxonomy.cdm.model.common.TermType;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.TermType;
 
 /**
  * Imports identifiers for a certain {@link IdentifiableEntity} class from a csv

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/CdmIDResolver.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/CdmIDResolver.java
index 2a99a71bbcae1e8e1e34274efe8b071f6d66a61c..d9b9d41efbde106c95ea5fbe581d029cdc131f79 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/CdmIDResolver.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/CdmIDResolver.java
@@ -28,8 +28,6 @@ import eu.etaxonomy.cdm.api.service.IVocabularyService;
 import eu.etaxonomy.cdm.jaxb.UUIDAdapter;\r
 import eu.etaxonomy.cdm.model.agent.AgentBase;\r
 import eu.etaxonomy.cdm.model.agent.INomenclaturalAuthor;\r
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
-import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
 import eu.etaxonomy.cdm.model.common.User;\r
 import eu.etaxonomy.cdm.model.description.DescriptionBase;\r
 import eu.etaxonomy.cdm.model.description.FeatureTree;\r
@@ -40,6 +38,8 @@ import eu.etaxonomy.cdm.model.occurrence.Collection;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;\r
 import eu.etaxonomy.cdm.model.reference.Reference;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;\r
+import eu.etaxonomy.cdm.model.term.TermVocabulary;\r
 \r
 public class CdmIDResolver extends IDResolver {\r
        private static final Logger logger = Logger.getLogger(CdmIDResolver.class);\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/DataSet.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/DataSet.java
index 13a7255348cd5cdd7c73774bc509804430a394ee..86bbdbe941164bb7229902030dfdfda6097a4568 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/DataSet.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/DataSet.java
@@ -29,8 +29,6 @@ import eu.etaxonomy.cdm.model.agent.Institution;
 import eu.etaxonomy.cdm.model.agent.Person;\r
 import eu.etaxonomy.cdm.model.agent.Team;\r
 import eu.etaxonomy.cdm.model.common.AnnotationType;\r
-import eu.etaxonomy.cdm.model.common.DefinedTerm;\r
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.common.EventBase;\r
 import eu.etaxonomy.cdm.model.common.ExtensionType;\r
 import eu.etaxonomy.cdm.model.common.GrantedAuthorityImpl;\r
@@ -38,8 +36,6 @@ import eu.etaxonomy.cdm.model.common.Group;
 import eu.etaxonomy.cdm.model.common.Language;\r
 import eu.etaxonomy.cdm.model.common.LanguageString;\r
 import eu.etaxonomy.cdm.model.common.MarkerType;\r
-import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary;\r
-import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
 import eu.etaxonomy.cdm.model.common.User;\r
 import eu.etaxonomy.cdm.model.description.Feature;\r
 import eu.etaxonomy.cdm.model.description.FeatureTree;\r
@@ -86,6 +82,10 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;\r
+import eu.etaxonomy.cdm.model.term.DefinedTerm;\r
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;\r
+import eu.etaxonomy.cdm.model.term.OrderedTermVocabulary;\r
+import eu.etaxonomy.cdm.model.term.TermVocabulary;\r
 \r
 /**\r
  * @author a.babadshanjan\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbExport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbExport.java
index 40eb755f2825b97e732e6ba5e2499c829951ac91..0bfb564f259b75b35ec310df62d5df64a670b753 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbExport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbExport.java
@@ -31,7 +31,6 @@ import eu.etaxonomy.cdm.io.common.ICdmExport;
 import eu.etaxonomy.cdm.io.common.IExportConfigurator;
 import eu.etaxonomy.cdm.io.common.mapping.out.IExportTransformer;
 import eu.etaxonomy.cdm.model.agent.AgentBase;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.User;
 import eu.etaxonomy.cdm.model.description.FeatureTree;
 import eu.etaxonomy.cdm.model.name.TaxonName;
@@ -40,6 +39,7 @@ import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
 
 /**
  * @author a.babadshanjan

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbImport.java
index cc413ad6978b495506667adc11dc973766d7f4d2..ad54090507394477a8ef3eee0a138213325f4338 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbImport.java
@@ -24,9 +24,7 @@ import eu.etaxonomy.cdm.io.common.CdmImportBase;
 import eu.etaxonomy.cdm.io.common.ICdmIO;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator;\r
 import eu.etaxonomy.cdm.model.agent.AgentBase;\r
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.common.LanguageStringBase;\r
-import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
 import eu.etaxonomy.cdm.model.common.User;\r
 import eu.etaxonomy.cdm.model.description.DescriptionBase;\r
 import eu.etaxonomy.cdm.model.description.FeatureNode;\r
@@ -40,6 +38,8 @@ import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.Classification;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;\r
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;\r
+import eu.etaxonomy.cdm.model.term.TermVocabulary;\r
 \r
 /**\r
  * @author a.babadshanjan\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupDocumentImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupDocumentImport.java
index f13bed4043f631bfc0e2a6493a0f2a5b26b180fc..b1bf5f54f0cb5ffbad429abb7971504be93952e1 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupDocumentImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupDocumentImport.java
@@ -26,11 +26,9 @@ import eu.etaxonomy.cdm.ext.geo.IEditGeoService;
 import eu.etaxonomy.cdm.io.common.ICdmIO;
 import eu.etaxonomy.cdm.io.common.XmlImportBase;
 import eu.etaxonomy.cdm.model.common.AnnotationType;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.ExtensionType;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.MarkerType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;
@@ -41,6 +39,8 @@ import eu.etaxonomy.cdm.model.location.NamedAreaType;
 import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 /**
  * @author a.mueller

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupFeatureImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupFeatureImport.java
index a8ed04916a4ca409e68f5044ac7081de0a70753d..68a22660fa4b6f14437927cc7afe7da9354c9e5c 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupFeatureImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupFeatureImport.java
@@ -33,7 +33,6 @@ import eu.etaxonomy.cdm.model.common.IntextReference;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.MarkerType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.description.CommonTaxonName;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.description.Feature;
@@ -44,6 +43,7 @@ import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 /**
  * @author a.mueller

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupImportBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupImportBase.java
index 43c13337374c5c59c38244a25cc8b609669ffcdf..5e528f184df8da89749017a3d92023b2f0b750ac 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupImportBase.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupImportBase.java
@@ -54,15 +54,12 @@ import eu.etaxonomy.cdm.model.common.AnnotatableEntity;
 import eu.etaxonomy.cdm.model.common.Annotation;
 import eu.etaxonomy.cdm.model.common.AnnotationType;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.Extension;
 import eu.etaxonomy.cdm.model.common.ExtensionType;
 import eu.etaxonomy.cdm.model.common.IntextReference;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.MarkerType;
 import eu.etaxonomy.cdm.model.common.OriginalSourceType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.common.VerbatimTimePeriod;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.description.Distribution;
@@ -90,6 +87,9 @@ import eu.etaxonomy.cdm.model.reference.ReferenceType;
 import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.strategy.exceptions.UnknownCdmTypeException;
 import eu.etaxonomy.cdm.strategy.parser.NonViralNameParserImpl;
 import eu.etaxonomy.cdm.strategy.parser.TimePeriodParser;

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupSpecimenImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupSpecimenImport.java
index a8286226d8bb94240277539d601b0f7f1fdc2136..654792b5e6d05a614d3694198232db727d7f4133 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupSpecimenImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupSpecimenImport.java
@@ -33,7 +33,6 @@ import eu.etaxonomy.cdm.model.common.AnnotatableEntity;
 import eu.etaxonomy.cdm.model.common.Annotation;
 import eu.etaxonomy.cdm.model.common.AnnotationType;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.Marker;
 import eu.etaxonomy.cdm.model.common.MarkerType;
@@ -59,6 +58,7 @@ import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.strategy.exceptions.UnknownCdmTypeException;
 import eu.etaxonomy.cdm.strategy.parser.SpecimenTypeParser;
 import eu.etaxonomy.cdm.strategy.parser.SpecimenTypeParser.TypeInfo;

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupTransformer.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupTransformer.java
index 946a5d743bacd231abaee9d9bb7363e9663dadba..1b2f8e66e8f77b3b119ffdf4ece433bd380cf029 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupTransformer.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupTransformer.java
@@ -17,7 +17,6 @@ import eu.etaxonomy.cdm.common.CdmUtils;
 import eu.etaxonomy.cdm.io.common.TdwgAreaProvider;
 import eu.etaxonomy.cdm.io.common.mapping.InputTransformerBase;
 import eu.etaxonomy.cdm.io.common.mapping.UndefinedTransformerMethodException;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.MarkerType;
 import eu.etaxonomy.cdm.model.description.Feature;
@@ -25,6 +24,7 @@ import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;
 import eu.etaxonomy.cdm.model.location.Country;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.location.NamedAreaLevel;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 
 /**
  * @author a.mueller

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/operation/CacheUpdater.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/operation/CacheUpdater.java
index 65df20f12b449a620726744a6e9d24e5914c6741..7bc92d023d02ad3c16f45335a2619cb57955c670 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/operation/CacheUpdater.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/operation/CacheUpdater.java
@@ -10,10 +10,7 @@ import eu.etaxonomy.cdm.io.common.CdmImportBase;
 import eu.etaxonomy.cdm.io.common.DefaultImportState;
 import eu.etaxonomy.cdm.io.operation.config.CacheUpdaterConfigurator;
 import eu.etaxonomy.cdm.model.agent.AgentBase;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
-import eu.etaxonomy.cdm.model.common.TermBase;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.DescriptiveDataSet;
 import eu.etaxonomy.cdm.model.description.FeatureTree;
@@ -27,6 +24,9 @@ import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.TermBase;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 
 @Component

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/operation/CacheUpdaterWithNewCacheStrategy.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/operation/CacheUpdaterWithNewCacheStrategy.java
index ed56c9f6828bd53b9501478db5f3db325f70fc47..a44ae36b727664be9783ef27d0e7746e888df367 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/operation/CacheUpdaterWithNewCacheStrategy.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/operation/CacheUpdaterWithNewCacheStrategy.java
@@ -8,9 +8,7 @@ import org.springframework.stereotype.Component;
 import eu.etaxonomy.cdm.io.common.DefaultImportState;
 import eu.etaxonomy.cdm.io.operation.config.CacheUpdaterConfigurator;
 import eu.etaxonomy.cdm.model.agent.AgentBase;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.FeatureTree;
 import eu.etaxonomy.cdm.model.media.Media;
@@ -21,6 +19,8 @@ import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.strategy.cache.taxon.TaxonBaseShortSecCacheStrategy;
 
 @Component

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pilotOutputHtml/PilotOutputDescriptionExporter.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pilotOutputHtml/PilotOutputDescriptionExporter.java
index a3b1af2b1a2d9b14e7ce714c5ef4166b66f66cf8..96b8074a35962faea7ca344636fe4207db3c06d1 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pilotOutputHtml/PilotOutputDescriptionExporter.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pilotOutputHtml/PilotOutputDescriptionExporter.java
@@ -25,13 +25,13 @@ import eu.etaxonomy.cdm.io.common.IExportConfigurator;
 import eu.etaxonomy.cdm.io.common.mapping.out.IExportTransformer;\r
 import eu.etaxonomy.cdm.io.sdd.out.SDDDataSet;\r
 import eu.etaxonomy.cdm.model.agent.AgentBase;\r
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.name.TaxonName;\r
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;\r
 import eu.etaxonomy.cdm.model.reference.Reference;\r
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;\r
 \r
 /**\r
  * @author h.fradin (from a.babadshanjan)\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pilotOutputHtml/PilotOutputDocumentBuilder.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pilotOutputHtml/PilotOutputDocumentBuilder.java
index e587cfdea68495b1e030afc009db445e49415722..890070a1c79145cdff6e3925de9da6d16b01007a 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pilotOutputHtml/PilotOutputDocumentBuilder.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pilotOutputHtml/PilotOutputDocumentBuilder.java
@@ -20,7 +20,6 @@ import org.apache.log4j.Logger;
 \r
 import eu.etaxonomy.cdm.io.jaxb.CdmMarshallerListener;\r
 import eu.etaxonomy.cdm.io.sdd.out.SDDDataSet;\r
-import eu.etaxonomy.cdm.model.common.Representation;\r
 import eu.etaxonomy.cdm.model.description.CategoricalData;\r
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;\r
 import eu.etaxonomy.cdm.model.description.Feature;\r
@@ -33,6 +32,7 @@ import eu.etaxonomy.cdm.model.description.TextData;
 import eu.etaxonomy.cdm.model.name.TaxonName;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
+import eu.etaxonomy.cdm.model.term.Representation;\r
 \r
 /**\r
  * Writes the SDD XML file.\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pilotOutputHtml/PilotOutputExporter.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pilotOutputHtml/PilotOutputExporter.java
index 7e78fda1fa4f4d7f4c6956b0b1e0a1a223a34763..4eaad8b83968d260e982b6d0d386e5e4e2ed58a0 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pilotOutputHtml/PilotOutputExporter.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pilotOutputHtml/PilotOutputExporter.java
@@ -25,13 +25,13 @@ import eu.etaxonomy.cdm.io.common.IExportConfigurator;
 import eu.etaxonomy.cdm.io.common.mapping.out.IExportTransformer;\r
 import eu.etaxonomy.cdm.io.sdd.out.SDDDataSet;\r
 import eu.etaxonomy.cdm.model.agent.AgentBase;\r
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.name.TaxonName;\r
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;\r
 import eu.etaxonomy.cdm.model.reference.Reference;\r
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;\r
 \r
 /**\r
  * @author h.fradin (from a.babadshanjan)\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/ikeyplus/IkeyPlusImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/ikeyplus/IkeyPlusImport.java
index 96daf2c0c9cddc8a5077a50deae348743791a853..7bd10905d54affdbb459a5363062f80243ccbb9a 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/ikeyplus/IkeyPlusImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/ikeyplus/IkeyPlusImport.java
@@ -21,8 +21,6 @@ import org.springframework.stereotype.Component;
 
 import eu.etaxonomy.cdm.common.CdmUtils;
 import eu.etaxonomy.cdm.io.common.CdmImportBase;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.description.KeyStatement;
 import eu.etaxonomy.cdm.model.description.PolytomousKey;
@@ -30,6 +28,8 @@ import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
 import eu.etaxonomy.cdm.model.name.INonViralName;
 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import fr.lis.ikeyplus.IO.SDDSaxParser;
 import fr.lis.ikeyplus.model.DataSet;
 import fr.lis.ikeyplus.model.ICharacter;

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/in/SDDImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/in/SDDImport.java
index 7c5c83ccdf6ec42054827f6da5581785960e6ec4..87bc704abfffe6817610210388664421fe1d3ced 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/in/SDDImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/in/SDDImport.java
@@ -44,8 +44,6 @@ import eu.etaxonomy.cdm.model.agent.Team;
 import eu.etaxonomy.cdm.model.common.Annotation;\r
 import eu.etaxonomy.cdm.model.common.AnnotationType;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
-import eu.etaxonomy.cdm.model.common.DefinedTerm;\r
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;\r
 import eu.etaxonomy.cdm.model.common.IdentifiableSource;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
@@ -53,10 +51,6 @@ import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.Marker;\r
 import eu.etaxonomy.cdm.model.common.MarkerType;\r
 import eu.etaxonomy.cdm.model.common.OriginalSourceType;\r
-import eu.etaxonomy.cdm.model.common.Representation;\r
-import eu.etaxonomy.cdm.model.common.TermBase;\r
-import eu.etaxonomy.cdm.model.common.TermType;\r
-import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
 import eu.etaxonomy.cdm.model.common.VersionableEntity;\r
 import eu.etaxonomy.cdm.model.description.CategoricalData;\r
 import eu.etaxonomy.cdm.model.description.DescriptiveDataSet;\r
@@ -89,6 +83,12 @@ import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;\r
+import eu.etaxonomy.cdm.model.term.DefinedTerm;\r
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;\r
+import eu.etaxonomy.cdm.model.term.Representation;\r
+import eu.etaxonomy.cdm.model.term.TermBase;\r
+import eu.etaxonomy.cdm.model.term.TermType;\r
+import eu.etaxonomy.cdm.model.term.TermVocabulary;\r
 \r
 /**\r
  * @author h.fradin\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDCdmExporter.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDCdmExporter.java
index 533aab5b720eef8ee5b2c3644529f63ea409c63f..6f3baf0ef3b605eb6dccf835110392b7febb6cce 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDCdmExporter.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDCdmExporter.java
@@ -30,13 +30,13 @@ import eu.etaxonomy.cdm.io.common.ICdmExport;
 import eu.etaxonomy.cdm.io.common.IExportConfigurator;\r
 import eu.etaxonomy.cdm.io.common.mapping.out.IExportTransformer;\r
 import eu.etaxonomy.cdm.model.agent.AgentBase;\r
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.name.TaxonName;\r
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;\r
 import eu.etaxonomy.cdm.model.reference.Reference;\r
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;\r
 \r
 /**\r
  * @author h.fradin (from a.babadshanjan)\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDDataSet.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDDataSet.java
index d14e1a79cbb862ae26bef04b1c8de992e0425eec..a179ef0a8752bc439f2371414cb6f15f2d2e41d9 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDDataSet.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDDataSet.java
@@ -31,8 +31,6 @@ import eu.etaxonomy.cdm.model.agent.InstitutionalMembership;
 import eu.etaxonomy.cdm.model.agent.Person;\r
 import eu.etaxonomy.cdm.model.agent.Team;\r
 import eu.etaxonomy.cdm.model.common.AnnotationType;\r
-import eu.etaxonomy.cdm.model.common.DefinedTerm;\r
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.common.ExtensionType;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
 import eu.etaxonomy.cdm.model.common.LanguageString;\r
@@ -40,9 +38,7 @@ import eu.etaxonomy.cdm.model.common.LanguageStringBase;
 import eu.etaxonomy.cdm.model.common.MarkerType;\r
 import eu.etaxonomy.cdm.model.common.ReferencedEntityBase;\r
 import eu.etaxonomy.cdm.model.common.RelationshipBase;\r
-import eu.etaxonomy.cdm.model.common.Representation;\r
 import eu.etaxonomy.cdm.model.common.SourcedEntityBase;\r
-import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
 import eu.etaxonomy.cdm.model.common.VersionableEntity;\r
 import eu.etaxonomy.cdm.model.description.Feature;\r
 import eu.etaxonomy.cdm.model.description.FeatureNode;\r
@@ -83,6 +79,10 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;\r
+import eu.etaxonomy.cdm.model.term.DefinedTerm;\r
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;\r
+import eu.etaxonomy.cdm.model.term.Representation;\r
+import eu.etaxonomy.cdm.model.term.TermVocabulary;\r
 \r
 /**\r
  * @author a.babadshanjan\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDDocumentBuilder.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDDocumentBuilder.java
index 2191cb62627a0be3702f062ed49fafde0b5212b8..398272562c3a04a7b95d688a2dfb95d6828045a1 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDDocumentBuilder.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDDocumentBuilder.java
@@ -44,16 +44,11 @@ import eu.etaxonomy.cdm.model.agent.Team;
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;\r
 import eu.etaxonomy.cdm.model.common.Annotation;\r
 import eu.etaxonomy.cdm.model.common.AnnotationType;\r
-import eu.etaxonomy.cdm.model.common.DefinedTerm;\r
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;\r
 import eu.etaxonomy.cdm.model.common.IdentifiableSource;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
 import eu.etaxonomy.cdm.model.common.LanguageString;\r
 import eu.etaxonomy.cdm.model.common.Marker;\r
-import eu.etaxonomy.cdm.model.common.Representation;\r
-import eu.etaxonomy.cdm.model.common.TermBase;\r
-import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
 import eu.etaxonomy.cdm.model.common.VersionableEntity;\r
 import eu.etaxonomy.cdm.model.description.CategoricalData;\r
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;\r
@@ -83,6 +78,11 @@ import eu.etaxonomy.cdm.model.reference.ReferenceType;
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;\r
+import eu.etaxonomy.cdm.model.term.DefinedTerm;\r
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;\r
+import eu.etaxonomy.cdm.model.term.Representation;\r
+import eu.etaxonomy.cdm.model.term.TermBase;\r
+import eu.etaxonomy.cdm.model.term.TermVocabulary;\r
 \r
 /**\r
  * Writes the SDD XML file.\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/SpecimenImportBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/SpecimenImportBase.java
index 8e89132a0637f5deb52ea56062d919122e4bc332..f58e43bff735c38ba5fa7123a71d017580628b8c 100755 (executable)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/SpecimenImportBase.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/SpecimenImportBase.java
@@ -34,7 +34,6 @@ import eu.etaxonomy.cdm.model.agent.Institution;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.Team;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.ISourceable;
 import eu.etaxonomy.cdm.model.common.IdentifiableSource;
 import eu.etaxonomy.cdm.model.common.LanguageString;
@@ -64,6 +63,7 @@ import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.persistence.query.MatchMode;
 import eu.etaxonomy.cdm.strategy.parser.NonViralNameParserImpl;
 import eu.etaxonomy.cdm.strategy.parser.ParserProblem;

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/UnitsGatheringArea.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/UnitsGatheringArea.java
index a258cfe05ad39c02c2647f3145eb3bef9bf2f74d..a662aa27fe7c17a95dddc148d568a1887e2d15d7 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/UnitsGatheringArea.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/UnitsGatheringArea.java
@@ -35,12 +35,12 @@ import eu.etaxonomy.cdm.io.common.ImportConfiguratorBase;
 import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportConfigurator;
 import eu.etaxonomy.cdm.io.specimen.excel.in.SpecimenSynthesysExcelImportConfigurator;
 import eu.etaxonomy.cdm.io.taxonx2013.TaxonXImportConfigurator;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
-import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.location.Country;
 import eu.etaxonomy.cdm.model.location.NamedArea;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.OrderedTermVocabulary;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.persistence.query.MatchMode;
 
 /**

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/UnitsGatheringEvent.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/UnitsGatheringEvent.java
index 03d415fe34df1568c51af2d3ea3c062f1c17ec03..7af27b556ed55052ca644d20e1c1e5a6e7d3b8ac 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/UnitsGatheringEvent.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/UnitsGatheringEvent.java
@@ -26,7 +26,6 @@ import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.Team;
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
 import eu.etaxonomy.cdm.model.common.Annotation;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.TimePeriod;
@@ -34,6 +33,7 @@ import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.location.Point;
 import eu.etaxonomy.cdm.model.location.ReferenceSystem;
 import eu.etaxonomy.cdm.model.occurrence.GatheringEvent;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
 import eu.etaxonomy.cdm.strategy.parser.TimePeriodParser;
 
 /**

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206Import.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206Import.java
index 50bb767b67799dfb6abfbd94637ffe0f86b666fc..ce932ef82cb614015757e6abf606be7d29a7b56c 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206Import.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206Import.java
@@ -44,15 +44,11 @@ import eu.etaxonomy.cdm.model.agent.Team;
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
 import eu.etaxonomy.cdm.model.common.Annotation;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.IdentifiableSource;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.OriginalSourceBase;
 import eu.etaxonomy.cdm.model.common.OriginalSourceType;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.cdm.model.media.Rights;
@@ -70,6 +66,10 @@ import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
 import eu.etaxonomy.cdm.model.taxon.Classification;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.strategy.parser.TimePeriodParser;
 
 /**

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/molecular/AbcdDnaParser.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/molecular/AbcdDnaParser.java
index c8c49bcb20d7e048d078b2b64715b3e493286ba7..f785e5dcfdeffb0128a5f49bac86451cc8a0867f 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/molecular/AbcdDnaParser.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/molecular/AbcdDnaParser.java
@@ -21,13 +21,13 @@ import eu.etaxonomy.cdm.io.specimen.abcd206.in.AbcdParseUtility;
 import eu.etaxonomy.cdm.io.specimen.abcd206.in.AbcdPersonParser;
 import eu.etaxonomy.cdm.io.specimen.abcd206.in.SpecimenImportReport;
 import eu.etaxonomy.cdm.model.agent.AgentBase;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.TimePeriod;
 import eu.etaxonomy.cdm.model.molecular.DnaSample;
 import eu.etaxonomy.cdm.model.occurrence.DerivationEvent;
 import eu.etaxonomy.cdm.model.occurrence.DerivationEventType;
 import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
 import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 
 /**
  * @author pplitzner

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/molecular/AbcdGgbnParser.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/molecular/AbcdGgbnParser.java
index af45611f3bea5924c7f2ea8350fee2981586a565..7e61e4d9dfd57a9547591b5ad363f336e9ea1d2c 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/molecular/AbcdGgbnParser.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/molecular/AbcdGgbnParser.java
@@ -21,8 +21,6 @@ import eu.etaxonomy.cdm.api.application.ICdmRepository;
 import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportState;
 import eu.etaxonomy.cdm.io.specimen.abcd206.in.AbcdParseUtility;
 import eu.etaxonomy.cdm.io.specimen.abcd206.in.SpecimenImportReport;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
-import eu.etaxonomy.cdm.model.common.OrderedTerm;
 import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.cdm.model.molecular.Amplification;
 import eu.etaxonomy.cdm.model.molecular.AmplificationResult;
@@ -35,6 +33,8 @@ import eu.etaxonomy.cdm.model.molecular.SequenceString;
 import eu.etaxonomy.cdm.model.molecular.SingleRead;
 import eu.etaxonomy.cdm.model.molecular.SingleReadAlignment;
 import eu.etaxonomy.cdm.model.reference.Reference;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.OrderedTerm;
 import eu.etaxonomy.cdm.persistence.query.MatchMode;
 
 /**

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenSythesysExcelImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenSythesysExcelImport.java
index 93a1d173073de18a2b7be5fc67de57463a39d931..e7a1f7c644fde58cad7fd7ee69ed6879a2af458b 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenSythesysExcelImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenSythesysExcelImport.java
@@ -38,7 +38,6 @@ import eu.etaxonomy.cdm.model.agent.Institution;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.Team;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.OriginalSourceType;
 import eu.etaxonomy.cdm.model.common.TimePeriod;
@@ -63,6 +62,7 @@ import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
 import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
 import eu.etaxonomy.cdm.strategy.parser.NonViralNameParserImpl;
 import eu.etaxonomy.cdm.strategy.parser.TimePeriodParser;

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/stream/StreamImportBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/stream/StreamImportBase.java
index ec81535359298308dcc821a1c52dd351fcf80b05..6fd9fde4e511b92dd5a89f1aa0318e2f2f3a941b 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/stream/StreamImportBase.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/stream/StreamImportBase.java
@@ -18,12 +18,10 @@ import eu.etaxonomy.cdm.io.common.CdmImportBase;
 import eu.etaxonomy.cdm.io.stream.terms.TermUri;
 import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.ExtensionType;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.MarkerType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;
@@ -34,6 +32,8 @@ import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 /**
  * @author a.mueller

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/stream/StreamImportStateBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/stream/StreamImportStateBase.java
index 8c855e8c7917e17d2a8cb5e4c030ab0484111960..bbeb160d53806cdbd6df5c6a201836462d208d66 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/stream/StreamImportStateBase.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/stream/StreamImportStateBase.java
@@ -27,9 +27,9 @@ import eu.etaxonomy.cdm.io.stream.mapping.MappingEntry;
 import eu.etaxonomy.cdm.io.stream.mapping.IImportMapping.CdmKey;
 import eu.etaxonomy.cdm.io.stream.terms.TermUri;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.reference.Reference;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
 
 /**
  * @author a.mueller

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/stream/StreamPartitioner.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/stream/StreamPartitioner.java
index cb25f52066aea3a8305b2ca7a87d170e3fa62545..de36c638f9edb8766b5f08c1b9b6d7ec0c299e85 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/stream/StreamPartitioner.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/stream/StreamPartitioner.java
@@ -19,9 +19,9 @@ import eu.etaxonomy.cdm.io.stream.mapping.IImportMapping;
 import eu.etaxonomy.cdm.io.stream.mapping.InMemoryMapping;
 import eu.etaxonomy.cdm.io.stream.terms.TermUri;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.reference.Reference;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
 
 
 /**

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx/TaxonXDescriptionImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx/TaxonXDescriptionImport.java
index 6745d8b49ab5370a25abcea5e79d8593062e334e..55db9be1a45c6dc224495dd186b0128ea38682e1 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx/TaxonXDescriptionImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx/TaxonXDescriptionImport.java
@@ -29,13 +29,13 @@ import eu.etaxonomy.cdm.io.common.CdmImportBase;
 import eu.etaxonomy.cdm.io.common.IImportConfigurator;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
 import eu.etaxonomy.cdm.model.common.OriginalSourceType;\r
-import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;\r
 import eu.etaxonomy.cdm.model.description.Feature;\r
 import eu.etaxonomy.cdm.model.description.TaxonDescription;\r
 import eu.etaxonomy.cdm.model.description.TextData;\r
 import eu.etaxonomy.cdm.model.reference.Reference;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
+import eu.etaxonomy.cdm.model.term.TermVocabulary;\r
 import eu.etaxonomy.cdm.strategy.exceptions.UnknownCdmTypeException;\r
 \r
 \r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx2013/TaxonXExtractor.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx2013/TaxonXExtractor.java
index d854e58b8ee09876b98fccc3bad305551abaaa6c..5f3926ea3959f3a98d458a259aea108d201f9522 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx2013/TaxonXExtractor.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx2013/TaxonXExtractor.java
@@ -45,7 +45,6 @@ import eu.etaxonomy.cdm.io.specimen.UnitsGatheringEvent;
 import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.IdentifiableSource;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.TimePeriod;
@@ -71,6 +70,7 @@ import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
 import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
 import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
 import eu.etaxonomy.cdm.strategy.exceptions.UnknownCdmTypeException;
 import eu.etaxonomy.cdm.strategy.parser.ParserProblem;

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/terms/RepresentationCsvImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/terms/RepresentationCsvImport.java
index 2fe74190f3f7f0fcc63c68f9199958484264553e..cf63523712e587e662679e88752634ce21d9828c 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/terms/RepresentationCsvImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/terms/RepresentationCsvImport.java
@@ -22,11 +22,11 @@ import org.springframework.stereotype.Component;
 import au.com.bytecode.opencsv.CSVReader;
 import eu.etaxonomy.cdm.io.common.SimpleImport;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.Representation;
-import eu.etaxonomy.cdm.model.common.TermBase;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.Representation;
+import eu.etaxonomy.cdm.model.term.TermBase;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 /**
  * Imports term representations from a csv file following the format:

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tropicos/in/TropicosNameImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tropicos/in/TropicosNameImport.java
index f2c0bdabe1d5966d1a68bfcead428bae16b08229..fbdbdcb21c8786d772fca0dac32a1ea501c0af59 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tropicos/in/TropicosNameImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tropicos/in/TropicosNameImport.java
@@ -21,7 +21,6 @@ import eu.etaxonomy.cdm.api.service.pager.Pager;
 import eu.etaxonomy.cdm.common.CdmUtils;
 import eu.etaxonomy.cdm.io.csv.in.CsvImportBase;
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.OriginalSourceType;
@@ -38,6 +37,7 @@ import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
 import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.persistence.query.MatchMode;
 import eu.etaxonomy.cdm.strategy.exceptions.UnknownCdmTypeException;
 import eu.etaxonomy.cdm.strategy.parser.NonViralNameParserImpl;

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/wfo/in/WfoAccessClassificationImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/wfo/in/WfoAccessClassificationImport.java
index 899419fe72bed003f5be578b29452fee44e169c3..9eb2467c29ab49ef220180678ea6064e84b352fc 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/wfo/in/WfoAccessClassificationImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/wfo/in/WfoAccessClassificationImport.java
@@ -20,7 +20,6 @@ import eu.etaxonomy.cdm.api.service.dto.IdentifiedEntityDTO;
 import eu.etaxonomy.cdm.api.service.pager.Pager;
 import eu.etaxonomy.cdm.io.csv.in.CsvImportBase;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.TaxonName;
@@ -32,6 +31,7 @@ import eu.etaxonomy.cdm.model.taxon.SynonymType;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.persistence.query.MatchMode;
 
 /**

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/wfo/in/WfoAccessTaxonImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/wfo/in/WfoAccessTaxonImport.java
index 2631a78cca1d7dde9cdbb75591b222b4dda2866e..136d9b0049cfaf1560cabc30221336d5756d6838 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/wfo/in/WfoAccessTaxonImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/wfo/in/WfoAccessTaxonImport.java
@@ -22,7 +22,6 @@ import eu.etaxonomy.cdm.io.csv.in.CsvImportBase;
 import eu.etaxonomy.cdm.io.wfo.in.WfoAccessClassificationImport.TaxStatus;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.VerbatimTimePeriod;
@@ -36,6 +35,7 @@ import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.persistence.query.MatchMode;
 import eu.etaxonomy.cdm.strategy.parser.NonViralNameParserImpl;
 import eu.etaxonomy.cdm.strategy.parser.TimePeriodParser;

diff --git a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/jaxb/SpecimenTest.java b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/jaxb/SpecimenTest.java
index e060389e695225ba331db31e4084e3e4e66fe0db..6bbaec7405beaed4049aa11619f9ce7905a39afc 100644 (file)
--- a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/jaxb/SpecimenTest.java
+++ b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/jaxb/SpecimenTest.java
@@ -20,7 +20,6 @@ import org.junit.Test;
 \r
 import eu.etaxonomy.cdm.model.agent.Institution;\r
 import eu.etaxonomy.cdm.model.agent.Person;\r
-import eu.etaxonomy.cdm.model.common.DefinedTerm;\r
 import eu.etaxonomy.cdm.model.name.TaxonName;\r
 import eu.etaxonomy.cdm.model.occurrence.Collection;\r
 import eu.etaxonomy.cdm.model.occurrence.DerivationEvent;\r
@@ -29,6 +28,7 @@ import eu.etaxonomy.cdm.model.occurrence.DeterminationEvent;
 import eu.etaxonomy.cdm.model.occurrence.FieldUnit;\r
 import eu.etaxonomy.cdm.model.occurrence.GatheringEvent;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
+import eu.etaxonomy.cdm.model.term.DefinedTerm;\r
 \r
 public class SpecimenTest {\r
 \r

diff --git a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/AbcdGgbnImportTest.java b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/AbcdGgbnImportTest.java
index 1e7c8b21ff1bcb45e748ce26a33ed56a3a9bd3ae..ff2c8e96801f1692f6846b7b7b05a7fe024a5e92 100644 (file)
--- a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/AbcdGgbnImportTest.java
+++ b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/AbcdGgbnImportTest.java
@@ -39,7 +39,6 @@ import eu.etaxonomy.cdm.api.service.ITaxonService;
 import eu.etaxonomy.cdm.api.service.ITermService;
 import eu.etaxonomy.cdm.api.service.config.FindOccurrencesConfigurator;
 import eu.etaxonomy.cdm.io.common.CdmApplicationAwareDefaultImport;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.media.MediaUtils;
 import eu.etaxonomy.cdm.model.molecular.Amplification;
 import eu.etaxonomy.cdm.model.molecular.AmplificationResult;
@@ -60,6 +59,7 @@ import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.persistence.query.MatchMode;
 import eu.etaxonomy.cdm.test.integration.CdmTransactionalIntegrationTest;
 import eu.etaxonomy.cdm.test.unitils.CleanSweepInsertLoadStrategy;

diff --git a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/test/integration/TestCdmDbComparator.java b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/test/integration/TestCdmDbComparator.java
index d5170e44a8d23db4dd254d141549012065707fab..f5d43282c21b36c52967157a331a7cf37270333a 100644 (file)
--- a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/test/integration/TestCdmDbComparator.java
+++ b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/test/integration/TestCdmDbComparator.java
@@ -24,14 +24,14 @@ import eu.etaxonomy.cdm.database.ICdmDataSource;
 import eu.etaxonomy.cdm.io.common.Source;
 import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.LanguageString;
-import eu.etaxonomy.cdm.model.common.Representation;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;
 import eu.etaxonomy.cdm.model.name.TypeDesignationBase;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.model.reference.Reference;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.Representation;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 /**
  * @author a.babadshanjan

diff --git a/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml b/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml
deleted file mode 100644 (file)
index 235aee2..0000000
Binary files a/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml and /dev/null differ

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/taxon/TaxonRelationshipFormatter.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/taxon/TaxonRelationshipFormatter.java
index dc3eea4d41e331efd3555b54e6932a688bbe0efc..91ef94ab6e2bbd49a6e8575f40dd2b9d33311855 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/taxon/TaxonRelationshipFormatter.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/taxon/TaxonRelationshipFormatter.java
@@ -20,12 +20,12 @@ import eu.etaxonomy.cdm.model.agent.Team;
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.Representation;
 import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
+import eu.etaxonomy.cdm.model.term.Representation;
 import eu.etaxonomy.cdm.ref.TypedEntityReference;
 import eu.etaxonomy.cdm.strategy.cache.TagEnum;
 import eu.etaxonomy.cdm.strategy.cache.TaggedText;

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/EnumSetUserType.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/EnumSetUserType.java
index 660d9f08ea6d682f9e52f5628eb839b5fbc1d700..d61ac164e9f6ff73f681812501121c190a84ab3e 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/EnumSetUserType.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/EnumSetUserType.java
@@ -28,7 +28,7 @@ import org.hibernate.usertype.ParameterizedType;
 import org.hibernate.usertype.UserType;
 import org.jadira.usertype.dateandtime.shared.spi.AbstractUserType;
 
-import eu.etaxonomy.cdm.model.common.IKeyTerm;
+import eu.etaxonomy.cdm.model.term.IKeyTerm;
 
 /**
  * User type for EnumSet

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/EnumUserType.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/EnumUserType.java
index f0dcf296c326310159446adaab718d93337be1d4..d714932792c5219e46672c8e18ede148ef42661d 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/EnumUserType.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/EnumUserType.java
@@ -24,9 +24,7 @@ import org.hibernate.usertype.ParameterizedType;
 import org.hibernate.usertype.UserType;\r
 import org.jadira.usertype.dateandtime.shared.spi.AbstractUserType;\r
 \r
-import eu.etaxonomy.cdm.model.common.IKeyTerm;\r
 import eu.etaxonomy.cdm.model.common.OriginalSourceType;\r
-import eu.etaxonomy.cdm.model.common.TermType;\r
 import eu.etaxonomy.cdm.model.media.ExternalLinkType;\r
 import eu.etaxonomy.cdm.model.metadata.CdmMetaDataPropertyName;\r
 import eu.etaxonomy.cdm.model.molecular.SequenceDirection;\r
@@ -36,6 +34,8 @@ import eu.etaxonomy.cdm.model.name.RegistrationStatus;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;\r
 import eu.etaxonomy.cdm.model.reference.AuthorityType;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceType;\r
+import eu.etaxonomy.cdm.model.term.IKeyTerm;\r
+import eu.etaxonomy.cdm.model.term.TermType;\r
 \r
 /**\r
  * User type for IEnumTerm\r

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/search/DefinedTermBaseClassBridge.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/search/DefinedTermBaseClassBridge.java
index aa44b0d8bd75256d1f000b8e27bd4929a143210b..ba53021011e6c01929265ff9e2d8113a599c190d 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/search/DefinedTermBaseClassBridge.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/search/DefinedTermBaseClassBridge.java
@@ -17,8 +17,8 @@ import org.apache.lucene.document.TextField;
 import org.hibernate.search.bridge.LuceneOptions;
 import org.hibernate.search.bridge.ParameterizedBridge;
 
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
-import eu.etaxonomy.cdm.model.common.Representation;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.Representation;
 
 /**
  * @author Andreas Kohlbecker

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Institution.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Institution.java
index d9d0834645986f5e375e7e7401b44e2067f8ab38..eca21a447c903657a535bd62c1eab93df4fc5952 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Institution.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Institution.java
@@ -35,7 +35,7 @@ import org.hibernate.envers.Audited;
 import org.hibernate.search.annotations.Field;
 import org.springframework.beans.factory.annotation.Configurable;
 
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.strategy.cache.agent.InstitutionDefaultCacheStrategy;
 import eu.etaxonomy.cdm.strategy.cache.common.IIdentifiableEntityCacheStrategy;
 
@@ -126,7 +126,7 @@ public class Institution extends AgentBase<IIdentifiableEntityCacheStrategy<Inst
        /**
         * Returns the set of institution types (categories)
         * used to describe or circumscribe <i>this</i> institution's activities.
-        * Institution types are items of a controlled {@link eu.etaxonomy.cdm.model.common.TermVocabulary vocabulary}.
+        * Institution types are items of a controlled {@link eu.etaxonomy.cdm.model.term.TermVocabulary vocabulary}.
         *
         * @return      the set of institution types
         */
@@ -138,7 +138,7 @@ public class Institution extends AgentBase<IIdentifiableEntityCacheStrategy<Inst
        }
 
        /**
-        * Adds a new institutional type (from the corresponding {@link eu.etaxonomy.cdm.model.common.TermVocabulary vocabulary})
+        * Adds a new institutional type (from the corresponding {@link eu.etaxonomy.cdm.model.term.TermVocabulary vocabulary})
         * to the set of institution types of <i>this</i> institution.
         *
         * @param  t  any type of institution

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Annotation.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Annotation.java
index c888c17a8343107183751775c6cf16d36de4cb2f..2542cb39cf40bcc1e0abf46f887f21dea69645f0 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Annotation.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Annotation.java
@@ -186,10 +186,6 @@ public class Annotation extends LanguageStringBase implements Cloneable, IIntext
 
 // ***************************** TO STRING ***********************************
 
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.cdm.model.common.CdmBase#toString()
-        */
        @Override
        public String toString() {
                if (StringUtils.isNotBlank(this.text)){
@@ -217,7 +213,7 @@ public class Annotation extends LanguageStringBase implements Cloneable, IIntext
                        //do nothing
                }
                //IntextReferences
-               result.intextReferences = new HashSet<IntextReference>();
+               result.intextReferences = new HashSet<>();
                for (IntextReference intextReference : getIntextReferences()){
                        IntextReference newIntextReference = (IntextReference)intextReference.clone();
                        result.addIntextReference(newIntextReference);

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/AnnotationType.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/AnnotationType.java
index fdad6beb53b652e6c8adabbc41e2150a59ae9b7b..02b939b41654a666fadd71a84c4ca350f4c3d553 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/AnnotationType.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/AnnotationType.java
@@ -23,6 +23,10 @@ import javax.xml.bind.annotation.XmlType;
 import org.apache.log4j.Logger;
 import org.hibernate.envers.Audited;
 
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
+
 /**
  * Annotation types ...
  * @author a.mueller
@@ -33,7 +37,7 @@ import org.hibernate.envers.Audited;
 @XmlRootElement(name = "AnnotationType")
 @Entity
 //@Indexed disabled to reduce clutter in indexes, since this type is not used by any search
-//@Indexed(index = "eu.etaxonomy.cdm.model.common.DefinedTermBase")
+//@Indexed(index = "eu.etaxonomy.cdm.model.term.DefinedTermBase")
 @Audited
 public class AnnotationType extends DefinedTermBase<AnnotationType> {
        private static final long serialVersionUID = 49629121282854575L;

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/ExtensionType.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/ExtensionType.java
index 664aaad1324fca9199b3a1ef56fb555e69e50744..6785cc5ac87ddb06752f9f308b7934eda2c2243a 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/ExtensionType.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/ExtensionType.java
@@ -23,6 +23,10 @@ import javax.xml.bind.annotation.XmlType;
 import org.apache.log4j.Logger;
 import org.hibernate.envers.Audited;
 
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
+
 
 /**
  * Extension types similar to dynamically defined attributes. These are not data
@@ -35,7 +39,7 @@ import org.hibernate.envers.Audited;
 @XmlType(name = "ExtensionType")
 @Entity
 //@Indexed disabled to reduce clutter in indexes, since this type is not used by any search
-//@Indexed(index = "eu.etaxonomy.cdm.model.common.DefinedTermBase")
+//@Indexed(index = "eu.etaxonomy.cdm.model.term.DefinedTermBase")
 @Audited
 public class ExtensionType extends DefinedTermBase<ExtensionType> {
        private static final long serialVersionUID = -7761963794004133427L;
@@ -106,10 +110,6 @@ public class ExtensionType extends DefinedTermBase<ExtensionType> {
 
 //************************** METHODS *******************************************************/
 
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.cdm.model.common.DefinedTermBase#resetTerms()
-        */
        @Override
        public void resetTerms(){
                termMap = null;

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Group.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Group.java
index 9b0a3e80d0dd6a582273c627004d9c20adeae027..bc6507bf0b2d53a7defd4729af7a4607c7423d41 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Group.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Group.java
@@ -152,7 +152,7 @@ public class Group extends CdmBase {
      * a new instance that differs only slightly from <i>this</i> group by
      * modifying only some of the attributes.
      *
-     * @see eu.etaxonomy.cdm.model.common.TermBase#clone()
+     * @see eu.etaxonomy.cdm.model.term.TermBase#clone()
      * @see java.lang.Object#clone()
      */
     @Override

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IIdentifiableEntity.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IIdentifiableEntity.java
index de3f0fb32ee4df74333dd4e89c4dba470010e9da..269ee4e8bbc32d8e8506f2cc30c541e7011a952a 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IIdentifiableEntity.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IIdentifiableEntity.java
@@ -13,6 +13,7 @@ import java.util.List;
 import java.util.Set;
 
 import eu.etaxonomy.cdm.model.media.Rights;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 
 public interface IIdentifiableEntity extends ISourceable<IdentifiableSource>, IAnnotatableEntity{
 

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IdentifiableEntity.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IdentifiableEntity.java
index 03ca7758347ebce0d16d9e95f7ff17d9ebe61dcb..9244115f9f3641cb784b5a87c7ec74a31acfd275 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IdentifiableEntity.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IdentifiableEntity.java
@@ -55,6 +55,7 @@ import eu.etaxonomy.cdm.jaxb.FormattedTextAdapter;
 import eu.etaxonomy.cdm.jaxb.LSIDAdapter;
 import eu.etaxonomy.cdm.model.media.Rights;
 import eu.etaxonomy.cdm.model.reference.Reference;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.strategy.cache.common.IIdentifiableEntityCacheStrategy;
 import eu.etaxonomy.cdm.strategy.match.Match;
 import eu.etaxonomy.cdm.strategy.match.Match.ReplaceMode;

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Identifier.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Identifier.java
index f9b5fffac5b8deb173dbb2c73adcb46476746a41..51f1704803944460975f68a7f71a047f29d7bc47 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Identifier.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Identifier.java
@@ -26,6 +26,8 @@ import org.apache.log4j.Logger;
 import org.hibernate.envers.Audited;
 import org.hibernate.search.annotations.Field;
 
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.TermType;
 import eu.etaxonomy.cdm.validation.annotation.NullOrNotEmpty;
 
 /**

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Language.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Language.java
index 47c070f84a1389fe6b25066ab2efbe05b4095bbc..6b43f9ed470bc4df080ec238a63e00b3af279248 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Language.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Language.java
@@ -30,6 +30,10 @@ import org.hibernate.envers.Audited;
 
 import au.com.bytecode.opencsv.CSVWriter;
 import eu.etaxonomy.cdm.common.CdmUtils;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.Representation;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 /**
  * list of languages according to current internet best practices as given by IANA
@@ -43,7 +47,7 @@ import eu.etaxonomy.cdm.common.CdmUtils;
 @XmlRootElement(name = "Language")
 @Entity
 //@Indexed disabled to reduce clutter in indexes, since this type is not used by any search
-//@Indexed(index = "eu.etaxonomy.cdm.model.common.DefinedTermBase")
+//@Indexed(index = "eu.etaxonomy.cdm.model.term.DefinedTermBase")
 @Audited
 public class Language extends DefinedTermBase<Language> {
     private static final long serialVersionUID = -5030610079904074217L;

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/MarkerType.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/MarkerType.java
index 83507cdd3d1a60e1562fb9ba96205be416b165b4..f6e44e911d4bd7b9e15ed5014ef36de088b7a6f6 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/MarkerType.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/MarkerType.java
@@ -25,6 +25,10 @@ import org.hibernate.envers.Audited;
 import org.hibernate.search.annotations.Analyze;
 import org.hibernate.search.annotations.Field;
 
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
+
 /**
  * Marker types similar to dynamically defined attributes. These  content types
  * like "IS_DOUBTFUL", "COMPLETE"  or specific local flags.
@@ -35,7 +39,7 @@ import org.hibernate.search.annotations.Field;
 @XmlType(name = "MarkerType")
 @Entity
 //@Indexed disabled to reduce clutter in indexes, since this type is not used by any search
-//@Indexed(index = "eu.etaxonomy.cdm.model.common.DefinedTermBase")
+//@Indexed(index = "eu.etaxonomy.cdm.model.term.DefinedTermBase")
 @Audited
 public class MarkerType extends DefinedTermBase<MarkerType> {
        private static final long serialVersionUID = -9117424749919907396L;
@@ -106,10 +110,6 @@ public class MarkerType extends DefinedTermBase<MarkerType> {
 
 //***************************** TERMS **************************************/
 
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.cdm.model.common.DefinedTermBase#resetTerms()
-        */
        @Override
        public void resetTerms(){
                termMap = null;

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/MultilanguageText.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/MultilanguageText.java
index a2c7f5d4b046aef82864319d75d96eb31653ed52..f1aff8fa1d044deec755ee853285e7494f9141c0 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/MultilanguageText.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/MultilanguageText.java
@@ -14,8 +14,6 @@ import java.util.List;
 
 import org.apache.log4j.Logger;
 
-import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
-
 /**
  * @author m.doering
  * Special array that takes care that all LanguageString elements have a unique language
@@ -49,10 +47,7 @@ public class MultilanguageText
                super();
        }
 
-
-       /**
-        * Constructor
-        */
+//******************* CONSTRUCTOR ****************************************/
        protected MultilanguageText (LanguageString languageString){
                super();
                this.put(languageString);
@@ -62,6 +57,7 @@ public class MultilanguageText
                super(initialCapacity, loadFactor);
        }
 
+//************************ GETTER/SETTER ***********************************/
     @Override
        public String getText(Language language){
                LanguageString languageString = super.get(language);
@@ -93,10 +89,7 @@ public class MultilanguageText
         * Clones <i>this</i> multi-language text. This is a shortcut that enables to
         * create a new instance that differs only slightly from <i>this</i> multi-language text
         * by modifying only some of the attributes.<BR>
-        * This method overrides the clone method from {@link DerivedUnit DerivedUnit}.
         *
-        * @see DerivedUnit#clone()
-        * @see eu.etaxonomy.cdm.model.media.IdentifiableMediaEntity#clone()
         * @see java.lang.Object#clone()
         */
        @Override

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/MultilanguageTextHelper.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/MultilanguageTextHelper.java
index 84796ddb85454799f6c8cca6ed2358a2ccbfabad..58b7b2d307032711bc5efac40fb40144684e9bf6 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/MultilanguageTextHelper.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/MultilanguageTextHelper.java
@@ -23,10 +23,11 @@ import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlSchemaType;\r
 import javax.xml.bind.annotation.XmlType;\r
 \r
+import eu.etaxonomy.cdm.model.term.TermBase;\r
+\r
 /**\r
  * @author a.babadshanjan\r
  * @since 15.09.2008\r
- * @version 1.0\r
  */\r
 @XmlAccessorType(XmlAccessType.FIELD)\r
 @XmlType(name = "MultilanguageTextHelper", propOrder = {\r

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/OriginalSourceType.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/OriginalSourceType.java
index ebfc056846ce5a819dd6bbd3a80e4117af22f780..af7f53233550b53726b909005b78b865f04012a4 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/OriginalSourceType.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/OriginalSourceType.java
@@ -19,6 +19,8 @@ import javax.xml.bind.annotation.XmlEnumValue;
 import org.apache.log4j.Logger;\r
 \r
 import eu.etaxonomy.cdm.model.name.TaxonName;\r
+import eu.etaxonomy.cdm.model.term.EnumeratedTermVoc;\r
+import eu.etaxonomy.cdm.model.term.IEnumTerm;\r
 \r
 \r
 \r

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/RelationshipTermBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/RelationshipTermBase.java
index 4071bfed42c187f42917a6f41052d601bfbf2085..6762791b71ae8665081950fb5cb4bcb958d93750 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/RelationshipTermBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/RelationshipTermBase.java
@@ -45,6 +45,11 @@ import eu.etaxonomy.cdm.model.name.HybridRelationshipType;
 import eu.etaxonomy.cdm.model.name.NameRelationshipType;
 import eu.etaxonomy.cdm.model.taxon.SynonymType;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.OrderedTermBase;
+import eu.etaxonomy.cdm.model.term.Representation;
+import eu.etaxonomy.cdm.model.term.TermBase;
+import eu.etaxonomy.cdm.model.term.TermType;
 
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "RelationshipTermBase", propOrder = {
@@ -272,10 +277,6 @@ public abstract class RelationshipTermBase<T extends RelationshipTermBase<T>>
        }
        //*********************************** CLONE *********************************************************/
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.cdm.model.common.DefinedTermBase#clone()
-        * @see java.lang.Object#clone()
-        */
        @Override
        public Object clone() {
                RelationshipTermBase<?> result = (RelationshipTermBase<?>)super.clone();

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/package-info.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/package-info.java
index 0fdf48aba9b80c93532a093800af7cf62914ba74..910127b9359fa994e6d650dd0b3ae67ea5c99e46 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/package-info.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/package-info.java
@@ -297,4 +297,9 @@ import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.cdm.model.taxon.TaxonNodeAgentRelation;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.OrderedTerm;
+import eu.etaxonomy.cdm.model.term.OrderedTermVocabulary;
+import eu.etaxonomy.cdm.model.term.Representation;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Character.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Character.java
index 7b3400981bb6915e58c2f17ae9bdbdacbaf84363..b062b5ae451c0b161a148dd67714d42708606cb7 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Character.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Character.java
@@ -23,9 +23,9 @@ import org.apache.log4j.Logger;
 import org.hibernate.envers.Audited;
 import org.hibernate.search.annotations.IndexedEmbedded;
 
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.TermType;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.TermType;
 
 /**
  * A subclass of the Feature class that is meant for handling

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionElementBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionElementBase.java
index b199efc451e1be9716233318ffff17c5bdc2142c..574fe4f989514fb1fcc20fc7b43db6c05de86d59 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionElementBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionElementBase.java
@@ -47,7 +47,6 @@ import org.hibernate.search.annotations.IndexedEmbedded;
 
 import eu.etaxonomy.cdm.jaxb.MultilanguageTextAdapter;
 import eu.etaxonomy.cdm.model.common.AnnotatableEntity;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.IMultiLanguageTextHolder;
 import eu.etaxonomy.cdm.model.common.IOriginalSource;
 import eu.etaxonomy.cdm.model.common.ISourceable;
@@ -55,13 +54,14 @@ import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.MultilanguageText;
 import eu.etaxonomy.cdm.model.common.OriginalSourceType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.common.TimePeriod;
 import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.strategy.merge.Merge;
 import eu.etaxonomy.cdm.strategy.merge.MergeMode;
 

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptiveDataSet.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptiveDataSet.java
index f10ebdea5a5398cf4afc870d6ae2e39b1931f43f..fa18096ad674a8f84845ef6c5f2b6cac1b611b86 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptiveDataSet.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptiveDataSet.java
@@ -38,10 +38,10 @@ import org.hibernate.envers.Audited;
 
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.Representation;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+import eu.etaxonomy.cdm.model.term.Representation;
 import eu.etaxonomy.cdm.strategy.cache.description.DescriptiveDataSetDefaultCacheStrategy;
 
 /**

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Feature.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Feature.java
index f72edf461ac8b4c2bb5c861619d14940b023c2c5..2439ae2e79485fbdf7c460e855d6135e1a01b992 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Feature.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Feature.java
@@ -38,16 +38,16 @@ import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
 import org.hibernate.envers.Audited;
 
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.Representation;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.name.HybridRelationshipType;
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
 import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.Representation;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 
 /**
@@ -100,7 +100,7 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
 @XmlRootElement(name = "Feature")
 @Entity
 //@Indexed disabled to reduce clutter in indexes, since this type is not used by any search
-//@Indexed(index = "eu.etaxonomy.cdm.model.common.DefinedTermBase")
+//@Indexed(index = "eu.etaxonomy.cdm.model.term.DefinedTermBase")
 @Audited
 public class Feature extends DefinedTermBase<Feature> {
        private static final long serialVersionUID = 6754598791831848704L;

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/FeatureNode.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/FeatureNode.java
index 21270a5aa635207155d94dc23b7267c4b9f034ec..51c0604427dcd9e711f8ff2650a0710a6e27e23f 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/FeatureNode.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/FeatureNode.java
@@ -46,11 +46,11 @@ import org.hibernate.envers.Audited;
 
 import eu.etaxonomy.cdm.hibernate.HHH_9751_Util;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
-import eu.etaxonomy.cdm.model.common.IHasTermType;
 import eu.etaxonomy.cdm.model.common.ITreeNode;
-import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.common.VersionableEntity;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.IHasTermType;
+import eu.etaxonomy.cdm.model.term.TermType;
 
 /**
  * The class for tree nodes within a {@link FeatureTree feature tree} structure.

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/FeatureTree.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/FeatureTree.java
index 98ae2d6f9f6edf60faf9735c15d8e10d3ceb7613..55169dd9d0c154e57cb291231d438f2077cde124 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/FeatureTree.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/FeatureTree.java
@@ -37,11 +37,11 @@ import org.hibernate.annotations.CascadeType;
 import org.hibernate.annotations.Type;
 import org.hibernate.envers.Audited;
 
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
-import eu.etaxonomy.cdm.model.common.IHasTermType;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
-import eu.etaxonomy.cdm.model.common.Representation;
-import eu.etaxonomy.cdm.model.common.TermType;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.IHasTermType;
+import eu.etaxonomy.cdm.model.term.Representation;
+import eu.etaxonomy.cdm.model.term.TermType;
 import eu.etaxonomy.cdm.strategy.cache.common.IIdentifiableEntityCacheStrategy;
 
 /**
@@ -277,7 +277,7 @@ public class FeatureTree <T extends DefinedTermBase>
         * the new FeatureTree
         *
         *
-        * @see eu.etaxonomy.cdm.model.common.TermBase#clone()
+        * @see eu.etaxonomy.cdm.model.term.TermBase#clone()
         * @see java.lang.Object#clone()
         */
        @Override

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/IIdentificationKey.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/IIdentificationKey.java
index d7636ebb69245ddc7aeb933252d1ec066e77db02..9e91d562bd3e9d2b628396bdeb0a85dbc51a8d68 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/IIdentificationKey.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/IIdentificationKey.java
@@ -11,9 +11,9 @@ package eu.etaxonomy.cdm.model.description;
 \r
 import java.util.Set;\r
 \r
-import eu.etaxonomy.cdm.model.common.DefinedTerm;\r
 import eu.etaxonomy.cdm.model.location.NamedArea;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
+import eu.etaxonomy.cdm.model.term.DefinedTerm;\r
 \r
 /**\r
  * A common interface for all identification keys.\r

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/IModifiable.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/IModifiable.java
index 03eed802fc78fb85520cf5d54c9ae6be0af3f140..6efbe7dfc3c909bb181fb9202bd1af253602561f 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/IModifiable.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/IModifiable.java
@@ -11,8 +11,8 @@ package eu.etaxonomy.cdm.model.description;
 
 import java.util.Set;
 
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.IVersionableEntity;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 
 /**
  * @author n.hoffmann

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/KeyStatement.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/KeyStatement.java
index b94640c887d780ef1bddb82502315e9e1e7ee995..33a0001151d43aab061b4867725b0721c4833e6b 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/KeyStatement.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/KeyStatement.java
@@ -28,8 +28,8 @@ import eu.etaxonomy.cdm.model.common.IMultiLanguageTextHolder;
 import eu.etaxonomy.cdm.model.common.Language;\r
 import eu.etaxonomy.cdm.model.common.LanguageString;\r
 import eu.etaxonomy.cdm.model.common.MultilanguageTextHelper;\r
-import eu.etaxonomy.cdm.model.common.TermBase;\r
 import eu.etaxonomy.cdm.model.common.VersionableEntity;\r
+import eu.etaxonomy.cdm.model.term.TermBase;\r
 \r
 /**\r
  * This class represents a statement or a question within a (polytomous) key.\r

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/MeasurementUnit.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/MeasurementUnit.java
index a147ff5a1d06e044e54ffde8ab81d2f719be860c..6190cfb4babfb139b4d42eb9ea2883a7c59899ba 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/MeasurementUnit.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/MeasurementUnit.java
@@ -23,10 +23,10 @@ import javax.xml.bind.annotation.XmlType;
 import org.apache.log4j.Logger;
 import org.hibernate.envers.Audited;
 
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 /**
  * This class represents measurement units such as "centimeter" or "degree
@@ -40,7 +40,7 @@ import eu.etaxonomy.cdm.model.common.TermVocabulary;
 @XmlRootElement(name = "MeasurementUnit")
 @Entity
 //@Indexed disabled to reduce clutter in indexes, since this type is not used by any search
-//@Indexed(index = "eu.etaxonomy.cdm.model.common.DefinedTermBase")
+//@Indexed(index = "eu.etaxonomy.cdm.model.term.DefinedTermBase")
 @Audited
 public class MeasurementUnit extends DefinedTermBase<MeasurementUnit> {
        private static final long serialVersionUID = 4904519152652248312L;

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/MediaKey.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/MediaKey.java
index 52e5f0caa5dcb3160393106c07c57f24ccbf0077..bed5c3a5e67d001b9f5cde9cff10579a1b04e2bc 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/MediaKey.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/MediaKey.java
@@ -32,12 +32,12 @@ import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
 import org.hibernate.envers.Audited;
 
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
-import eu.etaxonomy.cdm.model.common.Representation;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.Representation;
 
 /**
  * The class representing single-access fixed dichotomous or polytomous authored

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/MultiAccessKey.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/MultiAccessKey.java
index 6e7c46fbcf491e493cf9d2c5a50784fa0c43b5a4..7b2a213d9719cb1f1e5bcf5a59ec511cc0f2efb4 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/MultiAccessKey.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/MultiAccessKey.java
@@ -29,10 +29,10 @@ import javax.xml.bind.annotation.XmlType;
 import org.apache.log4j.Logger;
 import org.hibernate.envers.Audited;
 
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 
 /**
  *

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/NaturalLanguageTerm.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/NaturalLanguageTerm.java
index 036f80529b01f9fbc6659dbeb1aafb405060d890..d5af54e45cfb19f5ee322232328ede256f35d01f 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/NaturalLanguageTerm.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/NaturalLanguageTerm.java
@@ -15,18 +15,18 @@ import javax.xml.bind.annotation.XmlType;
 import org.apache.log4j.Logger;
 import org.hibernate.envers.Audited;
 
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.Representation;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.Representation;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 @XmlAccessorType(XmlAccessType.PROPERTY)
 @XmlType(name="NaturalLanguageTerm")
 @XmlRootElement(name = "NaturalLanguageTerm")
 @Entity
 //@Indexed disabled to reduce clutter in indexes, since this type is not used by any search
-//@Indexed(index = "eu.etaxonomy.cdm.model.common.DefinedTermBase")
+//@Indexed(index = "eu.etaxonomy.cdm.model.term.DefinedTermBase")
 @Audited
 public class NaturalLanguageTerm extends DefinedTermBase<NaturalLanguageTerm> {
        private static final long serialVersionUID = 6754598791831848705L;
@@ -74,9 +74,6 @@ public class NaturalLanguageTerm extends DefinedTermBase<NaturalLanguageTerm> {
 
        }
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.cdm.model.common.DefinedTermBase#resetTerms()
-        */
        @Override
        public void resetTerms(){
                termMap = null;

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/PolytomousKey.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/PolytomousKey.java
index 5fefa7b6f5c3923e5cae49fa73a76bccafc3b86d..311653270f92f99253e68b9f109560087254278d 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/PolytomousKey.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/PolytomousKey.java
@@ -36,13 +36,13 @@ import org.hibernate.annotations.CascadeType;
 import org.hibernate.envers.Audited;
 
 import eu.etaxonomy.cdm.common.CdmUtils;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.IIntextReferenceTarget;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.strategy.cache.description.PolytomousKeyDefaultCacheStrategy;
 import eu.etaxonomy.cdm.strategy.generate.PolytomousKeyGenerator;
 

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/PresenceAbsenceTerm.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/PresenceAbsenceTerm.java
index 0d28abfb3a2c0796f584ec4824678c07a4b9ccd6..929cc35fd50b6cdafbf80a80daf2f7ac6e9a6b51 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/PresenceAbsenceTerm.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/PresenceAbsenceTerm.java
@@ -27,13 +27,13 @@ import org.apache.log4j.Logger;
 import org.hibernate.envers.Audited;
 
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.OrderedTermBase;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.OrderedTermBase;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 
 /**
@@ -70,7 +70,7 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
 @XmlRootElement(name = "PresenceAbsenceTerm")
 @Entity
 //@Indexed disabled to reduce clutter in indexes, since this type is not used by any search
-//@Indexed(index = "eu.etaxonomy.cdm.model.common.DefinedTermBase")
+//@Indexed(index = "eu.etaxonomy.cdm.model.term.DefinedTermBase")
 @Audited
 public class PresenceAbsenceTerm extends OrderedTermBase<PresenceAbsenceTerm> {
        private static final long serialVersionUID = 1036807546935584396L;

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/QuantitativeData.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/QuantitativeData.java
index 30640526c5e9300fa946fbb233246fdb5924440c..0b61ce620f04e265179ac4f85d1798dc486e84b6 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/QuantitativeData.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/QuantitativeData.java
@@ -35,7 +35,7 @@ import org.hibernate.envers.Audited;
 import org.hibernate.search.annotations.Indexed;
 import org.hibernate.validator.constraints.NotEmpty;
 
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.validation.Level2;
 
 /**

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/State.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/State.java
index 00935cb57f019fc4a3ec67a3ac50d42361947d52..5210ae7df221b0c842b0927639caeffdee8b7ec4 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/State.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/State.java
@@ -24,9 +24,9 @@ import org.apache.log4j.Logger;
 import org.hibernate.envers.Audited;
 
 import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.OrderedTermBase;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
+import eu.etaxonomy.cdm.model.term.OrderedTermBase;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 /**
  * This class represents terms describing different states (like "oval" or
@@ -34,7 +34,6 @@ import eu.etaxonomy.cdm.model.common.TermVocabulary;
  * categorical values (like for instance shapes).
  *
  * @author m.doering
- * @version 1.0
  * @since 08-Nov-2007 13:06:53
  */
 @XmlAccessorType(XmlAccessType.FIELD)
@@ -42,7 +41,7 @@ import eu.etaxonomy.cdm.model.common.TermVocabulary;
 @XmlRootElement(name = "State")
 @Entity
 //@Indexed disabled to reduce clutter in indexes, since this type is not used by any search
-//@Indexed(index = "eu.etaxonomy.cdm.model.common.DefinedTermBase")
+//@Indexed(index = "eu.etaxonomy.cdm.model.term.DefinedTermBase")
 @Audited
 public class State extends OrderedTermBase<State> {
        private static final long serialVersionUID = -4816292463790262516L;
@@ -102,9 +101,6 @@ public class State extends OrderedTermBase<State> {
 
 //************************** METHODS ********************************
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.cdm.model.common.DefinedTermBase#resetTerms()
-        */
        @Override
        public void resetTerms(){
                termMap = null;
@@ -113,7 +109,7 @@ public class State extends OrderedTermBase<State> {
 
        @Override
        protected void setDefaultTerms(TermVocabulary<State> termVocabulary){
-               termMap = new HashMap<UUID, State>();
+               termMap = new HashMap<>();
                for (State term : termVocabulary.getTerms()){
                        termMap.put(term.getUuid(), term);
                }

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/StateData.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/StateData.java
index 93d302a8d6794ee809284beb686fc5f99a739d78..f2fdcf7e93688ff3fcf93c7853ef90617f84886d 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/StateData.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/StateData.java
@@ -41,14 +41,14 @@ import org.hibernate.search.annotations.IndexedEmbedded;
 
 import eu.etaxonomy.cdm.hibernate.search.MultilanguageTextFieldBridge;
 import eu.etaxonomy.cdm.jaxb.MultilanguageTextAdapter;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.IMultiLanguageTextHolder;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.MultilanguageText;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.common.VersionableEntity;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 /**
  * This class represents the assignment of values ({@link State state terms}) to {@link Feature features}

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/StatisticalMeasure.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/StatisticalMeasure.java
index 2c693fc9c7fa079d7e1798e6654661bc294be53f..eb1b04f0e4920c36725518ca1beabb49c71d352a 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/StatisticalMeasure.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/StatisticalMeasure.java
@@ -22,10 +22,10 @@ import javax.xml.bind.annotation.XmlType;
 import org.apache.log4j.Logger;
 import org.hibernate.envers.Audited;
 
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 /**
 /**
@@ -41,7 +41,7 @@ import eu.etaxonomy.cdm.model.common.TermVocabulary;
 @XmlRootElement(name = "StatisticalMeasure")
 @Entity
 //@Indexed disabled to reduce clutter in indexes, since this type is not used by any search
-//@Indexed(index = "eu.etaxonomy.cdm.model.common.DefinedTermBase")
+//@Indexed(index = "eu.etaxonomy.cdm.model.term.DefinedTermBase")
 @Audited
 public class StatisticalMeasure extends DefinedTermBase<StatisticalMeasure> {
        private static final long serialVersionUID = 9168097283660941430L;
@@ -109,9 +109,6 @@ public class StatisticalMeasure extends DefinedTermBase<StatisticalMeasure> {
 
 //************************** METHODS ********************************
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.cdm.model.common.DefinedTermBase#resetTerms()
-        */
        @Override
        public void resetTerms(){
                termMap = null;

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/StatisticalMeasurementValue.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/StatisticalMeasurementValue.java
index 3ff142fb1e78b443a2fd1b82ea1f8fc8ea5439d8..be1847bfaf15ccdaecc096ad095cae09ab7e25dc 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/StatisticalMeasurementValue.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/StatisticalMeasurementValue.java
@@ -31,9 +31,9 @@ import org.hibernate.envers.Audited;
 import org.hibernate.search.annotations.Indexed;\r
 import org.hibernate.search.annotations.IndexedEmbedded;\r
 \r
-import eu.etaxonomy.cdm.model.common.DefinedTerm;\r
-import eu.etaxonomy.cdm.model.common.TermType;\r
 import eu.etaxonomy.cdm.model.common.VersionableEntity;\r
+import eu.etaxonomy.cdm.model.term.DefinedTerm;\r
+import eu.etaxonomy.cdm.model.term.TermType;\r
 \r
 /**\r
  * This class represents the assignment of numerical values to {@link Feature features}\r

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonDescription.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonDescription.java
index 510443d92f5b625d108746d65b9f656bceaa13d6..01192c009f293f6ed09aca1c7b11d40207640b30 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonDescription.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonDescription.java
@@ -37,9 +37,9 @@ import org.springframework.beans.factory.annotation.Configurable;
 
 import eu.etaxonomy.cdm.hibernate.search.NotNullAwareIdBridge;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.strategy.cache.common.IIdentifiableEntityCacheStrategy;
 import eu.etaxonomy.cdm.strategy.cache.description.TaxonDescriptionDefaultCacheStrategy;
 import javafx.stage.Stage;

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TextData.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TextData.java
index 8876bead6528dc80af6926477a61ebd48e99f54a..baa7b6cf6a7b3ea015cf73a1cb897618278cae2a 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TextData.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TextData.java
@@ -46,7 +46,7 @@ import eu.etaxonomy.cdm.model.common.IMultiLanguageTextHolder;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.MultilanguageTextHelper;
-import eu.etaxonomy.cdm.model.common.TermBase;
+import eu.etaxonomy.cdm.model.term.TermBase;
 
 
 /**

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TextFormat.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TextFormat.java
index a6bfe92c922504cb7348029eec93696096aa5d47..e6daa71901f918d398e201fd2d6eaa7f81752f12 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TextFormat.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TextFormat.java
@@ -23,9 +23,9 @@ import javax.xml.bind.annotation.XmlType;
 import org.apache.log4j.Logger;
 import org.hibernate.envers.Audited;
 
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 /**
  * The class representing kinds of formats used for structuring text
@@ -39,7 +39,7 @@ import eu.etaxonomy.cdm.model.common.TermVocabulary;
 @XmlRootElement(name = "TextFormat")
 @Entity
 //@Indexed disabled to reduce clutter in indexes, since this type is not used by any search
-//@Indexed(index = "eu.etaxonomy.cdm.model.common.DefinedTermBase")
+//@Indexed(index = "eu.etaxonomy.cdm.model.term.DefinedTermBase")
 @Audited
 public class TextFormat extends DefinedTermBase<TextFormat> {
        private static final long serialVersionUID = 2063382669537212917L;

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/Country.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/Country.java
index 742a317e6aeda303a9af458cfd412770253e0db7..5099dc77a9bd4fc4a133725df3a69bc316b3d23c 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/Country.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/Country.java
@@ -38,11 +38,11 @@ import org.hibernate.envers.Audited;
 import au.com.bytecode.opencsv.CSVWriter;
 import eu.etaxonomy.cdm.common.CdmUtils;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.Representation;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.Representation;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 /**
  * +/- current ISO codes. year given with each entry
@@ -59,7 +59,7 @@ import eu.etaxonomy.cdm.model.common.TermVocabulary;
 @XmlRootElement(name = "Country")
 @Entity
 //@Indexed disabled to reduce clutter in indexes, since this type is not used by any search
-//@Indexed(index = "eu.etaxonomy.cdm.model.common.DefinedTermBase")
+//@Indexed(index = "eu.etaxonomy.cdm.model.term.DefinedTermBase")
 @Audited
 public class Country extends NamedArea {
        private static final long serialVersionUID = -6791671976199722843L;
@@ -734,18 +734,12 @@ public class Country extends NamedArea {
                return (Country)termMap.get(uuid);
        }
 
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.cdm.model.common.DefinedTermBase#resetTerms()
-        */
        @Override
        public void resetTerms(){
                termMap = null;
                labelMap = null;
        }
 
-
-
        @Override
        protected void setDefaultTerms(TermVocabulary<NamedArea> termVocabulary) {
                initMaps();

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/NamedArea.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/NamedArea.java
index 9649542b15d5d7d281eacb02f43437a2d66b7b7b..563ceb4868c06c54ff1d109e39e884707cd643f2 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/NamedArea.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/NamedArea.java
@@ -46,15 +46,15 @@ import eu.etaxonomy.cdm.common.CdmUtils;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.hibernate.search.DefinedTermBaseClassBridge;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.OrderedTermBase;
-import eu.etaxonomy.cdm.model.common.Representation;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.common.TimePeriod;
 import eu.etaxonomy.cdm.model.media.Media;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.OrderedTermBase;
+import eu.etaxonomy.cdm.model.term.Representation;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 /**
  * @author m.doering
@@ -79,7 +79,7 @@ import eu.etaxonomy.cdm.model.media.Media;
 })
 @Entity
 //@Indexed disabled to reduce clutter in indexes, since this type is not used by any search
-//@Indexed(index = "eu.etaxonomy.cdm.model.common.DefinedTermBase")
+//@Indexed(index = "eu.etaxonomy.cdm.model.term.DefinedTermBase")
 @Audited
 @ClassBridge(impl=DefinedTermBaseClassBridge.class, params={
     @Parameter(name="includeParentTerms", value="true")
@@ -851,7 +851,7 @@ public class NamedArea extends OrderedTermBase<NamedArea> implements Cloneable {
      * a new instance that differs only slightly from <i>this</i> NamedArea by
      * modifying only some of the attributes.
      *
-     * @see eu.etaxonomy.cdm.model.common.OrderedTermBase#clone()
+     * @see eu.etaxonomy.cdm.model.term.OrderedTermBase#clone()
      * @see java.lang.Object#clone()
      */
     @Override

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/NamedAreaLevel.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/NamedAreaLevel.java
index a2187afd6187e085f1943601759f89300b495b97..7bcc60414abeb71fb014e35e429cec9975d78c55 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/NamedAreaLevel.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/NamedAreaLevel.java
@@ -22,9 +22,9 @@ import javax.xml.bind.annotation.XmlType;
 import org.apache.log4j.Logger;
 import org.hibernate.envers.Audited;
 
-import eu.etaxonomy.cdm.model.common.OrderedTermBase;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
+import eu.etaxonomy.cdm.model.term.OrderedTermBase;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 /**
  * Controlled vocabulary to differentiate levels of areas such as province, state,
@@ -37,7 +37,7 @@ import eu.etaxonomy.cdm.model.common.TermVocabulary;
 @XmlRootElement(name = "NamedAreaLevel")
 @Entity
 //@Indexed disabled to reduce clutter in indexes, since this type is not used by any search
-//@Indexed(index = "eu.etaxonomy.cdm.model.common.DefinedTermBase")
+//@Indexed(index = "eu.etaxonomy.cdm.model.term.DefinedTermBase")
 @Audited
 public class NamedAreaLevel extends OrderedTermBase<NamedAreaLevel> {
        private static final long serialVersionUID = -7977901140330659208L;
@@ -180,17 +180,11 @@ public class NamedAreaLevel extends OrderedTermBase<NamedAreaLevel> {
                return result;
        }
 
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.cdm.model.common.DefinedTermBase#resetTerms()
-        */
        @Override
        public void resetTerms(){
                termMap = null;
        }
 
-
-
        @Override
        protected void setDefaultTerms(TermVocabulary<NamedAreaLevel> termVocabulary) {
                termMap = new HashMap<UUID, NamedAreaLevel>();

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/NamedAreaType.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/NamedAreaType.java
index 0baf7839649eff2cb00d7a68826418175665027e..f3ca1b2ac462771202cb678f263bccac7ed420f3 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/NamedAreaType.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/NamedAreaType.java
@@ -23,9 +23,9 @@ import javax.xml.bind.annotation.XmlType;
 import org.apache.log4j.Logger;
 import org.hibernate.envers.Audited;
 
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 /**
  * Controlled vocabulary to differentiate categories of areas
@@ -37,7 +37,7 @@ import eu.etaxonomy.cdm.model.common.TermVocabulary;
 @XmlRootElement(name = "NamedAreaType")
 @Entity
 //@Indexed disabled to reduce clutter in indexes, since this type is not used by any search
-//@Indexed(index = "eu.etaxonomy.cdm.model.common.DefinedTermBase")
+//@Indexed(index = "eu.etaxonomy.cdm.model.term.DefinedTermBase")
 @Audited
 public class NamedAreaType extends DefinedTermBase<NamedAreaType> {
        private static final long serialVersionUID = 8280172429797206548L;
@@ -72,10 +72,6 @@ public class NamedAreaType extends DefinedTermBase<NamedAreaType> {
 
 //************************** METHODS ********************************
 
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.cdm.model.common.DefinedTermBase#resetTerms()
-        */
        @Override
        public void resetTerms(){
                termMap = null;

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/ReferenceSystem.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/ReferenceSystem.java
index 9cdfe7c8d5b221560686ef979b8fa324f4ba22b3..6dc68a606e8a565c49a7aa8f3ca9911d6c77f272 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/ReferenceSystem.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/ReferenceSystem.java
@@ -23,16 +23,16 @@ import javax.xml.bind.annotation.XmlType;
 import org.apache.log4j.Logger;
 import org.hibernate.envers.Audited;
 
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 /**
  * Reference systems for coordinates also according to OGC (Open Geographical
  * Consortium) The list should be extensible at runtime through configuration.
  * This needs to be investigated.
+ *
  * @author m.doering
- * @version 1.0
  * @since 08-Nov-2007 13:06:49
  */
 @XmlAccessorType(XmlAccessType.FIELD)
@@ -40,7 +40,7 @@ import eu.etaxonomy.cdm.model.common.TermVocabulary;
 @XmlRootElement(name = "ReferenceSystem")
 @Entity
 //@Indexed disabled to reduce clutter in indexes, since this type is not used by any search
-//@Indexed(index = "eu.etaxonomy.cdm.model.common.DefinedTermBase")
+//@Indexed(index = "eu.etaxonomy.cdm.model.term.DefinedTermBase")
 @Audited
 public class ReferenceSystem extends DefinedTermBase<ReferenceSystem> {
        private static final long serialVersionUID = -9060720949197749047L;
@@ -88,16 +88,11 @@ public class ReferenceSystem extends DefinedTermBase<ReferenceSystem> {
 
 // ************************************* MTEHODS ***************************************************/
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.cdm.model.common.DefinedTermBase#resetTerms()
-        */
        @Override
        public void resetTerms(){
                termMap = null;
        }
 
-
-
        protected static ReferenceSystem getTermByUuid(UUID uuid){
         if (termMap == null || termMap.isEmpty()){
             return getTermByClassAndUUID(ReferenceSystem.class, uuid);
@@ -124,7 +119,7 @@ public class ReferenceSystem extends DefinedTermBase<ReferenceSystem> {
 
        @Override
        protected void setDefaultTerms(TermVocabulary<ReferenceSystem> termVocabulary){
-               termMap = new HashMap<UUID, ReferenceSystem>();
+               termMap = new HashMap<>();
                for (ReferenceSystem term : termVocabulary.getTerms()){
                        termMap.put(term.getUuid(), term);
                }

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/ExternalLinkType.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/ExternalLinkType.java
index 853c9dbe577d551ce4d5b1f313a7214ad92f7a03..939f081eac3d99e210c0f2fabd448f57ddcbcb3b 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/ExternalLinkType.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/ExternalLinkType.java
@@ -17,8 +17,8 @@ import javax.xml.bind.annotation.XmlEnumValue;
 
 import org.apache.log4j.Logger;
 
-import eu.etaxonomy.cdm.model.common.EnumeratedTermVoc;
-import eu.etaxonomy.cdm.model.common.IEnumTerm;
+import eu.etaxonomy.cdm.model.term.EnumeratedTermVoc;
+import eu.etaxonomy.cdm.model.term.IEnumTerm;
 
 
 /**

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/RightsType.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/RightsType.java
index b3911996120b35e1c0c4c6d1246aa7bfa00aeaec..4369cb0bd318480568a990bcf6c4a22f2e714055 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/RightsType.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/RightsType.java
@@ -22,9 +22,9 @@ import javax.xml.bind.annotation.XmlType;
 import org.apache.log4j.Logger;
 import org.hibernate.envers.Audited;
 
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 /**
  * @author m.doering
@@ -35,7 +35,7 @@ import eu.etaxonomy.cdm.model.common.TermVocabulary;
 @XmlRootElement(name = "RightsType")
 @Entity
 //@Indexed disabled to reduce clutter in indexes, since this type is not used by any search
-//@Indexed(index = "eu.etaxonomy.cdm.model.common.DefinedTermBase")
+//@Indexed(index = "eu.etaxonomy.cdm.model.term.DefinedTermBase")
 @Audited
 public class RightsType extends DefinedTermBase<RightsType> {
        private static final long serialVersionUID = -5823263624000932116L;

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/CdmMetaData.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/CdmMetaData.java
index 35e1636ef847dc5ffbb9cc79ad09dbb7937c7079..1b4b3cb0cb1a6b16b7ec420187b6af291f0db7cc 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/CdmMetaData.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/CdmMetaData.java
@@ -25,9 +25,9 @@ import org.joda.time.DateTime;
 
 import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 /**
  * @author a.mueller

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/CdmMetaDataPropertyName.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/CdmMetaDataPropertyName.java
index 29eb487f694c51456f3797343a094e959f51f0a2..4bcf4cfa7c4b915d6b5a4bfb4198463a35a10c34 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/CdmMetaDataPropertyName.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/CdmMetaDataPropertyName.java
@@ -10,9 +10,9 @@ package eu.etaxonomy.cdm.model.metadata;
 
 import org.apache.log4j.Logger;
 
-import eu.etaxonomy.cdm.model.common.IKeyTerm;
 import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.TermType;
+import eu.etaxonomy.cdm.model.term.IKeyTerm;
+import eu.etaxonomy.cdm.model.term.TermType;
 
 public enum CdmMetaDataPropertyName implements IKeyTerm{
        DB_SCHEMA_VERSION("Schema Version","SCHEMA_VERSION", 0),

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/PreferencePredicate.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/PreferencePredicate.java
index ea5441e29f82baa4f6f4ccf9c059bd7e9d264cda..c7d085ece4c9fa4f4dc964e8ffd6e7d35ce080c1 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/PreferencePredicate.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/PreferencePredicate.java
@@ -11,9 +11,9 @@ package eu.etaxonomy.cdm.model.metadata;
 import java.util.Set;\r
 import java.util.UUID;\r
 \r
-import eu.etaxonomy.cdm.model.common.EnumeratedTermVoc;\r
-import eu.etaxonomy.cdm.model.common.IEnumTerm;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
+import eu.etaxonomy.cdm.model.term.EnumeratedTermVoc;\r
+import eu.etaxonomy.cdm.model.term.IEnumTerm;\r
 \r
 /**\r
  * @author a.mueller\r

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/PreferenceSubjectEnum.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/PreferenceSubjectEnum.java
index 1a68ea4a72a064de1f50bd64224c84b06e36c5bc..7e70971bca21c2f5823cedc7b04b1660cbddc614 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/PreferenceSubjectEnum.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/PreferenceSubjectEnum.java
@@ -11,9 +11,9 @@ package eu.etaxonomy.cdm.model.metadata;
 import java.util.Set;
 import java.util.UUID;
 
-import eu.etaxonomy.cdm.model.common.EnumeratedTermVoc;
-import eu.etaxonomy.cdm.model.common.IEnumTerm;
 import eu.etaxonomy.cdm.model.common.Language;
+import eu.etaxonomy.cdm.model.term.EnumeratedTermVoc;
+import eu.etaxonomy.cdm.model.term.IEnumTerm;
 
 /**
  * UNDER CONSTRUCTION

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/Amplification.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/Amplification.java
index 69987cc6cc23dbbf2c39547d21433ace52f15c1a..57c2dc427f5eec35b592468f73acdda2c6c6374a 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/Amplification.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/Amplification.java
@@ -33,11 +33,11 @@ import org.hibernate.search.annotations.NumericField;
 
 import eu.etaxonomy.cdm.common.CdmUtils;
 import eu.etaxonomy.cdm.model.agent.Institution;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.EventBase;
-import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
 import eu.etaxonomy.cdm.model.occurrence.MaterialOrMethodEvent;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.TermType;
 
 /**
  * The physical process of amplification (also called PCR) extracts and replicates parts of the DNA of

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/AmplificationResult.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/AmplificationResult.java
index 58724443de53d00e3fb00417bb9b6f78e4f9e7f9..8e9b739eb3463535b5ee3d47d4c9442e5269cf04 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/AmplificationResult.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/AmplificationResult.java
@@ -34,11 +34,11 @@ import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.IndexedEmbedded;
 
 import eu.etaxonomy.cdm.model.common.AnnotatableEntity;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.EventBase;
-import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.TermType;
 
 /**
  * The physical process of amplification (also called PCR) extracts and replicates parts of the DNA of

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/Cloning.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/Cloning.java
index 0a7c12912b73e8f0f53a9def6cd7b2778942759d..8aa24b06413633da8b8856d6572138f285dc95d0 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/Cloning.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/Cloning.java
@@ -24,9 +24,9 @@ import org.apache.log4j.Logger;
 import org.hibernate.envers.Audited;
 import org.hibernate.search.annotations.Field;
 
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.EventBase;
 import eu.etaxonomy.cdm.model.occurrence.MaterialOrMethodEvent;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 
 /**
  * Cloning is a method used in {@link Amplification DNA amplification} for multiplying the base

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/DnaQuality.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/DnaQuality.java
index 4e99789533166dd14d096c4a5be932673f2515a9..4643f70d0b4573783ea0c08028306f894392c8ec 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/DnaQuality.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/DnaQuality.java
@@ -34,12 +34,12 @@ import org.joda.time.DateTime;
 
 import eu.etaxonomy.cdm.hibernate.search.DateTimeBridge;
 import eu.etaxonomy.cdm.jaxb.DateTimeAdapter;
-import eu.etaxonomy.cdm.model.common.OrderedTerm;
 import eu.etaxonomy.cdm.model.common.VersionableEntity;
 import eu.etaxonomy.cdm.model.description.MeasurementUnit;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
 import eu.etaxonomy.cdm.model.occurrence.MaterialOrMethodEvent;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
+import eu.etaxonomy.cdm.model.term.OrderedTerm;
 
 /**
  * A DNA Quality describes the quality of a {@link SpecimenOrObservationType#DnaSample}

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/Primer.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/Primer.java
index 0cf5e8d86f3b28136f3f3994472e1dd30a1c444a..911fb4bcbd21f349d2d14d590e2cb738a12415e6 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/Primer.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/Primer.java
@@ -26,8 +26,8 @@ import org.hibernate.annotations.CascadeType;
 import org.hibernate.envers.Audited;
 
 import eu.etaxonomy.cdm.model.common.AnnotatableEntity;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.reference.Reference;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 
 /**
  * A primer is a (short) DNA Sequence used for replication and extraction

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/Sequence.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/Sequence.java
index 578fdfc5f9b2d88501ce48cb3c26ab6e309d350c..09c9d4f2c1488c1f45fc33294365a425df878d99 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/Sequence.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/Sequence.java
@@ -41,10 +41,10 @@ import org.springframework.beans.factory.annotation.Configurable;
 
 import eu.etaxonomy.cdm.common.CdmUtils;
 import eu.etaxonomy.cdm.model.common.AnnotatableEntity;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
-import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.cdm.model.reference.Reference;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.TermType;
 
 /**
  * Alignment of multiple {@link SingleRead single sequences} to a consensus sequence.

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/SequenceDirection.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/SequenceDirection.java
index 8dfedc729bb9b59b11c58b5792110ec08cce1f46..448fb3d622e824e5b1f715d1037c4c1319499d62 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/SequenceDirection.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/SequenceDirection.java
@@ -10,8 +10,8 @@ package eu.etaxonomy.cdm.model.molecular;
 \r
 import java.util.UUID;\r
 \r
-import eu.etaxonomy.cdm.model.common.IKeyTerm;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
+import eu.etaxonomy.cdm.model.term.IKeyTerm;\r
 \r
 /**\r
  * A Sequence Direction defines the direction in which a DNA part was read by a {@link Primer}\r

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/HybridRelationshipType.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/HybridRelationshipType.java
index c9d17e9a91608ddfe9408bf60ab71a51fd728eec..ac725bb9b6c6595c4f1e75d5ed6fa87c48baccdc 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/HybridRelationshipType.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/HybridRelationshipType.java
@@ -24,8 +24,8 @@ import org.hibernate.envers.Audited;
 
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.RelationshipTermBase;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 /**
  * The class representing the categories of {@link HybridRelationship hybrid relationships}
@@ -46,7 +46,6 @@ import eu.etaxonomy.cdm.model.common.TermVocabulary;
  * </ul>
  *
  * @author m.doering
- * @version 1.0
  * @since 08-Nov-2007 13:06:27
  */
 @XmlAccessorType(XmlAccessType.FIELD)
@@ -54,7 +53,7 @@ import eu.etaxonomy.cdm.model.common.TermVocabulary;
 @XmlRootElement(name = "HybridRelationshipType")
 @Entity
 //@Indexed disabled to reduce clutter in indexes, since this type is not used by any search
-//@Indexed(index = "eu.etaxonomy.cdm.model.common.DefinedTermBase")
+//@Indexed(index = "eu.etaxonomy.cdm.model.term.DefinedTermBase")
 @Audited
 public class HybridRelationshipType extends RelationshipTermBase<HybridRelationshipType> {
        private static final long serialVersionUID = 5225908742890437668L;
@@ -105,15 +104,11 @@ public class HybridRelationshipType extends RelationshipTermBase<HybridRelations
 
 //************************** METHODS ********************************
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.cdm.model.common.DefinedTermBase#resetTerms()
-        */
        @Override
        public void resetTerms(){
                termMap = null;
        }
 
-
        protected static HybridRelationshipType getTermByUuid(UUID uuid){
         if (termMap == null || termMap.isEmpty()){
             return getTermByClassAndUUID(HybridRelationshipType.class, uuid);
@@ -221,7 +216,7 @@ public class HybridRelationshipType extends RelationshipTermBase<HybridRelations
         * For nomenclature purposes a "major parent" is also a "second parent".
         * Major and minor parent relationships are usually represented in a
         * hybrid formula with a "greater than" symbol (>). It replaces the multiplication
-        * symbol which is generally used for hybrid fromulas.
+        * symbol which is generally used for hybrid formulas.
         *
         * @see #SECOND_PARENT()
         */
@@ -243,9 +238,4 @@ public class HybridRelationshipType extends RelationshipTermBase<HybridRelations
                }
        }
 
-//     @Override
-//     public HybridRelationshipType readCsvLine(Class<HybridRelationshipType> termClass, List<String> csvLine, Map<UUID,DefinedTermBase> terms) {
-//             return super.readCsvLine(termClass, csvLine, terms);
-//     }
-
 }

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NameRelationshipType.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NameRelationshipType.java
index 9cd608f8449e2d871fa5f451ba3b74f45213aec8..4003a67c6fee419fb1ca287662683b5fa4974ffc 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NameRelationshipType.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NameRelationshipType.java
@@ -25,10 +25,10 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.hibernate.envers.Audited;
 
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.RelationshipTermBase;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 /**
  * The class representing the categories of {@link NameRelationship taxon name relationships} between
@@ -59,7 +59,7 @@ import eu.etaxonomy.cdm.model.common.TermVocabulary;
 @XmlType(name = "NameRelationshipType")
 @Entity
 //@Indexed disabled to reduce clutter in indexes, since this type is not used by any search
-//@Indexed(index = "eu.etaxonomy.cdm.model.common.DefinedTermBase")
+//@Indexed(index = "eu.etaxonomy.cdm.model.term.DefinedTermBase")
 @Audited
 public class NameRelationshipType extends RelationshipTermBase<NameRelationshipType> {
        private static final long serialVersionUID = 8504916205254159334L;

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NameTypeDesignationStatus.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NameTypeDesignationStatus.java
index f9bbefb94b1a775c64d511ef664c95eac7871c0f..7da607452df33c1584af3956cd361d05a1143ea4 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NameTypeDesignationStatus.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NameTypeDesignationStatus.java
@@ -22,8 +22,8 @@ import javax.xml.bind.annotation.XmlType;
 import org.apache.log4j.Logger;
 import org.hibernate.envers.Audited;
 
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 /**
  * The terms in this class define the status of a {@link NameTypeDesignation name type designation}.
@@ -35,7 +35,7 @@ import eu.etaxonomy.cdm.model.common.TermVocabulary;
 @XmlType(name = "NameTypeDesignationStatus")
 @Entity
 //@Indexed disabled to reduce clutter in indexes, since this type is not used by any search
-//@Indexed(index = "eu.etaxonomy.cdm.model.common.DefinedTermBase")
+//@Indexed(index = "eu.etaxonomy.cdm.model.term.DefinedTermBase")
 @Audited
 public class NameTypeDesignationStatus extends TypeDesignationStatusBase<NameTypeDesignationStatus> {
        private static final long serialVersionUID = -8801837496688711907L;

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalCode.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalCode.java
index c87e811d6a5594e08cf1b0c89ffd9ed4f52d1786..39bab56dfd4a96dfc114580691ec2a6fe16bddb5 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalCode.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalCode.java
@@ -18,9 +18,9 @@ import javax.xml.bind.annotation.XmlType;
 \r
 import org.apache.log4j.Logger;\r
 \r
-import eu.etaxonomy.cdm.model.common.EnumeratedTermVoc;\r
-import eu.etaxonomy.cdm.model.common.IEnumTerm;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
+import eu.etaxonomy.cdm.model.term.EnumeratedTermVoc;\r
+import eu.etaxonomy.cdm.model.term.IEnumTerm;\r
 \r
 /**\r
  * The class for the five nomenclature codes (ICNB, ICBN, ICNCP, ICZN and ICVCN)\r

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalStatusType.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalStatusType.java
index 92420cca41247276e7f5b61a910a450684b21115..cfc9e242ac8f1e56fbf4f184b21380c1ef59b712 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalStatusType.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalStatusType.java
@@ -26,12 +26,12 @@ import javax.xml.bind.annotation.XmlType;
 import org.apache.log4j.Logger;
 import org.hibernate.envers.Audited;
 
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.OrderedTermBase;
-import eu.etaxonomy.cdm.model.common.Representation;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.OrderedTermBase;
+import eu.etaxonomy.cdm.model.term.Representation;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.strategy.exceptions.UnknownCdmTypeException;
 
 /**
@@ -61,7 +61,7 @@ import eu.etaxonomy.cdm.strategy.exceptions.UnknownCdmTypeException;
 @XmlType(name = "NomenclaturalStatusType")
 @Entity
 //@Indexed disabled to reduce clutter in indexes, since this type is not used by any search
-//@Indexed(index = "eu.etaxonomy.cdm.model.common.DefinedTermBase")
+//@Indexed(index = "eu.etaxonomy.cdm.model.term.DefinedTermBase")
 @Audited
 public class NomenclaturalStatusType extends OrderedTermBase<NomenclaturalStatusType> {
 
@@ -205,7 +205,7 @@ public class NomenclaturalStatusType extends OrderedTermBase<NomenclaturalStatus
         *
         * @see  #VALID()
         * @see  #isIllegitimateType()
-        * @see  eu.etaxonomy.cdm.model.common.DefinedTermBase#getKindOf()
+        * @see  eu.etaxonomy.cdm.model.term.DefinedTermBase#getKindOf()
         */
        @Transient
        public boolean isInvalidType(){
@@ -234,7 +234,7 @@ public class NomenclaturalStatusType extends OrderedTermBase<NomenclaturalStatus
         *
         * @see  #isInvalidType()
         * @see  #isIllegitimateType()
-        * @see  eu.etaxonomy.cdm.model.common.DefinedTermBase#getKindOf()
+        * @see  eu.etaxonomy.cdm.model.term.DefinedTermBase#getKindOf()
         */
        @Transient
        public boolean isLegitimateType(){
@@ -268,7 +268,7 @@ public class NomenclaturalStatusType extends OrderedTermBase<NomenclaturalStatus
         * @see  #ILLEGITIMATE()
         * @see  #CONSERVED()
         * @see  #SANCTIONED()
-        * @see  eu.etaxonomy.cdm.model.common.DefinedTermBase#getKindOf()
+        * @see  eu.etaxonomy.cdm.model.term.DefinedTermBase#getKindOf()
         */
        @Transient
        public boolean isIllegitimateType(){
@@ -903,13 +903,13 @@ public class NomenclaturalStatusType extends OrderedTermBase<NomenclaturalStatus
         * Fills <i>this</i> nomenclatural status type with contents (uuid, uri,
         * description text, label and label abbreviation) coming from a csv line.
         * The implicit language for the description text is "latin".
-        * This method overrides the method of {@link eu.etaxonomy.cdm.model.common.DefinedTermBase DefinedTermBase}.
+        * This method overrides the method of {@link eu.etaxonomy.cdm.model.term.DefinedTermBase DefinedTermBase}.
         *
         * @param       csvLine         the (ordered) list of substrings from a csv string
         *                                              to be used to fill <i>this</i> nomenclatural status type
         * @see                                 #NomenclaturalStatusType(String, String, String)
         * @see                                 #readCsvLine(List, Language)
-        * @see                                 eu.etaxonomy.cdm.model.common.DefinedTermBase#readCsvLine(List)
+        * @see                                 eu.etaxonomy.cdm.model.term.DefinedTermBase#readCsvLine(List)
         */
 
        @Override
@@ -951,7 +951,6 @@ public class NomenclaturalStatusType extends OrderedTermBase<NomenclaturalStatus
 
        public static void initDefaultTerms() {
         TermVocabulary<NomenclaturalStatusType> vocabulary = getTermByUuid(uuidDoubtful).getVocabulary();
-
         (new NomenclaturalStatusType()).setDefaultTerms(vocabulary);
     }
 
@@ -986,8 +985,6 @@ public class NomenclaturalStatusType extends OrderedTermBase<NomenclaturalStatus
 
        }
 
-
-
        /**
         * NomenclaturalStatusType should always be shown in latin, therefore the only existing representation
         * is the latin one. In case we pass in another Language to this method it will return a <code>null</code> representation.
@@ -1005,6 +1002,4 @@ public class NomenclaturalStatusType extends OrderedTermBase<NomenclaturalStatus
 
                return representation;
        }
-
-
 }

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/Rank.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/Rank.java
index a90b33c94a28d24a8373d1e97b9e58f7e9f12efc..383dba429d6e6a74afd1f56ecd44d008fab2cb05 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/Rank.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/Rank.java
@@ -28,12 +28,12 @@ import org.hibernate.annotations.Type;
 import org.hibernate.envers.Audited;
 
 import eu.etaxonomy.cdm.common.CdmUtils;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.OrderedTermBase;
-import eu.etaxonomy.cdm.model.common.Representation;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.OrderedTermBase;
+import eu.etaxonomy.cdm.model.term.Representation;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.strategy.exceptions.UnknownCdmTypeException;
 
 /**
@@ -59,7 +59,7 @@ import eu.etaxonomy.cdm.strategy.exceptions.UnknownCdmTypeException;
 @XmlType(name = "Rank")
 @Entity
 //@Indexed disabled to reduce clutter in indexes, since this type is not used by any search
-//@Indexed(index = "eu.etaxonomy.cdm.model.common.DefinedTermBase")
+//@Indexed(index = "eu.etaxonomy.cdm.model.term.DefinedTermBase")
 @Audited
 public class Rank extends OrderedTermBase<Rank> {
     private static final long serialVersionUID = -8648081681348758485L;
@@ -215,9 +215,6 @@ public class Rank extends OrderedTermBase<Rank> {
 
 //********* METHODS **************************************/
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.model.common.DefinedTermBase#resetTerms()
-     */
     @Override
     public void resetTerms(){
         termMap = null;
@@ -1058,7 +1055,7 @@ public class Rank extends OrderedTermBase<Rank> {
      * It is necessary to skip the vocabulary check, otherwise we would have
      * problems in some CacheStrategies, due to uninitialized Vocabularies.
      *
-     * @see eu.etaxonomy.cdm.model.common.OrderedTermBase#compareTo(eu.etaxonomy.cdm.model.common.OrderedTermBase)
+     * @see eu.etaxonomy.cdm.model.term.OrderedTermBase#compareTo(eu.etaxonomy.cdm.model.term.OrderedTermBase)
      */
     @Override
     public int compareTo(Rank orderedTerm) {

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/RankClass.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/RankClass.java
index 278a3d3ba53cf2a9758b3044f2a6eec7f5c19e48..5ffce2c5095adf65a490b3cd108353df37badfb6 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/RankClass.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/RankClass.java
@@ -18,9 +18,9 @@ import javax.xml.bind.annotation.XmlEnumValue;
 \r
 import org.apache.log4j.Logger;\r
 \r
-import eu.etaxonomy.cdm.model.common.EnumeratedTermVoc;\r
-import eu.etaxonomy.cdm.model.common.IEnumTerm;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
+import eu.etaxonomy.cdm.model.term.EnumeratedTermVoc;\r
+import eu.etaxonomy.cdm.model.term.IEnumTerm;\r
 \r
 /**\r
  * The rank class defines the category of ranks a certain rank belongs to. This information is\r

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/RegistrationStatus.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/RegistrationStatus.java
index f286b0153b0e9e449f84e63d2c2932a0da7d7e7b..86a5effd0ebeb9dd809503d2c7a8591e26ec563d 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/RegistrationStatus.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/RegistrationStatus.java
@@ -16,10 +16,10 @@ import javax.xml.bind.annotation.XmlEnumValue;
 
 import org.apache.log4j.Logger;
 
-import eu.etaxonomy.cdm.model.common.EnumeratedTermVoc;
-import eu.etaxonomy.cdm.model.common.IEnumTerm;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
+import eu.etaxonomy.cdm.model.term.EnumeratedTermVoc;
+import eu.etaxonomy.cdm.model.term.IEnumTerm;
 
 /**
  *

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/SpecimenTypeDesignationStatus.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/SpecimenTypeDesignationStatus.java
index d27866b53f5a115cbdb59dae2c872700f373347b..9cc4cc4dae156e4faee9b04d3f03f9c49c39ebe4 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/SpecimenTypeDesignationStatus.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/SpecimenTypeDesignationStatus.java
@@ -25,8 +25,8 @@ import javax.xml.bind.annotation.XmlType;
 import org.apache.log4j.Logger;
 import org.hibernate.envers.Audited;
 
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 /**
  * The class representing status (categories) of {@link SpecimenTypeDesignation specimen type designations}
@@ -54,7 +54,7 @@ import eu.etaxonomy.cdm.model.common.TermVocabulary;
 @XmlType(name = "SpecimenTypeDesignationStatus")
 @Entity
 //@Indexed disabled to reduce clutter in indexes, since this type is not used by any search
-//@Indexed(index = "eu.etaxonomy.cdm.model.common.DefinedTermBase")
+//@Indexed(index = "eu.etaxonomy.cdm.model.term.DefinedTermBase")
 @Audited
 public class SpecimenTypeDesignationStatus extends TypeDesignationStatusBase<SpecimenTypeDesignationStatus> {
        private static final long serialVersionUID = -7918261741824966182L;
@@ -397,11 +397,10 @@ public class SpecimenTypeDesignationStatus extends TypeDesignationStatusBase<Spe
 
        @Override
        protected void setDefaultTerms(TermVocabulary<SpecimenTypeDesignationStatus> termVocabulary) {
-               termMap = new HashMap<UUID, SpecimenTypeDesignationStatus>();
+               termMap = new HashMap<>();
                for (SpecimenTypeDesignationStatus term : termVocabulary.getTerms()){
                        termMap.put(term.getUuid(), term);
                }
-
        }
 
 }

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonName.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonName.java
index ff2d0e180b457d71b072ec046a28b64f0b8a0311..ca24e090088c54bef54aec842b8a62916d14642a 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonName.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonName.java
@@ -66,7 +66,6 @@ import eu.etaxonomy.cdm.common.UTF8;
 import eu.etaxonomy.cdm.model.agent.INomenclaturalAuthor;
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.IIntextReferenceTarget;
 import eu.etaxonomy.cdm.model.common.IParsable;
 import eu.etaxonomy.cdm.model.common.IRelated;
@@ -74,8 +73,6 @@ import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.OriginalSourceType;
 import eu.etaxonomy.cdm.model.common.RelationshipBase;
 import eu.etaxonomy.cdm.model.common.RelationshipBase.Direction;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.description.DescriptionElementSource;
 import eu.etaxonomy.cdm.model.description.IDescribable;
 import eu.etaxonomy.cdm.model.description.TaxonNameDescription;
@@ -85,6 +82,9 @@ import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.strategy.cache.TaggedText;
 import eu.etaxonomy.cdm.strategy.cache.name.CacheUpdate;
 import eu.etaxonomy.cdm.strategy.cache.name.INameCacheStrategy;

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TypeDesignationStatusBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TypeDesignationStatusBase.java
index d3114907f26503ee44b256faf90ac3f7224b9a33..caec93782d3c16bc6aba02c3c7134f2e9206c2b7 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TypeDesignationStatusBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TypeDesignationStatusBase.java
@@ -18,8 +18,8 @@ import javax.xml.bind.annotation.XmlType;
 import org.apache.log4j.Logger;
 import org.hibernate.envers.Audited;
 
-import eu.etaxonomy.cdm.model.common.OrderedTermBase;
-import eu.etaxonomy.cdm.model.common.TermType;
+import eu.etaxonomy.cdm.model.term.OrderedTermBase;
+import eu.etaxonomy.cdm.model.term.TermType;
 
 /**
  * The class representing status (categories) of {@link SpecimenTypeDesignation specimen type designations}
@@ -107,7 +107,7 @@ public abstract class TypeDesignationStatusBase<T extends TypeDesignationStatusB
      *
      * @see  #LECTOTYPE()
      * @see  #HOLOTYPE()
-     * @see  eu.etaxonomy.cdm.model.common.DefinedTermBase#getKindOf()
+     * @see  eu.etaxonomy.cdm.model.term.DefinedTermBase#getKindOf()
      */
     public abstract boolean isLectotype();
 }

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/DerivationEventType.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/DerivationEventType.java
index d9fdd9d7e11d7fa1e88f79e3b207b039b8e0dac3..aab5d8b1792b0a40d080bd32c3f8f31dcf04863e 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/DerivationEventType.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/DerivationEventType.java
@@ -22,11 +22,11 @@ import javax.xml.bind.annotation.XmlType;
 import org.apache.log4j.Logger;
 import org.hibernate.envers.Audited;
 
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 /**
  * @author m.doering
@@ -36,7 +36,7 @@ import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
 @XmlRootElement(name = "DerivationEventType")
 @Entity
 //@Indexed disabled to reduce clutter in indexes, since this type is not used by any search
-//@Indexed(index = "eu.etaxonomy.cdm.model.common.DefinedTermBase")
+//@Indexed(index = "eu.etaxonomy.cdm.model.term.DefinedTermBase")
 @Audited
 public class DerivationEventType extends DefinedTermBase<DerivationEventType> {
        private static final long serialVersionUID = 6895093454763415279L;
@@ -199,7 +199,7 @@ public class DerivationEventType extends DefinedTermBase<DerivationEventType> {
 
        @Override
        protected void setDefaultTerms(TermVocabulary<DerivationEventType> termVocabulary) {
-               termMap = new HashMap<UUID, DerivationEventType>();
+               termMap = new HashMap<>();
                for (DerivationEventType term : termVocabulary.getTerms()){
                        termMap.put(term.getUuid(), term);
                }

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/DeterminationEvent.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/DeterminationEvent.java
index dddf727e01cb48d862dd9d17af147e8b4d96e64e..215475b77e14db733eeaae3c5b6f3bb165a01859 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/DeterminationEvent.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/DeterminationEvent.java
@@ -36,12 +36,12 @@ import org.hibernate.search.annotations.IndexedEmbedded;
 import org.joda.time.Partial;
 
 import eu.etaxonomy.cdm.model.agent.AgentBase;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.EventBase;
 import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 
 /**
  * @author m.doering

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/MaterialOrMethodEvent.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/MaterialOrMethodEvent.java
index ce5f08ca46d919952950016105552b6d2e4cdee2..97fd76f7a972e606d32b88e6c8e515ad0e8347a8 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/MaterialOrMethodEvent.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/MaterialOrMethodEvent.java
@@ -26,11 +26,11 @@ import org.apache.log4j.Logger;
 import org.hibernate.envers.Audited;\r
 import org.hibernate.search.annotations.IndexedEmbedded;\r
 \r
-import eu.etaxonomy.cdm.model.common.DefinedTerm;\r
 import eu.etaxonomy.cdm.model.common.EventBase;\r
-import eu.etaxonomy.cdm.model.common.TermType;\r
-import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
 import eu.etaxonomy.cdm.model.molecular.Cloning;\r
+import eu.etaxonomy.cdm.model.term.DefinedTerm;\r
+import eu.etaxonomy.cdm.model.term.TermType;\r
+import eu.etaxonomy.cdm.model.term.TermVocabulary;\r
 \r
 /**\r
  * A material or method event handles data on materials or methods used for handling specimen or derived units\r

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/PreservationMethod.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/PreservationMethod.java
index 978e9eea72b36ac815ce657b9b198a4b902f3a1e..322c6e87dd04aeda74a17664b4b452bf254962c9 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/PreservationMethod.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/PreservationMethod.java
@@ -26,10 +26,10 @@ import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.IndexedEmbedded;\r
 import org.hibernate.search.annotations.NumericField;\r
 \r
-import eu.etaxonomy.cdm.model.common.DefinedTerm;\r
 import eu.etaxonomy.cdm.model.common.EventBase;\r
-import eu.etaxonomy.cdm.model.common.TermType;\r
 import eu.etaxonomy.cdm.model.molecular.Cloning;\r
+import eu.etaxonomy.cdm.model.term.DefinedTerm;\r
+import eu.etaxonomy.cdm.model.term.TermType;\r
 \r
 /**\r
  * This class is a specialization of {@link MaterialOrMethodEvent} which allows to\r
@@ -51,7 +51,7 @@ import eu.etaxonomy.cdm.model.molecular.Cloning;
 })\r
 @XmlRootElement(name = "PreservationMethod")\r
 @Entity\r
-//TODO @Indexed(index = "eu.etaxonomy.cdm.model.common.DefinedTermBase")\r
+//TODO @Indexed(index = "eu.etaxonomy.cdm.model.term.DefinedTermBase")\r
 @Audited\r
 public class PreservationMethod extends MaterialOrMethodEvent implements Cloneable {\r
        private static final long serialVersionUID = 2366116167028862401L;\r

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/SpecimenOrObservationBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/SpecimenOrObservationBase.java
index e253bbf8d139b134e463c7e9cc3050cd61636d0b..33e9740f3222eef5e96bdce1830d6f839fb2b0ef 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/SpecimenOrObservationBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/SpecimenOrObservationBase.java
@@ -59,7 +59,6 @@ import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.hibernate.search.StripHtmlBridge;
 import eu.etaxonomy.cdm.jaxb.FormattedTextAdapter;
 import eu.etaxonomy.cdm.jaxb.MultilanguageTextAdapter;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.IIntextReferenceTarget;
 import eu.etaxonomy.cdm.model.common.IMultiLanguageTextHolder;
 import eu.etaxonomy.cdm.model.common.IPublishable;
@@ -67,13 +66,14 @@ import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.MultilanguageText;
-import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.description.IDescribable;
 import eu.etaxonomy.cdm.model.description.SpecimenDescription;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.description.TaxonNameDescription;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.TermType;
 import eu.etaxonomy.cdm.strategy.cache.common.IIdentifiableEntityCacheStrategy;
 import eu.etaxonomy.cdm.strategy.match.Match;
 import eu.etaxonomy.cdm.strategy.match.Match.ReplaceMode;

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/SpecimenOrObservationType.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/SpecimenOrObservationType.java
index 38a03785df05a27e76c26b89108aea590254384c..54d5b14dfe04149811fb26e38bb310f4dba7b0d6 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/SpecimenOrObservationType.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/SpecimenOrObservationType.java
@@ -17,11 +17,11 @@ import javax.xml.bind.annotation.XmlEnumValue;
 
 import org.apache.log4j.Logger;
 
-import eu.etaxonomy.cdm.model.common.EnumeratedTermVoc;
-import eu.etaxonomy.cdm.model.common.IEnumTerm;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.description.IndividualsAssociation;
+import eu.etaxonomy.cdm.model.term.EnumeratedTermVoc;
+import eu.etaxonomy.cdm.model.term.IEnumTerm;
 
 
 /**

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/AuthorityType.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/AuthorityType.java
index d48080c62439aa4659c6deb14115e354a25a68be..8fc44d460e663d43282121191d3f95d4ca13ea1e 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/AuthorityType.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/AuthorityType.java
@@ -17,9 +17,9 @@ import javax.xml.bind.annotation.XmlEnumValue;
 
 import org.apache.log4j.Logger;
 
-import eu.etaxonomy.cdm.model.common.EnumeratedTermVoc;
-import eu.etaxonomy.cdm.model.common.IEnumTerm;
 import eu.etaxonomy.cdm.model.common.Language;
+import eu.etaxonomy.cdm.model.term.EnumeratedTermVoc;
+import eu.etaxonomy.cdm.model.term.IEnumTerm;
 
 
 /**

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/ReferenceType.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/ReferenceType.java
index 156891da6be1af694a4583fe8d9c8b3698f0b6da..d5a4905d34041a5d7961720b0f48911777c13be0 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/ReferenceType.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/ReferenceType.java
@@ -19,9 +19,9 @@ import javax.xml.bind.annotation.XmlEnumValue;
 
 import org.apache.log4j.Logger;
 
-import eu.etaxonomy.cdm.model.common.EnumeratedTermVoc;
-import eu.etaxonomy.cdm.model.common.IEnumTerm;
 import eu.etaxonomy.cdm.model.common.Language;
+import eu.etaxonomy.cdm.model.term.EnumeratedTermVoc;
+import eu.etaxonomy.cdm.model.term.IEnumTerm;
 
 
 /**

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/SynonymType.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/SynonymType.java
index 6ec45b3ac3f81dfb86e763d1fc06197f29a97a49..d147cb790e820c6929885bd7e22b746c0647713b 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/SynonymType.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/SynonymType.java
@@ -23,8 +23,8 @@ import org.apache.log4j.Logger;
 import org.hibernate.envers.Audited;
 
 import eu.etaxonomy.cdm.model.common.RelationshipTermBase;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 /**
  * The class representing categories of {@link Synonym synonyms}
@@ -47,7 +47,7 @@ import eu.etaxonomy.cdm.model.common.TermVocabulary;
 @XmlType(name = "SynonymType")
 @Entity
 //@Indexed disabled to reduce clutter in indexes, since this type is not used by any search
-//@Indexed(index = "eu.etaxonomy.cdm.model.common.DefinedTermBase")
+//@Indexed(index = "eu.etaxonomy.cdm.model.term.DefinedTermBase")
 @Audited
 public class SynonymType extends RelationshipTermBase<SynonymType> {
        private static final long serialVersionUID = -3775216614202923889L;
@@ -94,9 +94,6 @@ public class SynonymType extends RelationshipTermBase<SynonymType> {
 
 //************************** METHODS ********************************
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.cdm.model.common.DefinedTermBase#resetTerms()
-        */
        @Override
        public void resetTerms(){
                termMap = null;
@@ -186,14 +183,9 @@ public class SynonymType extends RelationshipTermBase<SynonymType> {
        }
 
 
-//     @Override
-//     public SynonymType readCsvLine(Class<SynonymType> termClass, List<String> csvLine, Map<UUID,DefinedTermBase> terms) {
-//             return super.readCsvLine(termClass, csvLine, terms);
-//     }
-
        @Override
        protected void setDefaultTerms(TermVocabulary<SynonymType> termVocabulary) {
-               termMap = new HashMap<UUID, SynonymType>();
+               termMap = new HashMap<>();
                for (SynonymType term : termVocabulary.getTerms()){
                        termMap.put(term.getUuid(), term);
                }

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java
index 7cd7a03637dc74467e58e5bb636b1f76576eeb45..d1756752e8f62e4cb8af1fe25bcbe10e86abe2d6 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java
@@ -56,7 +56,6 @@ import eu.etaxonomy.cdm.jaxb.MultilanguageTextAdapter;
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
 import eu.etaxonomy.cdm.model.common.AnnotatableEntity;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.ITreeNode;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
@@ -64,6 +63,7 @@ import eu.etaxonomy.cdm.model.common.MultilanguageText;
 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.reference.Reference;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.validation.Level3;
 import eu.etaxonomy.cdm.validation.annotation.ChildTaxaMustBeLowerRankThanParent;
 import eu.etaxonomy.cdm.validation.annotation.ChildTaxaMustDeriveNameFromParent;

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNodeAgentRelation.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNodeAgentRelation.java
index 45525e8585cdd7c5f8d251d699b00e70bbb95043..9736080b76a926c55f1406b9c2a75f1a996deaeb 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNodeAgentRelation.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNodeAgentRelation.java
@@ -28,8 +28,8 @@ import org.springframework.security.core.GrantedAuthority;
 \r
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;\r
 import eu.etaxonomy.cdm.model.common.AnnotatableEntity;\r
-import eu.etaxonomy.cdm.model.common.DefinedTerm;\r
-import eu.etaxonomy.cdm.model.common.TermType;\r
+import eu.etaxonomy.cdm.model.term.DefinedTerm;\r
+import eu.etaxonomy.cdm.model.term.TermType;\r
 \r
 /**\r
  * This class relates a TaxonNode (Taxon within it's given publication context)\r

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonRelationshipType.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonRelationshipType.java
index 229ed42619d74391488b95a41c2578a5744123f8..2a749f11ce42ee47401ec24d30c6c609576d52ee 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonRelationshipType.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonRelationshipType.java
@@ -25,10 +25,10 @@ import javax.xml.bind.annotation.XmlType;
 import org.apache.log4j.Logger;
 import org.hibernate.envers.Audited;
 
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.RelationshipTermBase;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 
 /**
@@ -53,7 +53,7 @@ import eu.etaxonomy.cdm.model.common.TermVocabulary;
 @XmlRootElement(name = "TaxonRelationshipType")
 @Entity
 //@Indexed disabled to reduce clutter in indexes, since this type is not used by any search
-//@Indexed(index = "eu.etaxonomy.cdm.model.common.DefinedTermBase")
+//@Indexed(index = "eu.etaxonomy.cdm.model.term.DefinedTermBase")
 @Audited
 public class TaxonRelationshipType extends RelationshipTermBase<TaxonRelationshipType> {
        private static final long serialVersionUID = 6575652105931691670L;
@@ -612,7 +612,7 @@ public class TaxonRelationshipType extends RelationshipTermBase<TaxonRelationshi
 
        @Override
     protected void setDefaultTerms(TermVocabulary<TaxonRelationshipType> termVocabulary) {
-               termMap = new HashMap<UUID, TaxonRelationshipType>();
+               termMap = new HashMap<>();
                for (TaxonRelationshipType term : termVocabulary.getTerms()){
                        termMap.put(term.getUuid(), term);
                }

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefaultTermInitializer.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/DefaultTermInitializer.java
similarity index 90%
rename from cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefaultTermInitializer.java
rename to cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/DefaultTermInitializer.java
index d5a91637c908c60446ed67052d4753056ca71124..8a315ee3585117edde5cd09bff90cca0e1cc1dcc 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefaultTermInitializer.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/DefaultTermInitializer.java
@@ -6,7 +6,7 @@
 * 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 eu.etaxonomy.cdm.model.common;
+package eu.etaxonomy.cdm.model.term;
 
 import java.lang.reflect.Constructor;
 import java.util.HashMap;
@@ -15,9 +15,9 @@ import java.util.UUID;
 
 import org.apache.log4j.Logger;
 
-import eu.etaxonomy.cdm.model.common.init.ITermInitializer;
-import eu.etaxonomy.cdm.model.common.init.ITermLoader;
-import eu.etaxonomy.cdm.model.common.init.TermLoader;
+import eu.etaxonomy.cdm.model.term.init.ITermInitializer;
+import eu.etaxonomy.cdm.model.term.init.ITermLoader;
+import eu.etaxonomy.cdm.model.term.init.TermLoader;
 
 /**
  * @author a.mueller

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTerm.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/DefinedTerm.java
similarity index 95%
rename from cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTerm.java
rename to cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/DefinedTerm.java
index b262f3ae2b4f11d07d48e87657804c17484a0bc4..39fe66bd4435a146de1f17442bfce921223d3293 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTerm.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/DefinedTerm.java
@@ -1,213 +1,213 @@
-/**\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
-package eu.etaxonomy.cdm.model.common;\r
-\r
-import java.util.HashMap;\r
-import java.util.Map;\r
-import java.util.UUID;\r
-\r
-import javax.persistence.Entity;\r
-import javax.xml.bind.annotation.XmlAccessType;\r
-import javax.xml.bind.annotation.XmlAccessorType;\r
-import javax.xml.bind.annotation.XmlRootElement;\r
-import javax.xml.bind.annotation.XmlType;\r
-\r
-import org.hibernate.envers.Audited;\r
-\r
-\r
-/**\r
- * @author a.mueller\r
- * @since 2013-06-19\r
- *\r
- */\r
-@XmlAccessorType(XmlAccessType.FIELD)\r
-@XmlType(name = "DefinedTerm")\r
-@XmlRootElement(name = "DefinedTerm")\r
-@Entity\r
-//@Indexed disabled to reduce clutter in indexes, since this type is not used by any search\r
-//@Indexed(index = "eu.etaxonomy.cdm.model.common.DefinedTermBase")\r
-@Audited\r
-public class DefinedTerm extends DefinedTermBase<DefinedTerm> implements Comparable<DefinedTerm> {\r
-       private static final long serialVersionUID = -6965540410672076893L;\r
-\r
-       //Determination modifier\r
-       public static final UUID uuidConfer = UUID.fromString("20db670a-2db2-49cc-bbdd-eace33694b7f");\r
-       public static final UUID uuidAffinis = UUID.fromString("128f0b54-73e2-4efb-bfda-a6243185a562");\r
-\r
-       //Sex\r
-       private static final UUID uuidMale = UUID.fromString("600a5212-cc02-431d-8a80-2bf595bd1eab");\r
-       private static final UUID uuidFemale = UUID.fromString("b4cfe0cb-b35c-4f97-9b6b-2b3c096ea2c0");\r
-       private static final UUID uuidHermaphrodite = UUID.fromString("0deddc65-2505-4c77-91a7-17d0de24afcc");\r
-       private static final UUID uuidUnknown = UUID.fromString("4f5e4c51-a664-48ad-8238-2e9f49eaf8dd");\r
-\r
-       //Marker\r
-       private static final UUID uuidIts1 = UUID.fromString("3f2de4f6-d1a2-4c3a-be70-3c997ef92543");\r
-\r
-       //kindOfUnit\r
-       public static final UUID uuidSpecimenScan = UUID.fromString("acda15be-c0e2-4ea8-8783-b9b0c4ad7f03");\r
-       public static final UUID uuidDetailImage = UUID.fromString("31eb8d02-bf5d-437c-bcc6-87a626445f34");\r
-\r
-\r
-       //Identifier Type\r
-       public static final UUID uuidLsid = UUID.fromString("26729412-9df6-4cc3-9e5d-501531ca21f0");\r
-       public static final UUID uuidAlternativeFieldNumber = UUID.fromString("054fd3d1-1961-42f8-b024-b91184ac9e0c");\r
-    public static final UUID uuidTropicosNameIdentifier = UUID.fromString("6205e531-75b0-4f2a-9a9c-b1247fb080ab");\r
-    public static final UUID uuidIpniNameIdentifier = UUID.fromString("009a602f-0ff6-4231-93db-f458e8229aca");\r
-    public static final UUID uuidWfoNameIdentifier = UUID.fromString("048e0cf9-f59c-42dd-bfeb-3a5cba0191c7");\r
-    //currently only used in Caryophyllales_spp\r
-    public static final UUID uuidPlantListIdentifier = UUID.fromString("06e4c3bd-7bf6-447a-b96e-2844b279f276");\r
-\r
-\r
-       //TaxonNode Agent Relation Type\r
-       public static final UUID uuidLastScrutiny = UUID.fromString("b4495910-28e9-4a49-86cf-a0476c78f460");\r
-    public static final UUID uuidAuthorOfSubtree = UUID.fromString("c2c7e9b7-d6a7-48a0-b13f-a7a2e2a9b8c9");\r
-\r
-       protected static Map<UUID, DefinedTerm> termMap = null;\r
-\r
-\r
-       protected static DefinedTerm getTermByUuid(UUID uuid){\r
-           if (termMap == null || termMap.isEmpty()){\r
-            return getTermByClassAndUUID(DefinedTerm.class, uuid);\r
-        } else{\r
-                       return termMap.get(uuid);\r
-               }\r
-       }\r
-\r
-\r
-       public static DefinedTerm NewInstance(TermType termType, String description, String label, String labelAbbrev){\r
-               return new DefinedTerm(termType, description, label, labelAbbrev);\r
-       }\r
-\r
-\r
-       public static DefinedTerm NewModifierInstance(String description, String label, String labelAbbrev){\r
-               return new DefinedTerm(TermType.Modifier, description, label, labelAbbrev);\r
-       }\r
-\r
-       public static DefinedTerm NewInstitutionTypeInstance(String description, String label, String labelAbbrev){\r
-               return new DefinedTerm(TermType.InstitutionType, description, label, labelAbbrev);\r
-       }\r
-\r
-       public static DefinedTerm NewStageInstance(String description, String label, String labelAbbrev){\r
-               return new DefinedTerm(TermType.Stage, description, label, labelAbbrev);\r
-       }\r
-\r
-       public static DefinedTerm NewSexInstance(String description, String label, String labelAbbrev){\r
-               return new DefinedTerm(TermType.Sex, description, label, labelAbbrev);\r
-       }\r
-\r
-       public static DefinedTerm NewScopeInstance(String description, String label, String labelAbbrev){\r
-               return new DefinedTerm(TermType.Scope, description, label, labelAbbrev);\r
-       }\r
-\r
-       public static DefinedTerm NewDnaMarkerInstance(String description, String label, String labelAbbrev){\r
-               return new DefinedTerm(TermType.DnaMarker, description, label, labelAbbrev);\r
-       }\r
-\r
-       public static DefinedTerm NewKindOfUnitInstance(String description, String label, String labelAbbrev){\r
-               return new DefinedTerm(TermType.KindOfUnit, description, label, labelAbbrev);\r
-       }\r
-\r
-       public static DefinedTerm NewIdentifierTypeInstance(String description, String label, String labelAbbrev){\r
-               return new DefinedTerm(TermType.IdentifierType, description, label, labelAbbrev);\r
-       }\r
-\r
-    public static DefinedTerm NewTaxonNodeAgentRelationTypeInstance(String description, String label, String labelAbbrev){\r
-        return new DefinedTerm(TermType.TaxonNodeAgentRelationType, description, label, labelAbbrev);\r
-    }\r
-\r
-//******************* CONSTRUCTOR ***********************************/\r
-\r
-       //for hibernate/javassist use only\r
-       @Deprecated\r
-       protected DefinedTerm(){super(TermType.Unknown);}\r
-\r
-       public DefinedTerm(TermType type, String description, String label, String labelAbbrev) {\r
-               super(type, description, label, labelAbbrev);\r
-       }\r
-\r
-//*************************** TERM MAP *********************/\r
-\r
-\r
-       public static final DefinedTerm DETERMINATION_MODIFIER_AFFINIS(){\r
-               return getTermByUuid(uuidAffinis);\r
-       }\r
-\r
-       public static final DefinedTerm DETERMINATION_MODIFIER_CONFER(){\r
-               return getTermByUuid(uuidConfer);\r
-       }\r
-\r
-       public static DefinedTerm SEX_MALE(){\r
-               return getTermByUuid(uuidMale);\r
-       }\r
-\r
-       public static DefinedTerm SEX_FEMALE(){\r
-               return getTermByUuid(uuidFemale);\r
-       }\r
-\r
-       public static DefinedTerm SEX_HERMAPHRODITE(){\r
-               return getTermByUuid(uuidHermaphrodite);\r
-       }\r
-\r
-       public static DefinedTerm SEX_UNKNOWN(){\r
-               return getTermByUuid(uuidUnknown);\r
-       }\r
-\r
-       public static DefinedTerm ITS1_MARKER(){\r
-               return getTermByUuid(uuidIts1);\r
-       }\r
-\r
-    public static DefinedTerm IDENTIFIER_NAME_TROPICOS(){\r
-        return getTermByUuid(uuidTropicosNameIdentifier);\r
-    }\r
-    public static DefinedTerm IDENTIFIER_NAME_IPNI(){\r
-        return getTermByUuid(uuidIpniNameIdentifier);\r
-    }\r
-    public static DefinedTerm IDENTIFIER_NAME_WFO(){\r
-        return getTermByUuid(uuidWfoNameIdentifier);\r
-    }\r
-\r
-    public static DefinedTerm WFO_NAME_IDENTIFIER(){\r
-        return getTermByUuid(uuidWfoNameIdentifier);\r
-    }\r
-\r
-\r
-       @Override\r
-       public void resetTerms() {\r
-               termMap = null;\r
-       }\r
-\r
-       @Override\r
-       protected void setDefaultTerms(TermVocabulary<DefinedTerm> termVocabulary) {\r
-               if (termMap == null){\r
-                       termMap = new HashMap<>();\r
-               }\r
-               for (DefinedTerm term : termVocabulary.getTerms()){\r
-                       termMap.put(term.getUuid(), term);\r
-               }\r
-       }\r
-\r
-       @Override\r
-       protected int partOfCsvLineIndex(){\r
-               return 5;\r
-       }\r
-\r
-//     @Override\r
-//     void readIsPartOf(DefinedTerm newInstance, List<String> csvLine, Map<UUID, DefinedTermBase> terms) {\r
-//        int index = 7;\r
-//             String partOfString = csvLine.get(index);\r
-//\r
-//        if(StringUtils.isNotBlank(partOfString)) {\r
-//            UUID partOfUuid = UUID.fromString(partOfString);\r
-//            DefinedTerm partOf = (DefinedTerm)terms.get(partOfUuid);\r
-//            partOf.addIncludes(newInstance);\r
-//        }\r
-//\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 eu.etaxonomy.cdm.model.term;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import javax.persistence.Entity;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.hibernate.envers.Audited;
+
+
+/**
+ * @author a.mueller
+ * @since 2013-06-19
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "DefinedTerm")
+@XmlRootElement(name = "DefinedTerm")
+@Entity
+//@Indexed disabled to reduce clutter in indexes, since this type is not used by any search
+//@Indexed(index = "eu.etaxonomy.cdm.model.term.DefinedTermBase")
+@Audited
+public class DefinedTerm extends DefinedTermBase<DefinedTerm> implements Comparable<DefinedTerm> {
+       private static final long serialVersionUID = -6965540410672076893L;
+
+       //Determination modifier
+       public static final UUID uuidConfer = UUID.fromString("20db670a-2db2-49cc-bbdd-eace33694b7f");
+       public static final UUID uuidAffinis = UUID.fromString("128f0b54-73e2-4efb-bfda-a6243185a562");
+
+       //Sex
+       private static final UUID uuidMale = UUID.fromString("600a5212-cc02-431d-8a80-2bf595bd1eab");
+       private static final UUID uuidFemale = UUID.fromString("b4cfe0cb-b35c-4f97-9b6b-2b3c096ea2c0");
+       private static final UUID uuidHermaphrodite = UUID.fromString("0deddc65-2505-4c77-91a7-17d0de24afcc");
+       private static final UUID uuidUnknown = UUID.fromString("4f5e4c51-a664-48ad-8238-2e9f49eaf8dd");
+
+       //Marker
+       private static final UUID uuidIts1 = UUID.fromString("3f2de4f6-d1a2-4c3a-be70-3c997ef92543");
+
+       //kindOfUnit
+       public static final UUID uuidSpecimenScan = UUID.fromString("acda15be-c0e2-4ea8-8783-b9b0c4ad7f03");
+       public static final UUID uuidDetailImage = UUID.fromString("31eb8d02-bf5d-437c-bcc6-87a626445f34");
+
+
+       //Identifier Type
+       public static final UUID uuidLsid = UUID.fromString("26729412-9df6-4cc3-9e5d-501531ca21f0");
+       public static final UUID uuidAlternativeFieldNumber = UUID.fromString("054fd3d1-1961-42f8-b024-b91184ac9e0c");
+    public static final UUID uuidTropicosNameIdentifier = UUID.fromString("6205e531-75b0-4f2a-9a9c-b1247fb080ab");
+    public static final UUID uuidIpniNameIdentifier = UUID.fromString("009a602f-0ff6-4231-93db-f458e8229aca");
+    public static final UUID uuidWfoNameIdentifier = UUID.fromString("048e0cf9-f59c-42dd-bfeb-3a5cba0191c7");
+    //currently only used in Caryophyllales_spp
+    public static final UUID uuidPlantListIdentifier = UUID.fromString("06e4c3bd-7bf6-447a-b96e-2844b279f276");
+
+
+       //TaxonNode Agent Relation Type
+       public static final UUID uuidLastScrutiny = UUID.fromString("b4495910-28e9-4a49-86cf-a0476c78f460");
+    public static final UUID uuidAuthorOfSubtree = UUID.fromString("c2c7e9b7-d6a7-48a0-b13f-a7a2e2a9b8c9");
+
+       protected static Map<UUID, DefinedTerm> termMap = null;
+
+
+       protected static DefinedTerm getTermByUuid(UUID uuid){
+           if (termMap == null || termMap.isEmpty()){
+            return getTermByClassAndUUID(DefinedTerm.class, uuid);
+        } else{
+                       return termMap.get(uuid);
+               }
+       }
+
+
+       public static DefinedTerm NewInstance(TermType termType, String description, String label, String labelAbbrev){
+               return new DefinedTerm(termType, description, label, labelAbbrev);
+       }
+
+
+       public static DefinedTerm NewModifierInstance(String description, String label, String labelAbbrev){
+               return new DefinedTerm(TermType.Modifier, description, label, labelAbbrev);
+       }
+
+       public static DefinedTerm NewInstitutionTypeInstance(String description, String label, String labelAbbrev){
+               return new DefinedTerm(TermType.InstitutionType, description, label, labelAbbrev);
+       }
+
+       public static DefinedTerm NewStageInstance(String description, String label, String labelAbbrev){
+               return new DefinedTerm(TermType.Stage, description, label, labelAbbrev);
+       }
+
+       public static DefinedTerm NewSexInstance(String description, String label, String labelAbbrev){
+               return new DefinedTerm(TermType.Sex, description, label, labelAbbrev);
+       }
+
+       public static DefinedTerm NewScopeInstance(String description, String label, String labelAbbrev){
+               return new DefinedTerm(TermType.Scope, description, label, labelAbbrev);
+       }
+
+       public static DefinedTerm NewDnaMarkerInstance(String description, String label, String labelAbbrev){
+               return new DefinedTerm(TermType.DnaMarker, description, label, labelAbbrev);
+       }
+
+       public static DefinedTerm NewKindOfUnitInstance(String description, String label, String labelAbbrev){
+               return new DefinedTerm(TermType.KindOfUnit, description, label, labelAbbrev);
+       }
+
+       public static DefinedTerm NewIdentifierTypeInstance(String description, String label, String labelAbbrev){
+               return new DefinedTerm(TermType.IdentifierType, description, label, labelAbbrev);
+       }
+
+    public static DefinedTerm NewTaxonNodeAgentRelationTypeInstance(String description, String label, String labelAbbrev){
+        return new DefinedTerm(TermType.TaxonNodeAgentRelationType, description, label, labelAbbrev);
+    }
+
+//******************* CONSTRUCTOR ***********************************/
+
+       //for hibernate/javassist use only
+       @Deprecated
+       protected DefinedTerm(){super(TermType.Unknown);}
+
+       public DefinedTerm(TermType type, String description, String label, String labelAbbrev) {
+               super(type, description, label, labelAbbrev);
+       }
+
+//*************************** TERM MAP *********************/
+
+
+       public static final DefinedTerm DETERMINATION_MODIFIER_AFFINIS(){
+               return getTermByUuid(uuidAffinis);
+       }
+
+       public static final DefinedTerm DETERMINATION_MODIFIER_CONFER(){
+               return getTermByUuid(uuidConfer);
+       }
+
+       public static DefinedTerm SEX_MALE(){
+               return getTermByUuid(uuidMale);
+       }
+
+       public static DefinedTerm SEX_FEMALE(){
+               return getTermByUuid(uuidFemale);
+       }
+
+       public static DefinedTerm SEX_HERMAPHRODITE(){
+               return getTermByUuid(uuidHermaphrodite);
+       }
+
+       public static DefinedTerm SEX_UNKNOWN(){
+               return getTermByUuid(uuidUnknown);
+       }
+
+       public static DefinedTerm ITS1_MARKER(){
+               return getTermByUuid(uuidIts1);
+       }
+
+    public static DefinedTerm IDENTIFIER_NAME_TROPICOS(){
+        return getTermByUuid(uuidTropicosNameIdentifier);
+    }
+    public static DefinedTerm IDENTIFIER_NAME_IPNI(){
+        return getTermByUuid(uuidIpniNameIdentifier);
+    }
+    public static DefinedTerm IDENTIFIER_NAME_WFO(){
+        return getTermByUuid(uuidWfoNameIdentifier);
+    }
+
+    public static DefinedTerm WFO_NAME_IDENTIFIER(){
+        return getTermByUuid(uuidWfoNameIdentifier);
+    }
+
+
+       @Override
+       public void resetTerms() {
+               termMap = null;
+       }
+
+       @Override
+       protected void setDefaultTerms(TermVocabulary<DefinedTerm> termVocabulary) {
+               if (termMap == null){
+                       termMap = new HashMap<>();
+               }
+               for (DefinedTerm term : termVocabulary.getTerms()){
+                       termMap.put(term.getUuid(), term);
+               }
+       }
+
+       @Override
+       protected int partOfCsvLineIndex(){
+               return 5;
+       }
+
+//     @Override
+//     void readIsPartOf(DefinedTerm newInstance, List<String> csvLine, Map<UUID, DefinedTermBase> terms) {
+//        int index = 7;
+//             String partOfString = csvLine.get(index);
+//
+//        if(StringUtils.isNotBlank(partOfString)) {
+//            UUID partOfUuid = UUID.fromString(partOfString);
+//            DefinedTerm partOf = (DefinedTerm)terms.get(partOfUuid);
+//            partOf.addIncludes(newInstance);
+//        }
+//
+//     }
+
+}

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTermBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/DefinedTermBase.java
similarity index 98%
rename from cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTermBase.java
rename to cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/DefinedTermBase.java
index 37520b948f5e08916a436f23e214a3f1e7ef6408..26806d3dcebee5540f6da2808700429f29cdb69d 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTermBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/DefinedTermBase.java
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.cdm.model.common;
+package eu.etaxonomy.cdm.model.term;
 
 import java.lang.reflect.Constructor;
 import java.net.URI;
@@ -49,6 +49,10 @@ import au.com.bytecode.opencsv.CSVWriter;
 import eu.etaxonomy.cdm.common.CdmUtils;
 import eu.etaxonomy.cdm.hibernate.search.DefinedTermBaseClassBridge;
 import eu.etaxonomy.cdm.model.ICdmUuidCacher;
+import eu.etaxonomy.cdm.model.common.AnnotationType;
+import eu.etaxonomy.cdm.model.common.ExtensionType;
+import eu.etaxonomy.cdm.model.common.Language;
+import eu.etaxonomy.cdm.model.common.MarkerType;
 import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.description.MeasurementUnit;
 import eu.etaxonomy.cdm.model.description.StatisticalMeasure;
@@ -492,7 +496,7 @@ public abstract class DefinedTermBase<T extends DefinedTermBase>
      * a new instance that differs only slightly from <i>this</i> defined term base by
      * modifying only some of the attributes.
      *
-     * @see eu.etaxonomy.cdm.model.common.TermBase#clone()
+     * @see eu.etaxonomy.cdm.model.term.TermBase#clone()
      * @see java.lang.Object#clone()
      */
     @Override

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/EnumeratedTermVoc.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/EnumeratedTermVoc.java
similarity index 95%
rename from cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/EnumeratedTermVoc.java
rename to cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/EnumeratedTermVoc.java
index 71dc51995daa03431be9c1c7679294c417a8a992..c9b35a8a4bcbbc61de6aceee9dd9a4deff5cc11b 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/EnumeratedTermVoc.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/EnumeratedTermVoc.java
@@ -1,187 +1,189 @@
-/**\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
-import java.util.HashMap;\r
-import java.util.HashSet;\r
-import java.util.Map;\r
-import java.util.Set;\r
-import java.util.UUID;\r
-\r
-/**\r
- * Helper class to handle enumeration terms similar to vocabularies.\r
- *\r
- * @author a.mueller\r
- */\r
-public class EnumeratedTermVoc<T extends IEnumTerm<T>> {\r
-\r
-       private static Map<Class<? extends IEnumTerm<?>>,EnumeratedTermVoc<?>> vocsMap= new HashMap<>();\r
-\r
-       private final Map<T,SingleEnumTerm<T>> lookup = new HashMap<>();\r
-\r
-//     public interface EnumTerm<R extends EnumTerm<?>> extends ISimpleTerm<R>{\r
-//             public String getKey();\r
-//     }\r
-\r
-       private class SingleEnumTerm<S extends T> implements IEnumTerm<T>{\r
-               private final S term;\r
-               private final String label;\r
-               private final UUID uuid;\r
-               private final String key;\r
-               private final Set<S> children = new HashSet<>();\r
-               private final S parent;\r
-\r
-\r
-\r
-               private SingleEnumTerm(S term, UUID uuid, String defaultString, String key, S parent){\r
-                       this.term = term;\r
-                       this.label = defaultString;\r
-                       this.key = key;\r
-                       this.uuid = uuid;\r
-                       this.parent = parent;\r
-                       SingleEnumTerm<T> parentSingleEnum = lookup.get(parent);\r
-                       if (parentSingleEnum != null){\r
-                               parentSingleEnum.children.add(term);\r
-                       }\r
-               }\r
-\r
-               @Override\r
-               public UUID getUuid() { return uuid;}\r
-               @Override\r
-               public T getKindOf() {return parent;}\r
-               public T getTerm() {return term;}\r
-               @Override\r
-               public String getKey() {return key;     }\r
-\r
-               @Override\r
-               public String getMessage() {return getMessage(Language.DEFAULT());}\r
-\r
-               @Override\r
-               public String getMessage(Language language) {\r
-                       //TODO make multi-lingual\r
-                       return label;\r
-               }\r
-\r
-               @Override\r
-               public Set<T> getGeneralizationOf() {\r
-//                     return Collections.unmodifiableSet( children );   //TODO creates stack overflow\r
-                       return new HashSet<T>(children);\r
-               }\r
-\r
-               @Override\r
-               public boolean isKindOf(T ancestor) {\r
-                       if (parent == null || ancestor == null){\r
-                               return false;\r
-                       }else if (parent.equals(ancestor)){\r
-                               return true;\r
-                       }else{\r
-                               return parent.isKindOf(ancestor);\r
-                       }\r
-               }\r
-\r
-               @Override\r
-               public Set<T> getGeneralizationOf(boolean recursive) {\r
-                       Set<T> result = new HashSet<T>();\r
-                       result.addAll(this.children);\r
-                       if (recursive){\r
-                               for (T child : this.children){\r
-                                       result.addAll(child.getGeneralizationOf(recursive));\r
-                               }\r
-                       }\r
-                       return result;\r
-               }\r
-\r
-       } //end of inner class\r
-\r
-//******************* DELEGATE NETHODS ************************\r
-\r
-       public String getKey(T term) {return lookup.get(term).getKey();}\r
-\r
-       public UUID getUuid(T term) {return lookup.get(term).getUuid();}\r
-\r
-       public T getKindOf(T term) {return lookup.get(term).getKindOf();}\r
-\r
-       public Set<T> getGeneralizationOf(T term) {return lookup.get(term).getGeneralizationOf();}\r
-\r
-//******************* DELEGATE CLASS NETHODS ************************\r
-\r
-\r
-       public static <S extends IEnumTerm<?>> IEnumTerm addTerm(Class<? extends IEnumTerm<?>> clazz, S term, UUID uuid, String defaultString, String key, S parent){\r
-               if (vocsMap.get(clazz) == null){\r
-                       vocsMap.put(clazz, new EnumeratedTermVoc<>());\r
-               }\r
-               IEnumTerm<?> myTerm = vocsMap.get(clazz).add(term, uuid, defaultString, key, parent);\r
-               return myTerm;\r
-       }\r
-\r
-       private  SingleEnumTerm<T> add(ISimpleTerm<?> term, UUID uuid, String defaultString, String key, ISimpleTerm<?> parent) {\r
-               SingleEnumTerm<T> singleTerm = new SingleEnumTerm<T>((T)term, uuid, defaultString, key, (T)parent);\r
-               if (containsKey(lookup, key)){\r
-                       throw new RuntimeException(String.format("Key must be unique in enumeration but was not for '%s'", key));\r
-               }\r
-               if (containsUuid(lookup, uuid)){\r
-                       throw new RuntimeException(String.format("UUID must be unique in enumeration but was not for '%s'", uuid));\r
-               }\r
-               lookup.put((T)term, singleTerm);\r
-               return singleTerm;\r
-       }\r
-\r
-       public boolean containsKey(Map<T, SingleEnumTerm<T>> lookup, String key) {\r
-               for (SingleEnumTerm<T> term : lookup.values()){\r
-                       if (term.getKey().equals(key)){\r
-                               return true;\r
-                       }\r
-               }\r
-               return false;\r
-       }\r
-\r
-       public boolean containsUuid(Map<T, SingleEnumTerm<T>> lookup, UUID uuid) {\r
-               for (SingleEnumTerm<T> term : lookup.values()){\r
-                       if (term.getUuid().equals(uuid)){\r
-                               return true;\r
-                       }\r
-               }\r
-               return false;\r
-       }\r
-\r
-       public static <R extends IEnumTerm<R>> R byKey(Class<R> clazz, String key) {\r
-               EnumeratedTermVoc<R> voc = getVoc(clazz);\r
-               return voc == null? null:voc.getByKey(key);\r
-       }\r
-\r
-       public static <R extends IEnumTerm<R>> R byUuid(Class<R> clazz, UUID uuid) {\r
-               EnumeratedTermVoc<R> voc = getVoc(clazz);\r
-               return voc == null? null:voc.getByUuid(uuid);\r
-       }\r
-\r
-\r
-       public T getByKey(String key) {\r
-               for (SingleEnumTerm<T> term : lookup.values()){\r
-                       if (term.getKey().equals(key)){\r
-                               return term.getTerm();\r
-                       }\r
-               }\r
-               return null;\r
-       }\r
-\r
-       public T getByUuid(UUID uuid) {\r
-               for (SingleEnumTerm<T> term : lookup.values()){\r
-                       if (term.getUuid().equals(uuid)){\r
-                               return term.getTerm();\r
-                       }\r
-               }\r
-               return null;\r
-       }\r
-\r
-       public static <R extends IEnumTerm<R>> EnumeratedTermVoc<R> getVoc(Class<R> clazz) {\r
-               return (EnumeratedTermVoc<R>)vocsMap.get(clazz);\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 eu.etaxonomy.cdm.model.term;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
+import eu.etaxonomy.cdm.model.common.Language;
+
+/**
+ * Helper class to handle enumeration terms similar to vocabularies.
+ *
+ * @author a.mueller
+ */
+public class EnumeratedTermVoc<T extends IEnumTerm<T>> {
+
+       private static Map<Class<? extends IEnumTerm<?>>,EnumeratedTermVoc<?>> vocsMap= new HashMap<>();
+
+       private final Map<T,SingleEnumTerm<T>> lookup = new HashMap<>();
+
+//     public interface EnumTerm<R extends EnumTerm<?>> extends ISimpleTerm<R>{
+//             public String getKey();
+//     }
+
+       private class SingleEnumTerm<S extends T> implements IEnumTerm<T>{
+               private final S term;
+               private final String label;
+               private final UUID uuid;
+               private final String key;
+               private final Set<S> children = new HashSet<>();
+               private final S parent;
+
+
+
+               private SingleEnumTerm(S term, UUID uuid, String defaultString, String key, S parent){
+                       this.term = term;
+                       this.label = defaultString;
+                       this.key = key;
+                       this.uuid = uuid;
+                       this.parent = parent;
+                       SingleEnumTerm<T> parentSingleEnum = lookup.get(parent);
+                       if (parentSingleEnum != null){
+                               parentSingleEnum.children.add(term);
+                       }
+               }
+
+               @Override
+               public UUID getUuid() { return uuid;}
+               @Override
+               public T getKindOf() {return parent;}
+               public T getTerm() {return term;}
+               @Override
+               public String getKey() {return key;     }
+
+               @Override
+               public String getMessage() {return getMessage(Language.DEFAULT());}
+
+               @Override
+               public String getMessage(Language language) {
+                       //TODO make multi-lingual
+                       return label;
+               }
+
+               @Override
+               public Set<T> getGeneralizationOf() {
+//                     return Collections.unmodifiableSet( children );   //TODO creates stack overflow
+                       return new HashSet<T>(children);
+               }
+
+               @Override
+               public boolean isKindOf(T ancestor) {
+                       if (parent == null || ancestor == null){
+                               return false;
+                       }else if (parent.equals(ancestor)){
+                               return true;
+                       }else{
+                               return parent.isKindOf(ancestor);
+                       }
+               }
+
+               @Override
+               public Set<T> getGeneralizationOf(boolean recursive) {
+                       Set<T> result = new HashSet<T>();
+                       result.addAll(this.children);
+                       if (recursive){
+                               for (T child : this.children){
+                                       result.addAll(child.getGeneralizationOf(recursive));
+                               }
+                       }
+                       return result;
+               }
+
+       } //end of inner class
+
+//******************* DELEGATE NETHODS ************************
+
+       public String getKey(T term) {return lookup.get(term).getKey();}
+
+       public UUID getUuid(T term) {return lookup.get(term).getUuid();}
+
+       public T getKindOf(T term) {return lookup.get(term).getKindOf();}
+
+       public Set<T> getGeneralizationOf(T term) {return lookup.get(term).getGeneralizationOf();}
+
+//******************* DELEGATE CLASS NETHODS ************************
+
+
+       public static <S extends IEnumTerm<?>> IEnumTerm addTerm(Class<? extends IEnumTerm<?>> clazz, S term, UUID uuid, String defaultString, String key, S parent){
+               if (vocsMap.get(clazz) == null){
+                       vocsMap.put(clazz, new EnumeratedTermVoc<>());
+               }
+               IEnumTerm<?> myTerm = vocsMap.get(clazz).add(term, uuid, defaultString, key, parent);
+               return myTerm;
+       }
+
+       private  SingleEnumTerm<T> add(ISimpleTerm<?> term, UUID uuid, String defaultString, String key, ISimpleTerm<?> parent) {
+               SingleEnumTerm<T> singleTerm = new SingleEnumTerm<T>((T)term, uuid, defaultString, key, (T)parent);
+               if (containsKey(lookup, key)){
+                       throw new RuntimeException(String.format("Key must be unique in enumeration but was not for '%s'", key));
+               }
+               if (containsUuid(lookup, uuid)){
+                       throw new RuntimeException(String.format("UUID must be unique in enumeration but was not for '%s'", uuid));
+               }
+               lookup.put((T)term, singleTerm);
+               return singleTerm;
+       }
+
+       public boolean containsKey(Map<T, SingleEnumTerm<T>> lookup, String key) {
+               for (SingleEnumTerm<T> term : lookup.values()){
+                       if (term.getKey().equals(key)){
+                               return true;
+                       }
+               }
+               return false;
+       }
+
+       public boolean containsUuid(Map<T, SingleEnumTerm<T>> lookup, UUID uuid) {
+               for (SingleEnumTerm<T> term : lookup.values()){
+                       if (term.getUuid().equals(uuid)){
+                               return true;
+                       }
+               }
+               return false;
+       }
+
+       public static <R extends IEnumTerm<R>> R byKey(Class<R> clazz, String key) {
+               EnumeratedTermVoc<R> voc = getVoc(clazz);
+               return voc == null? null:voc.getByKey(key);
+       }
+
+       public static <R extends IEnumTerm<R>> R byUuid(Class<R> clazz, UUID uuid) {
+               EnumeratedTermVoc<R> voc = getVoc(clazz);
+               return voc == null? null:voc.getByUuid(uuid);
+       }
+
+
+       public T getByKey(String key) {
+               for (SingleEnumTerm<T> term : lookup.values()){
+                       if (term.getKey().equals(key)){
+                               return term.getTerm();
+                       }
+               }
+               return null;
+       }
+
+       public T getByUuid(UUID uuid) {
+               for (SingleEnumTerm<T> term : lookup.values()){
+                       if (term.getUuid().equals(uuid)){
+                               return term.getTerm();
+                       }
+               }
+               return null;
+       }
+
+       public static <R extends IEnumTerm<R>> EnumeratedTermVoc<R> getVoc(Class<R> clazz) {
+               return (EnumeratedTermVoc<R>)vocsMap.get(clazz);
+       }
+
+}

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IDefinedTerm.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/IDefinedTerm.java
similarity index 95%
rename from cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IDefinedTerm.java
rename to cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/IDefinedTerm.java
index 3e2390a28b87f5d386d7a704d1d3f59ad36135d3..3b98b678b1962d654f342c84d26619b98e54eede 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IDefinedTerm.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/IDefinedTerm.java
@@ -1,94 +1,94 @@
-/**\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
-import java.util.Set;\r
-\r
-import eu.etaxonomy.cdm.model.media.Media;\r
-\r
-public interface IDefinedTerm<T extends IDefinedTerm> extends ISimpleTerm<T>, ILoadableTerm<T> {\r
-\r
-\r
-//     public void setKindOf(T kindOf);\r
-\r
-\r
-//     public void setGeneralizationOf(Set<T> generalizationOf);\r
-//\r
-//     public void addGeneralizationOf(T generalization);\r
-//\r
-//     public void removeGeneralization(T generalization);\r
-\r
-    /**\r
-     * Returns the defined term this term is a part of.\r
-     * Therefore the returned term includes <code>this</code> term\r
-     * Discuss: move to {@link ISimpleTerm}?\r
-     * @see #getIncludes()\r
-     */\r
-    //Discuss: move to ISimpleTerm\r
-    public T getPartOf();\r
-\r
-//     public void setPartOf(T partOf);\r
-\r
-    /**\r
-     * Returns all defined terms this term includes.\r
-     * Therefore the returned terms are part of <code>this</code> term\r
-     * Discuss: move to {@link ISimpleTerm}?\r
-     *\r
-     * FIXME getIncludes():  Hibernate returns this as a collection of CGLibProxy$$DefinedTermBase objects\r
-     * which can't be cast to instances of T - can we explicitly initialize these terms using\r
-     * Hibernate.initialize() or ( ( PersistentCollection ) proxy ).forceInitialization(),\r
-     * does this imply a distinct load, and find methods in the dao?\r
-     *\r
-     * @see #getPartOf()\r
-     */\r
-    public Set<T> getIncludes();\r
-\r
-//     public void setIncludes(Set<T> includes);\r
-//\r
-//     public void addIncludes(T includes);\r
-//\r
-//     public void removeIncludes(T includes);\r
-\r
-    /**\r
-     * Returns the media attached to this {@link IDefinedTerm term}\r
-     * @return\r
-     */\r
-    public Set<Media> getMedia();\r
-\r
-//     public void setMedia(Set<Media> media);\r
-//\r
-//     public void addMedia(Media media);\r
-//\r
-//     public void removeMedia(Media media);\r
-\r
-    /* (non-Javadoc)\r
-     * @see eu.etaxonomy.cdm.model.common.IDefTerm#getVocabulary()\r
-     */\r
-//     public TermVocabulary<T> getVocabulary();\r
-\r
-    /* (non-Javadoc)\r
-     * @see eu.etaxonomy.cdm.model.common.IDefTerm#setVocabulary(eu.etaxonomy.cdm.model.common.TermVocabulary)\r
-     */\r
-//     public void setVocabulary(TermVocabulary<T> newVocabulary);\r
-\r
-    /**\r
-     * Returns the label of this term used (and unique) in the term's vocabulary.\r
-     * @see #setIdInVocabulary(String)\r
-     */\r
-    public String getIdInVocabulary();\r
-\r
-    /**\r
-     * Sets the label of this term used (and unique) in the term's vocabulary.\r
-     * @see #getIdInVocabulary()\r
-     * @param idInVocabulary\r
-     */\r
-    public void setIdInVocabulary(String idInVocabulary);\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 eu.etaxonomy.cdm.model.term;
+
+import java.util.Set;
+
+import eu.etaxonomy.cdm.model.media.Media;
+
+public interface IDefinedTerm<T extends IDefinedTerm> extends ISimpleTerm<T>, ILoadableTerm<T> {
+
+
+//     public void setKindOf(T kindOf);
+
+
+//     public void setGeneralizationOf(Set<T> generalizationOf);
+//
+//     public void addGeneralizationOf(T generalization);
+//
+//     public void removeGeneralization(T generalization);
+
+    /**
+     * Returns the defined term this term is a part of.
+     * Therefore the returned term includes <code>this</code> term
+     * Discuss: move to {@link ISimpleTerm}?
+     * @see #getIncludes()
+     */
+    //Discuss: move to ISimpleTerm
+    public T getPartOf();
+
+//     public void setPartOf(T partOf);
+
+    /**
+     * Returns all defined terms this term includes.
+     * Therefore the returned terms are part of <code>this</code> term
+     * Discuss: move to {@link ISimpleTerm}?
+     *
+     * FIXME getIncludes():  Hibernate returns this as a collection of CGLibProxy$$DefinedTermBase objects
+     * which can't be cast to instances of T - can we explicitly initialize these terms using
+     * Hibernate.initialize() or ( ( PersistentCollection ) proxy ).forceInitialization(),
+     * does this imply a distinct load, and find methods in the dao?
+     *
+     * @see #getPartOf()
+     */
+    public Set<T> getIncludes();
+
+//     public void setIncludes(Set<T> includes);
+//
+//     public void addIncludes(T includes);
+//
+//     public void removeIncludes(T includes);
+
+    /**
+     * Returns the media attached to this {@link IDefinedTerm term}
+     * @return
+     */
+    public Set<Media> getMedia();
+
+//     public void setMedia(Set<Media> media);
+//
+//     public void addMedia(Media media);
+//
+//     public void removeMedia(Media media);
+
+    /* (non-Javadoc)
+     * @see eu.etaxonomy.cdm.model.common.IDefTerm#getVocabulary()
+     */
+//     public TermVocabulary<T> getVocabulary();
+
+    /* (non-Javadoc)
+     * @see eu.etaxonomy.cdm.model.common.IDefTerm#setVocabulary(eu.etaxonomy.cdm.model.common.TermVocabulary)
+     */
+//     public void setVocabulary(TermVocabulary<T> newVocabulary);
+
+    /**
+     * Returns the label of this term used (and unique) in the term's vocabulary.
+     * @see #setIdInVocabulary(String)
+     */
+    public String getIdInVocabulary();
+
+    /**
+     * Sets the label of this term used (and unique) in the term's vocabulary.
+     * @see #getIdInVocabulary()
+     * @param idInVocabulary
+     */
+    public void setIdInVocabulary(String idInVocabulary);
+
 }

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IEnumTerm.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/IEnumTerm.java
similarity index 82%
rename from cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IEnumTerm.java
rename to cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/IEnumTerm.java
index 14bb012de5b5b91052810722ccc495f029003f0a..c36d13c6a169ae687af3f034e67426ed837a11fd 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IEnumTerm.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/IEnumTerm.java
@@ -1,18 +1,17 @@
-/**\r
- *\r
- */\r
-package eu.etaxonomy.cdm.model.common;\r
-\r
-\r
-/**\r
- * Interface to combine {@link ISimpleTerm} and {@link IKeyTerm} properties.\r
- * To be used by enumerated terms.\r
- *\r
- * @author a.mueller\r
- * @since 15-Jul-2013\r
- *\r
- */\r
-public interface IEnumTerm<T extends IEnumTerm<T>>\r
-        extends ISimpleTerm<T>, IKeyTerm {\r
-\r
-}\r
+/**
+ *
+ */
+package eu.etaxonomy.cdm.model.term;
+
+/**
+ * Interface to combine {@link ISimpleTerm} and {@link IKeyTerm} properties.
+ * To be used by enumerated terms.
+ *
+ * @author a.mueller
+ * @since 15-Jul-2013
+ *
+ */
+public interface IEnumTerm<T extends IEnumTerm<T>>
+        extends ISimpleTerm<T>, IKeyTerm {
+
+}

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IHasTermType.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/IHasTermType.java
similarity index 96%
rename from cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IHasTermType.java
rename to cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/IHasTermType.java
index 1cc7e090ae0d8d1d364a4ef5c17160a15ca26ed7..43e951320e1b75d545868853ab5220cd5a90fac6 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IHasTermType.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/IHasTermType.java
@@ -6,7 +6,7 @@
 * 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 eu.etaxonomy.cdm.model.common;
+package eu.etaxonomy.cdm.model.term;
 
 /**
  * @author a.mueller

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IKeyTerm.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/IKeyTerm.java
similarity index 93%
rename from cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IKeyTerm.java
rename to cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/IKeyTerm.java
index 4a32cb2cc832e1b0fcfbb4ab51b14adcb42f9d88..8df762acb648e48581b763723625380eba4fbddc 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IKeyTerm.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/IKeyTerm.java
@@ -1,46 +1,47 @@
-/**\r
- * \r
- */\r
-package eu.etaxonomy.cdm.model.common;\r
-\r
-\r
-/**\r
- * Interface for all enumerations which provide a key for persisting them as strings\r
- * via {@link EnumUserType}.\r
- * The key may also be used for other purposes.\r
- * The key must be unique within the enumeration.\r
- * \r
- * The interface also provides a human readable representation with i18n support.\r
- * \r
- * IMPORTANT: classes implementing this interface must also implement a static method\r
- * <code>getByKey(String)</code> which returns the according instance. This can not be \r
- * guaranteed by the interface as interfaces do not allow definitions of static methods.\r
- * \r
- * @author a.mueller\r
- * @since 30-Aug-2013\r
- *\r
- */\r
-public interface IKeyTerm  {\r
-\r
-       /**\r
-        * Returns the key for the enumeration.\r
-        * A key should be short unique identifier within the given enumeration. \r
-        * If not otherwise stated it should not be longer then 3 characters. \r
-        * @return the key\r
-        */\r
-       public String getKey();\r
-       \r
-       /**\r
-        * Returns a human readable preferably for the default language.\r
-        * @return\r
-        */\r
-       public String getMessage();     \r
-\r
-       /**\r
-        * Returns a human readable preferably for the given language.\r
-        * @param language\r
-        * @return\r
-        */\r
-       public String getMessage(Language language);\r
-\r
-}\r
+/**
+ * 
+ */
+package eu.etaxonomy.cdm.model.term;
+
+import eu.etaxonomy.cdm.model.common.Language;
+
+/**
+ * Interface for all enumerations which provide a key for persisting them as strings
+ * via {@link EnumUserType}.
+ * The key may also be used for other purposes.
+ * The key must be unique within the enumeration.
+ * 
+ * The interface also provides a human readable representation with i18n support.
+ * 
+ * IMPORTANT: classes implementing this interface must also implement a static method
+ * <code>getByKey(String)</code> which returns the according instance. This can not be 
+ * guaranteed by the interface as interfaces do not allow definitions of static methods.
+ * 
+ * @author a.mueller
+ * @since 30-Aug-2013
+ *
+ */
+public interface IKeyTerm  {
+
+       /**
+        * Returns the key for the enumeration.
+        * A key should be short unique identifier within the given enumeration. 
+        * If not otherwise stated it should not be longer then 3 characters. 
+        * @return the key
+        */
+       public String getKey();
+       
+       /**
+        * Returns a human readable preferably for the default language.
+        * @return
+        */
+       public String getMessage();     
+
+       /**
+        * Returns a human readable preferably for the given language.
+        * @param language
+        * @return
+        */
+       public String getMessage(Language language);
+
+}

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/ILoadableTerm.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/ILoadableTerm.java
similarity index 95%
rename from cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/ILoadableTerm.java
rename to cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/ILoadableTerm.java
index fc32ccf46e40fa143fc0dec5d7ac430f28675657..e9ca7845b99636e34dd6ae5403d8a2cc720bcedb 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/ILoadableTerm.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/ILoadableTerm.java
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.cdm.model.common;
+package eu.etaxonomy.cdm.model.term;
 
 import java.util.List;
 import java.util.Map;

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/ISimpleTerm.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/ISimpleTerm.java
similarity index 94%
rename from cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/ISimpleTerm.java
rename to cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/ISimpleTerm.java
index ec5fe67828f27420d385ef5f68aeb77edc9fc6b3..7d3414ced3ca2fe9d3fe79e63bdb7a30ee416b78 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/ISimpleTerm.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/ISimpleTerm.java
@@ -1,61 +1,61 @@
-/**\r
- * \r
- */\r
-package eu.etaxonomy.cdm.model.common;\r
-\r
-import java.util.Set;\r
-import java.util.UUID;\r
-\r
-import javax.persistence.Transient;\r
-\r
-/**\r
- * The common interface which is implemented by {@link DefinedTermBase defined terms} and enumerations\r
- * replacing fully {@link DefinedTermBase defined terms}.\r
- * \r
- * @author a.mueller\r
- * @since 14-Jul-1913\r
- */\r
-public interface ISimpleTerm<T extends ISimpleTerm> {\r
-\r
-       @Transient\r
-       public UUID getUuid();\r
-       \r
-       //is static !!\r
-//     public T getByUuid(UUID uuid);\r
-\r
-\r
-       /**\r
-        * Returns the defined term this term is a kind of.\r
-        * Therefore the returned term is a generalization of <code>this</code> term\r
-        */\r
-       public T getKindOf();\r
-       \r
-\r
-       /**\r
-        * Returns all defined terms this term is a direct generalization for.\r
-        * Therefore the returned terms are kind of <code>this</code> term.\r
-        */\r
-       public Set<T> getGeneralizationOf();\r
-       \r
-\r
-       /**\r
-        * Computes if <code>this</code> term is kind of the <code>ancestor</code> term.\r
-        * So the <code>ancestor</code> term is direct or indirect (recursive) generalization\r
-        * of <code>this</code> term.\r
-        * @param ancestor the potential ancestor term\r
-        * @see #getKindOf()\r
-        * @see #getGeneralizationOf()\r
-        */\r
-       public boolean isKindOf(T ancestor);\r
-       \r
-       /**\r
-        * Returns all defined terms this term is a generalization for.\r
-        * Therefore the returned terms are kind of <code>this</code> term.\r
-        * If parameter <code>recursive</code> is <code>false</code> only the\r
-        * direct descendants will be returned. If it is <code>true</code>\r
-        * the direct descendants and there recursive descendants (all descendants)\r
-        * will be returned. \r
-        */\r
-       public Set<T> getGeneralizationOf(boolean recursive);\r
-\r
-}\r
+/**
+ * 
+ */
+package eu.etaxonomy.cdm.model.term;
+
+import java.util.Set;
+import java.util.UUID;
+
+import javax.persistence.Transient;
+
+/**
+ * The common interface which is implemented by {@link DefinedTermBase defined terms} and enumerations
+ * replacing fully {@link DefinedTermBase defined terms}.
+ * 
+ * @author a.mueller
+ * @since 14-Jul-1913
+ */
+public interface ISimpleTerm<T extends ISimpleTerm> {
+
+       @Transient
+       public UUID getUuid();
+       
+       //is static !!
+//     public T getByUuid(UUID uuid);
+
+
+       /**
+        * Returns the defined term this term is a kind of.
+        * Therefore the returned term is a generalization of <code>this</code> term
+        */
+       public T getKindOf();
+       
+
+       /**
+        * Returns all defined terms this term is a direct generalization for.
+        * Therefore the returned terms are kind of <code>this</code> term.
+        */
+       public Set<T> getGeneralizationOf();
+       
+
+       /**
+        * Computes if <code>this</code> term is kind of the <code>ancestor</code> term.
+        * So the <code>ancestor</code> term is direct or indirect (recursive) generalization
+        * of <code>this</code> term.
+        * @param ancestor the potential ancestor term
+        * @see #getKindOf()
+        * @see #getGeneralizationOf()
+        */
+       public boolean isKindOf(T ancestor);
+       
+       /**
+        * Returns all defined terms this term is a generalization for.
+        * Therefore the returned terms are kind of <code>this</code> term.
+        * If parameter <code>recursive</code> is <code>false</code> only the
+        * direct descendants will be returned. If it is <code>true</code>
+        * the direct descendants and there recursive descendants (all descendants)
+        * will be returned. 
+        */
+       public Set<T> getGeneralizationOf(boolean recursive);
+
+}

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/NoDefinedTermClassException.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/NoDefinedTermClassException.java
similarity index 95%
rename from cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/NoDefinedTermClassException.java
rename to cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/NoDefinedTermClassException.java
index 846882f4aa0aafaf2e04901357d110f4ab0ef5b5..ac351c86eb41680ff725c894dc92d6213c84feaf 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/NoDefinedTermClassException.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/NoDefinedTermClassException.java
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */ 
 
-package eu.etaxonomy.cdm.model.common;
+package eu.etaxonomy.cdm.model.term;
 
 public class NoDefinedTermClassException extends Exception {
        private static final long serialVersionUID = 2472032524968009235L;

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/OrderedTerm.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/OrderedTerm.java
similarity index 92%
rename from cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/OrderedTerm.java
rename to cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/OrderedTerm.java
index a09dacdb458d341b9686cd721c818b9524bf4040..1c59e25377ee6d90fac88d176e923ebd823030e4 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/OrderedTerm.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/OrderedTerm.java
@@ -1,112 +1,112 @@
-/**\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
-package eu.etaxonomy.cdm.model.common;\r
-\r
-import java.util.HashMap;\r
-import java.util.Map;\r
-import java.util.UUID;\r
-\r
-import javax.persistence.Entity;\r
-import javax.xml.bind.annotation.XmlAccessType;\r
-import javax.xml.bind.annotation.XmlAccessorType;\r
-import javax.xml.bind.annotation.XmlRootElement;\r
-import javax.xml.bind.annotation.XmlType;\r
-\r
-import org.hibernate.envers.Audited;\r
-\r
-\r
-/**\r
- * @author a.mueller\r
- * @since 2014-11-19\r
- *\r
- */\r
-@XmlAccessorType(XmlAccessType.FIELD)\r
-@XmlType(name = "OrderedTerm")\r
-@XmlRootElement(name = "OrderedTerm")\r
-@Entity\r
-//@Indexed disabled to reduce clutter in indexes, since this type is not used by any search\r
-//@Indexed(index = "eu.etaxonomy.cdm.model.common.DefinedTermBase")\r
-@Audited\r
-public class OrderedTerm extends OrderedTermBase<OrderedTerm>  {\r
-       private static final long serialVersionUID = 5122485867783720769L;\r
-\r
-       //Determination modifier\r
-       public static final UUID uuidDnaQualityHigh = UUID.fromString("ec443c76-5987-4ec5-a66b-da207f70b47f");\r
-       public static final UUID uuidDnaQualityMedium = UUID.fromString("2a174892-1246-4807-9022-71ce8639346b");\r
-       public static final UUID uuidDnaQualityLow = UUID.fromString("a3bf12ff-b041-425f-bdaa-aa51da65eebc");\r
-\r
-\r
-       protected static Map<UUID, OrderedTerm> termMap = null;\r
-\r
-\r
-       protected static OrderedTerm getTermByUuid(UUID uuid){\r
-        if (termMap == null || termMap.isEmpty()){\r
-            return getTermByClassAndUUID(OrderedTerm.class, uuid);\r
-        } else {\r
-                       return termMap.get(uuid);\r
-               }\r
-       }\r
-\r
-\r
-       public static OrderedTerm NewInstance(TermType termType, String description, String label, String labelAbbrev){\r
-               return new OrderedTerm(termType, description, label, labelAbbrev);\r
-       }\r
-\r
-\r
-       public static OrderedTerm NewDnaQualityInstance(String description, String label, String labelAbbrev){\r
-               return new OrderedTerm(TermType.DnaQualityType, description, label, labelAbbrev);\r
-       }\r
-\r
-\r
-//******************* CONSTRUCTOR ***********************************/\r
-\r
-       //for hibernate/javassist use only\r
-       @Deprecated\r
-       protected OrderedTerm(){super(TermType.Unknown);}\r
-\r
-       public OrderedTerm(TermType type, String description, String label, String labelAbbrev) {\r
-               super(type, description, label, labelAbbrev);\r
-       }\r
-\r
-//*************************** TERM MAP *********************/\r
-\r
-\r
-       public static final OrderedTerm DNA_QUALITY_HIGH(){\r
-               return getTermByUuid(uuidDnaQualityHigh);\r
-       }\r
-\r
-       public static final OrderedTerm DNA_QUALITY_MEDIUM(){\r
-               return getTermByUuid(uuidDnaQualityMedium);\r
-       }\r
-\r
-       public static final OrderedTerm DNA_QUALITY_Low(){\r
-               return getTermByUuid(uuidDnaQualityLow);\r
-       }\r
-\r
-       @Override\r
-       public void resetTerms() {\r
-               termMap = null;\r
-       }\r
-\r
-       @Override\r
-       protected void setDefaultTerms(TermVocabulary<OrderedTerm> termVocabulary) {\r
-               if (termMap == null){\r
-                       termMap = new HashMap<UUID, OrderedTerm>();\r
-               }\r
-               for (OrderedTerm term : termVocabulary.getTerms()){\r
-                       termMap.put(term.getUuid(), term);  //TODO casting\r
-               }\r
-       }\r
-\r
-       @Override  //?\r
-       protected int partOfCsvLineIndex(){\r
-               return 5;\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 eu.etaxonomy.cdm.model.term;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import javax.persistence.Entity;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.hibernate.envers.Audited;
+
+
+/**
+ * @author a.mueller
+ * @since 2014-11-19
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "OrderedTerm")
+@XmlRootElement(name = "OrderedTerm")
+@Entity
+//@Indexed disabled to reduce clutter in indexes, since this type is not used by any search
+//@Indexed(index = "eu.etaxonomy.cdm.model.term.DefinedTermBase")
+@Audited
+public class OrderedTerm extends OrderedTermBase<OrderedTerm>  {
+       private static final long serialVersionUID = 5122485867783720769L;
+
+       //Determination modifier
+       public static final UUID uuidDnaQualityHigh = UUID.fromString("ec443c76-5987-4ec5-a66b-da207f70b47f");
+       public static final UUID uuidDnaQualityMedium = UUID.fromString("2a174892-1246-4807-9022-71ce8639346b");
+       public static final UUID uuidDnaQualityLow = UUID.fromString("a3bf12ff-b041-425f-bdaa-aa51da65eebc");
+
+
+       protected static Map<UUID, OrderedTerm> termMap = null;
+
+
+       protected static OrderedTerm getTermByUuid(UUID uuid){
+        if (termMap == null || termMap.isEmpty()){
+            return getTermByClassAndUUID(OrderedTerm.class, uuid);
+        } else {
+                       return termMap.get(uuid);
+               }
+       }
+
+
+       public static OrderedTerm NewInstance(TermType termType, String description, String label, String labelAbbrev){
+               return new OrderedTerm(termType, description, label, labelAbbrev);
+       }
+
+
+       public static OrderedTerm NewDnaQualityInstance(String description, String label, String labelAbbrev){
+               return new OrderedTerm(TermType.DnaQualityType, description, label, labelAbbrev);
+       }
+
+
+//******************* CONSTRUCTOR ***********************************/
+
+       //for hibernate/javassist use only
+       @Deprecated
+       protected OrderedTerm(){super(TermType.Unknown);}
+
+       public OrderedTerm(TermType type, String description, String label, String labelAbbrev) {
+               super(type, description, label, labelAbbrev);
+       }
+
+//*************************** TERM MAP *********************/
+
+
+       public static final OrderedTerm DNA_QUALITY_HIGH(){
+               return getTermByUuid(uuidDnaQualityHigh);
+       }
+
+       public static final OrderedTerm DNA_QUALITY_MEDIUM(){
+               return getTermByUuid(uuidDnaQualityMedium);
+       }
+
+       public static final OrderedTerm DNA_QUALITY_Low(){
+               return getTermByUuid(uuidDnaQualityLow);
+       }
+
+       @Override
+       public void resetTerms() {
+               termMap = null;
+       }
+
+       @Override
+       protected void setDefaultTerms(TermVocabulary<OrderedTerm> termVocabulary) {
+               if (termMap == null){
+                       termMap = new HashMap<>();
+               }
+               for (OrderedTerm term : termVocabulary.getTerms()){
+                       termMap.put(term.getUuid(), term);  //TODO casting
+               }
+       }
+
+       @Override  //?
+       protected int partOfCsvLineIndex(){
+               return 5;
+       }
+
+}

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/OrderedTermBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/OrderedTermBase.java
similarity index 97%
rename from cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/OrderedTermBase.java
rename to cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/OrderedTermBase.java
index f04a27619abd7ee23275295f1d1dfea6e78a61d1..c0f44d146d52fa6087577423f44c961be8687d5d 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/OrderedTermBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/OrderedTermBase.java
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.cdm.model.common;
+package eu.etaxonomy.cdm.model.term;
 
 import javax.persistence.Entity;
 import javax.persistence.Transient;
@@ -20,6 +20,8 @@ import javax.xml.bind.annotation.XmlType;
 import org.apache.log4j.Logger;
 import org.hibernate.envers.Audited;
 
+import eu.etaxonomy.cdm.model.common.CdmBase;
+import eu.etaxonomy.cdm.model.common.RelationshipTermBase;
 import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;
 import eu.etaxonomy.cdm.model.description.State;
 import eu.etaxonomy.cdm.model.location.NamedArea;
@@ -238,7 +240,7 @@ public abstract class OrderedTermBase<T extends OrderedTermBase<?>> extends Defi
      * Clones <i>this</i> OrderedTermBase. This is a shortcut that enables to create
      * a new instance that differs only slightly from <i>this</i> OrderedTermBase.
      *
-     * @see eu.etaxonomy.cdm.model.common.DefinedTermBase#clone()
+     * @see eu.etaxonomy.cdm.model.term.DefinedTermBase#clone()
      * @see java.lang.Object#clone()
      */
     @Override

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/OrderedTermComparator.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/OrderedTermComparator.java
similarity index 96%
rename from cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/OrderedTermComparator.java
rename to cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/OrderedTermComparator.java
index 39c2484364bb14e5dba50cb0786e70fe7936cb79..8f5d4f86fed628ba9cfdb94baa4ec72c6029d3bb 100755 (executable)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/OrderedTermComparator.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/OrderedTermComparator.java
@@ -6,7 +6,7 @@
 * 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 eu.etaxonomy.cdm.model.common;
+package eu.etaxonomy.cdm.model.term;
 
 import java.util.Comparator;
 

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/OrderedTermVocabulary.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/OrderedTermVocabulary.java
similarity index 94%
rename from cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/OrderedTermVocabulary.java
rename to cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/OrderedTermVocabulary.java
index a4109630e3f17b61205bc1b39edc5c626c575277..5282559a86c97cca545becd0ba831dc8d5575465 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/OrderedTermVocabulary.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/OrderedTermVocabulary.java
@@ -1,299 +1,301 @@
-/**\r
-* Copyright (C) 2009 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
-import java.net.URI;\r
-import java.util.Iterator;\r
-import java.util.NoSuchElementException;\r
-import java.util.Set;\r
-import java.util.SortedSet;\r
-import java.util.TreeSet;\r
-\r
-import javax.persistence.Entity;\r
-import javax.persistence.Transient;\r
-import javax.xml.bind.annotation.XmlAccessType;\r
-import javax.xml.bind.annotation.XmlAccessorType;\r
-import javax.xml.bind.annotation.XmlRootElement;\r
-import javax.xml.bind.annotation.XmlType;\r
-\r
-import org.apache.log4j.Logger;\r
-import org.hibernate.envers.Audited;\r
-\r
-/**\r
- * @author a.mueller\r
- *\r
- */\r
-@XmlAccessorType(XmlAccessType.FIELD)\r
-@XmlType(name = "OrderedTermVocabulary")\r
-@XmlRootElement(name = "OrderedTermVocabulary")\r
-@Entity\r
-//@Indexed disabled to reduce clutter in indexes, since this type is not used by any search\r
-//@Indexed(index = "eu.etaxonomy.cdm.model.common.TermVocabulary")\r
-@Audited\r
-public class OrderedTermVocabulary<T extends OrderedTermBase> extends TermVocabulary<T> {\r
-       private static final long serialVersionUID = 7871741306306371242L;\r
-       @SuppressWarnings("unused")\r
-       private static final Logger logger = Logger.getLogger(OrderedTermVocabulary.class);\r
-\r
-// ************************* FACTORY METHODS ***********************************************/\r
-\r
-\r
-       /**\r
-        * @param type the {@link TermType term type}, must be the same as for all included terms\r
-        * @return\r
-        * @throws NullPointerException if type is <code>null</code>\r
-        */\r
-       public static OrderedTermVocabulary NewInstance(TermType type){\r
-               return new OrderedTermVocabulary(type);\r
-       }\r
-\r
-\r
-       /**\r
-        * @param type the {@link TermType term type}, must be the same as for all included terms\r
-        * @param description the description of this vocabulary\r
-        * @param label\r
-        * @param labelAbbrev\r
-        * @param termSourceUri\r
-        * @return\r
-        * @throws NullPointerException if type is <code>null</code>\r
-        */\r
-       public static OrderedTermVocabulary NewInstance(TermType type, String description, String label, String labelAbbrev, URI termSourceUri){\r
-               return new OrderedTermVocabulary(type, description, label, labelAbbrev, termSourceUri);\r
-       }\r
-\r
-\r
-//************************ CONSTRUCTOR *****************************************************/\r
-\r
-       //for hibernate use only\r
-       @Deprecated\r
-       protected OrderedTermVocabulary() {\r
-               super();\r
-       }\r
-\r
-       /**\r
-        * @param term\r
-        * @param label\r
-        * @param termSourceUri\r
-        */\r
-       protected OrderedTermVocabulary(TermType type) {\r
-               super(type);\r
-       }\r
-\r
-       /**\r
-        * @param term\r
-        * @param label\r
-        * @param termSourceUri\r
-        */\r
-       protected OrderedTermVocabulary(TermType type, String term, String label, String labelAbbrev, URI termSourceUri) {\r
-               super(type, term, label, labelAbbrev, termSourceUri);\r
-       }\r
-\r
-\r
-//************************* METHODS **************************************/\r
-\r
-       @Transient\r
-       @Override\r
-       public Set<T> getNewTermSet() {\r
-               return new TreeSet<T>();\r
-       }\r
-\r
-       @Transient\r
-       public SortedSet<T> getOrderedTerms() {\r
-               SortedSet<T> result = getSortedSetOfTerms();\r
-               return result;\r
-       }\r
-\r
-       public SortedSet<T> getHigherAndEqualTerms(T otb) {\r
-               SortedSet<T> result = new TreeSet<>();\r
-               SortedSet<T> sortedSet = getSortedSetOfTerms();\r
-               result.addAll( sortedSet.tailSet(otb));\r
-               return result;\r
-       }\r
-\r
-       public SortedSet<T> getHigherTerms(T otb) {\r
-               SortedSet<T> result = getHigherAndEqualTerms(otb);\r
-               for (DefinedTermBase<?> setObjectUnproxied : terms){\r
-                   @SuppressWarnings("unchecked")\r
-            T setObject = (T)CdmBase.deproxy(setObjectUnproxied, OrderedTermBase.class);\r
-            if (setObject.compareTo(otb) == 0){\r
-                               result.remove(setObject);\r
-                       }\r
-               }\r
-               return result;\r
-       }\r
-\r
-       public SortedSet<T> getLowerAndEqualTerms(T otb) {\r
-               SortedSet<T> result = new TreeSet<>();\r
-               result = getLowerTerms(otb);\r
-               /*SortedSet<T> sortedSet = getSortedSetOfTerms();\r
-\r
-               result.addAll( sortedSet.headSet(otb));*/\r
-               //getLowerTerms Returns a view of the portion of this set whose elements are STRICTLY less than toElement\r
-               for (DefinedTermBase<?> setObjectUnproxied : terms){\r
-                   @SuppressWarnings("unchecked")\r
-            T setObject = (T)CdmBase.deproxy(setObjectUnproxied, OrderedTermBase.class);\r
-            if (setObject.compareTo(otb) == 0){\r
-                               result.add(setObject);\r
-                       }\r
-               }\r
-               return result;\r
-       }\r
-\r
-       public SortedSet<T> getLowerTerms(T otb) {\r
-               /*SortedSet<T> result = getLowerAndEqualTerms(otb);\r
-               for (T setObject : terms){\r
-                       if (setObject.compareTo(otb) == 0){\r
-                               result.remove(setObject);\r
-                       }\r
-               }*/\r
-           SortedSet<T> result = new TreeSet<>();\r
-        SortedSet<T> sortedSet = getSortedSetOfTerms();\r
-        //headSet Returns a view of the portion of this set whose elements are STRICTLY less than toElement\r
-        result.addAll( sortedSet.headSet(otb));\r
-               return result;\r
-       }\r
-\r
-       public SortedSet<T> getEqualTerms(T otb) {\r
-               SortedSet<T> result = new TreeSet<>();\r
-               for (DefinedTermBase<?> setObjectUnproxied : terms){  //use Unproxied to avoid ClassCastException in certain contexts\r
-                   @SuppressWarnings("unchecked")\r
-            T setObject = (T)CdmBase.deproxy(setObjectUnproxied, OrderedTermBase.class);\r
-                       if (setObject.compareTo(otb) == 0){\r
-                               result.add(setObject);\r
-                       }\r
-               }\r
-               return result;\r
-       }\r
-\r
-       public T getNextHigherTerm(T otb) {\r
-               try {\r
-                       return getHigherTerms(otb).first();\r
-               } catch (NoSuchElementException e) {\r
-                       return null;\r
-               }\r
-       }\r
-\r
-       public T getNextLowerTerm(T otb) {\r
-               try {\r
-                       return getLowerTerms(otb).last();\r
-               } catch (NoSuchElementException e) {\r
-                       return null;\r
-               }\r
-       }\r
-\r
-       @Transient\r
-       public T getLowestTerm() {\r
-               try {\r
-                       SortedSet<T> sortedSet = getSortedSetOfTerms();\r
-                       return sortedSet.first();\r
-                       //return ((SortedSet<T>)terms).first();\r
-               } catch (NoSuchElementException e) {\r
-                       return null;\r
-               }\r
-       }\r
-\r
-       @Transient\r
-       public T getHighestTerm() {\r
-               try {\r
-                       SortedSet<T> sortedSet = getSortedSetOfTerms();\r
-                       return sortedSet.last();\r
-               } catch (NoSuchElementException e) {\r
-                       return null;\r
-               }\r
-       }\r
-\r
-       /**\r
-        * Adds a term to the the end / lowest\r
-        * @see eu.etaxonomy.cdm.model.common.TermVocabulary#addTerm(eu.etaxonomy.cdm.model.common.DefinedTermBase)\r
-        */\r
-       @Override\r
-    public void addTerm(T term) {\r
-               SortedSet<T> sortedTerms = getSortedSetOfTerms();\r
-               int lowestOrderIndex;\r
-               if (sortedTerms.isEmpty()){\r
-                       lowestOrderIndex = 0;\r
-               }else{\r
-                       T first = sortedTerms.first();\r
-                       lowestOrderIndex = first.orderIndex;\r
-               }\r
-               term.orderIndex = lowestOrderIndex + 1;\r
-               super.addTerm(term);\r
-       }\r
-\r
-       public void addTermAbove(T termToBeAdded, T lowerTerm)  {\r
-               int orderInd = lowerTerm.orderIndex;\r
-               termToBeAdded.orderIndex = orderInd;\r
-               //increment all orderIndexes of terms below\r
-               Set<T> myTerms = getSortedSetOfTerms();\r
-               for(T term : myTerms){\r
-                   if (term.orderIndex >= orderInd){  //should always be true\r
-                               term.orderIndex++;\r
-                       }\r
-               }\r
-               super.addTerm(termToBeAdded);\r
-       }\r
-\r
-       public void addTermBelow(T termToBeAdded, T higherTerm)  {\r
-               int orderInd = higherTerm.orderIndex;\r
-               termToBeAdded.orderIndex = orderInd + 1;\r
-               //increment all orderIndexes of terms below\r
-               Iterator<T> iterator = getLowerTerms(higherTerm).iterator();\r
-               while(iterator.hasNext()){\r
-                       T term = iterator.next();\r
-                       if (term.orderIndex > orderInd){\r
-                               term.orderIndex++;\r
-                       }\r
-               }\r
-               super.addTerm(termToBeAdded);\r
-       }\r
-\r
-       public void addTermEqualLevel(T termToBeAdded, T equalLevelTerm) {\r
-               int orderInd = equalLevelTerm.orderIndex;\r
-               termToBeAdded.orderIndex = orderInd;\r
-               super.addTerm(termToBeAdded);\r
-       }\r
-\r
-       @Override\r
-       public void removeTerm(T term) {\r
-               if (term == null){\r
-                       return;\r
-               }\r
-               if (this.getEqualTerms(term).size() == 0){\r
-                       Iterator<T> iterator = getLowerTerms(term).iterator();\r
-                       while (iterator.hasNext()){\r
-                               T otb = iterator.next();\r
-                               toBeChangedByObject = otb;\r
-                               otb.decreaseIndex(this);\r
-                               toBeChangedByObject = null;\r
-                       }\r
-               }\r
-               super.removeTerm(term);\r
-       }\r
-\r
-       @Transient\r
-       private T toBeChangedByObject;\r
-\r
-       public boolean indexChangeAllowed(OrderedTermBase orderedTermBase){\r
-               return orderedTermBase == toBeChangedByObject ;\r
-       }\r
-\r
-\r
-       @Transient\r
-       private SortedSet<T> getSortedSetOfTerms(){\r
-               SortedSet<T> sortedSet = new TreeSet<>();\r
-               for (DefinedTermBase<?> termUnproxied : terms){\r
-            @SuppressWarnings("unchecked")\r
-            T term = (T)CdmBase.deproxy(termUnproxied, OrderedTermBase.class);\r
-            sortedSet.add(term);\r
-        }\r
-               return sortedSet;\r
-       }\r
-\r
-}\r
+/**
+* Copyright (C) 2009 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 eu.etaxonomy.cdm.model.term;
+
+import java.net.URI;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import javax.persistence.Entity;
+import javax.persistence.Transient;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.apache.log4j.Logger;
+import org.hibernate.envers.Audited;
+
+import eu.etaxonomy.cdm.model.common.CdmBase;
+
+/**
+ * @author a.mueller
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "OrderedTermVocabulary")
+@XmlRootElement(name = "OrderedTermVocabulary")
+@Entity
+//@Indexed disabled to reduce clutter in indexes, since this type is not used by any search
+//@Indexed(index = "eu.etaxonomy.cdm.model.common.TermVocabulary")
+@Audited
+public class OrderedTermVocabulary<T extends OrderedTermBase> extends TermVocabulary<T> {
+       private static final long serialVersionUID = 7871741306306371242L;
+       @SuppressWarnings("unused")
+       private static final Logger logger = Logger.getLogger(OrderedTermVocabulary.class);
+
+// ************************* FACTORY METHODS ***********************************************/
+
+
+       /**
+        * @param type the {@link TermType term type}, must be the same as for all included terms
+        * @return
+        * @throws NullPointerException if type is <code>null</code>
+        */
+       public static OrderedTermVocabulary NewInstance(TermType type){
+               return new OrderedTermVocabulary(type);
+       }
+
+
+       /**
+        * @param type the {@link TermType term type}, must be the same as for all included terms
+        * @param description the description of this vocabulary
+        * @param label
+        * @param labelAbbrev
+        * @param termSourceUri
+        * @return
+        * @throws NullPointerException if type is <code>null</code>
+        */
+       public static OrderedTermVocabulary NewInstance(TermType type, String description, String label, String labelAbbrev, URI termSourceUri){
+               return new OrderedTermVocabulary(type, description, label, labelAbbrev, termSourceUri);
+       }
+
+
+//************************ CONSTRUCTOR *****************************************************/
+
+       //for hibernate use only
+       @Deprecated
+       protected OrderedTermVocabulary() {
+               super();
+       }
+
+       /**
+        * @param term
+        * @param label
+        * @param termSourceUri
+        */
+       protected OrderedTermVocabulary(TermType type) {
+               super(type);
+       }
+
+       /**
+        * @param term
+        * @param label
+        * @param termSourceUri
+        */
+       protected OrderedTermVocabulary(TermType type, String term, String label, String labelAbbrev, URI termSourceUri) {
+               super(type, term, label, labelAbbrev, termSourceUri);
+       }
+
+
+//************************* METHODS **************************************/
+
+       @Transient
+       @Override
+       public Set<T> getNewTermSet() {
+               return new TreeSet<T>();
+       }
+
+       @Transient
+       public SortedSet<T> getOrderedTerms() {
+               SortedSet<T> result = getSortedSetOfTerms();
+               return result;
+       }
+
+       public SortedSet<T> getHigherAndEqualTerms(T otb) {
+               SortedSet<T> result = new TreeSet<>();
+               SortedSet<T> sortedSet = getSortedSetOfTerms();
+               result.addAll( sortedSet.tailSet(otb));
+               return result;
+       }
+
+       public SortedSet<T> getHigherTerms(T otb) {
+               SortedSet<T> result = getHigherAndEqualTerms(otb);
+               for (DefinedTermBase<?> setObjectUnproxied : terms){
+                   @SuppressWarnings("unchecked")
+            T setObject = (T)CdmBase.deproxy(setObjectUnproxied, OrderedTermBase.class);
+            if (setObject.compareTo(otb) == 0){
+                               result.remove(setObject);
+                       }
+               }
+               return result;
+       }
+
+       public SortedSet<T> getLowerAndEqualTerms(T otb) {
+               SortedSet<T> result = new TreeSet<>();
+               result = getLowerTerms(otb);
+               /*SortedSet<T> sortedSet = getSortedSetOfTerms();
+
+               result.addAll( sortedSet.headSet(otb));*/
+               //getLowerTerms Returns a view of the portion of this set whose elements are STRICTLY less than toElement
+               for (DefinedTermBase<?> setObjectUnproxied : terms){
+                   @SuppressWarnings("unchecked")
+            T setObject = (T)CdmBase.deproxy(setObjectUnproxied, OrderedTermBase.class);
+            if (setObject.compareTo(otb) == 0){
+                               result.add(setObject);
+                       }
+               }
+               return result;
+       }
+
+       public SortedSet<T> getLowerTerms(T otb) {
+               /*SortedSet<T> result = getLowerAndEqualTerms(otb);
+               for (T setObject : terms){
+                       if (setObject.compareTo(otb) == 0){
+                               result.remove(setObject);
+                       }
+               }*/
+           SortedSet<T> result = new TreeSet<>();
+        SortedSet<T> sortedSet = getSortedSetOfTerms();
+        //headSet Returns a view of the portion of this set whose elements are STRICTLY less than toElement
+        result.addAll( sortedSet.headSet(otb));
+               return result;
+       }
+
+       public SortedSet<T> getEqualTerms(T otb) {
+               SortedSet<T> result = new TreeSet<>();
+               for (DefinedTermBase<?> setObjectUnproxied : terms){  //use Unproxied to avoid ClassCastException in certain contexts
+                   @SuppressWarnings("unchecked")
+            T setObject = (T)CdmBase.deproxy(setObjectUnproxied, OrderedTermBase.class);
+                       if (setObject.compareTo(otb) == 0){
+                               result.add(setObject);
+                       }
+               }
+               return result;
+       }
+
+       public T getNextHigherTerm(T otb) {
+               try {
+                       return getHigherTerms(otb).first();
+               } catch (NoSuchElementException e) {
+                       return null;
+               }
+       }
+
+       public T getNextLowerTerm(T otb) {
+               try {
+                       return getLowerTerms(otb).last();
+               } catch (NoSuchElementException e) {
+                       return null;
+               }
+       }
+
+       @Transient
+       public T getLowestTerm() {
+               try {
+                       SortedSet<T> sortedSet = getSortedSetOfTerms();
+                       return sortedSet.first();
+                       //return ((SortedSet<T>)terms).first();
+               } catch (NoSuchElementException e) {
+                       return null;
+               }
+       }
+
+       @Transient
+       public T getHighestTerm() {
+               try {
+                       SortedSet<T> sortedSet = getSortedSetOfTerms();
+                       return sortedSet.last();
+               } catch (NoSuchElementException e) {
+                       return null;
+               }
+       }
+
+       /**
+        * Adds a term to the the end / lowest
+        * @see eu.etaxonomy.cdm.model.term.TermVocabulary#addTerm(eu.etaxonomy.cdm.model.term.DefinedTermBase)
+        */
+       @Override
+    public void addTerm(T term) {
+               SortedSet<T> sortedTerms = getSortedSetOfTerms();
+               int lowestOrderIndex;
+               if (sortedTerms.isEmpty()){
+                       lowestOrderIndex = 0;
+               }else{
+                       T first = sortedTerms.first();
+                       lowestOrderIndex = first.orderIndex;
+               }
+               term.orderIndex = lowestOrderIndex + 1;
+               super.addTerm(term);
+       }
+
+       public void addTermAbove(T termToBeAdded, T lowerTerm)  {
+               int orderInd = lowerTerm.orderIndex;
+               termToBeAdded.orderIndex = orderInd;
+               //increment all orderIndexes of terms below
+               Set<T> myTerms = getSortedSetOfTerms();
+               for(T term : myTerms){
+                   if (term.orderIndex >= orderInd){  //should always be true
+                               term.orderIndex++;
+                       }
+               }
+               super.addTerm(termToBeAdded);
+       }
+
+       public void addTermBelow(T termToBeAdded, T higherTerm)  {
+               int orderInd = higherTerm.orderIndex;
+               termToBeAdded.orderIndex = orderInd + 1;
+               //increment all orderIndexes of terms below
+               Iterator<T> iterator = getLowerTerms(higherTerm).iterator();
+               while(iterator.hasNext()){
+                       T term = iterator.next();
+                       if (term.orderIndex > orderInd){
+                               term.orderIndex++;
+                       }
+               }
+               super.addTerm(termToBeAdded);
+       }
+
+       public void addTermEqualLevel(T termToBeAdded, T equalLevelTerm) {
+               int orderInd = equalLevelTerm.orderIndex;
+               termToBeAdded.orderIndex = orderInd;
+               super.addTerm(termToBeAdded);
+       }
+
+       @Override
+       public void removeTerm(T term) {
+               if (term == null){
+                       return;
+               }
+               if (this.getEqualTerms(term).size() == 0){
+                       Iterator<T> iterator = getLowerTerms(term).iterator();
+                       while (iterator.hasNext()){
+                               T otb = iterator.next();
+                               toBeChangedByObject = otb;
+                               otb.decreaseIndex(this);
+                               toBeChangedByObject = null;
+                       }
+               }
+               super.removeTerm(term);
+       }
+
+       @Transient
+       private T toBeChangedByObject;
+
+       public boolean indexChangeAllowed(OrderedTermBase orderedTermBase){
+               return orderedTermBase == toBeChangedByObject ;
+       }
+
+
+       @Transient
+       private SortedSet<T> getSortedSetOfTerms(){
+               SortedSet<T> sortedSet = new TreeSet<>();
+               for (DefinedTermBase<?> termUnproxied : terms){
+            @SuppressWarnings("unchecked")
+            T term = (T)CdmBase.deproxy(termUnproxied, OrderedTermBase.class);
+            sortedSet.add(term);
+        }
+               return sortedSet;
+       }
+
+}

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Representation.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/Representation.java
similarity index 97%
rename from cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Representation.java
rename to cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/Representation.java
index 6e91f1ef439aadb97477a88512dce4871637df1a..21920a87d93da12e945ff95ef5e7e68e581c360f 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Representation.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/Representation.java
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.cdm.model.common;
+package eu.etaxonomy.cdm.model.term;
 
 
 import javax.persistence.Entity;
@@ -23,6 +23,9 @@ import org.hibernate.envers.Audited;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Store;
 
+import eu.etaxonomy.cdm.model.common.Language;
+import eu.etaxonomy.cdm.model.common.LanguageStringBase;
+
 /**
  * workaround for enumerations
  * @author m.doering

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermBase.java
similarity index 98%
rename from cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermBase.java
rename to cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermBase.java
index 8a4d6e2674056e4018736de2e1683596b0130c52..39bfce952facbcea7b7264a5cb935f21f69a8bf9 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermBase.java
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.cdm.model.common;
+package eu.etaxonomy.cdm.model.term;
 
 import java.net.URI;
 import java.util.HashSet;
@@ -38,6 +38,8 @@ import org.hibernate.envers.Audited;
 import org.hibernate.search.annotations.Analyze;
 import org.hibernate.search.annotations.Field;
 
+import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
+import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.description.TextData;
 import eu.etaxonomy.cdm.strategy.cache.common.IIdentifiableEntityCacheStrategy;
 import eu.etaxonomy.cdm.strategy.cache.common.TermDefaultCacheStrategy;

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermIdInVocabularyComparator.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermIdInVocabularyComparator.java
similarity index 96%
rename from cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermIdInVocabularyComparator.java
rename to cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermIdInVocabularyComparator.java
index 3306b7f54710395aababdd3b742cfb2c18336fe0..5e8e81d44633b65bfbb75459af519fd38286d1de 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermIdInVocabularyComparator.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermIdInVocabularyComparator.java
@@ -6,7 +6,7 @@
 * 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 eu.etaxonomy.cdm.model.common;
+package eu.etaxonomy.cdm.model.term;
 
 import java.util.Comparator;
 

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermLanguageComparator.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermLanguageComparator.java
similarity index 93%
rename from cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermLanguageComparator.java
rename to cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermLanguageComparator.java
index d65b26fcbcbfafc9df85f07114fad5c7c258d029..471017426f9c18e78dd88fa9ecb6e66fe418cad5 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermLanguageComparator.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermLanguageComparator.java
@@ -1,96 +1,98 @@
-/**\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
-import java.util.Comparator;\r
-\r
-import org.apache.log4j.Logger;\r
-\r
-\r
-/**\r
- * @author a.mueller\r
- * @since 14.05.2008\r
- * @version 1.0\r
- */\r
-public class TermLanguageComparator<T extends TermBase> implements Comparator<T> {\r
-       @SuppressWarnings("unused")\r
-       private static Logger logger = Logger.getLogger(TermLanguageComparator.class);\r
-\r
-       private Language defaultLanguage = Language.DEFAULT();\r
-       private Language compareLanguage = Language.DEFAULT();\r
-\r
-\r
-\r
-       /**\r
-        *\r
-        */\r
-       public TermLanguageComparator() {\r
-               // TODO Auto-generated constructor stub\r
-       }\r
-\r
-       /* (non-Javadoc)\r
-        * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)\r
-        */\r
-       @Override\r
-    public int compare(T termbase1, T termbase2) throws RuntimeException{\r
-\r
-           if (termbase1.equals(termbase2)){\r
-               return 0;\r
-           }\r
-               String label1 = makeCompareLabel(termbase1);\r
-               String label2 = makeCompareLabel(termbase2);\r
-\r
-               return label1.compareTo(label2);\r
-       }\r
-\r
-       private String makeCompareLabel(T termbase){\r
-               String result;\r
-               if (termbase == null){\r
-                       return "";\r
-               }\r
-               result = termbase.getLabel(compareLanguage);\r
-               if (result == null){\r
-                       result = termbase.getLabel(defaultLanguage);\r
-               }\r
-               if (result == null){\r
-                       result = "";\r
-               }\r
-               result += termbase.getUuid().toString();\r
-               return result;\r
-       }\r
-\r
-       /**\r
-        * @return the defaultLanguage\r
-        */\r
-       public Language getDefaultLanguage() {\r
-               return defaultLanguage;\r
-       }\r
-\r
-       /**\r
-        * @param defaultLanguage the defaultLanguage to set\r
-        */\r
-       public void setDefaultLanguage(Language defaultLanguage) {\r
-               this.defaultLanguage = defaultLanguage;\r
-       }\r
-\r
-       /**\r
-        * @return the compareLanguage\r
-        */\r
-       public Language getCompareLanguage() {\r
-               return compareLanguage;\r
-       }\r
-\r
-       /**\r
-        * @param compareLanguage the compareLanguage to set\r
-        */\r
-       public void setCompareLanguage(Language compareLanguage) {\r
-               this.compareLanguage = compareLanguage;\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 eu.etaxonomy.cdm.model.term;
+
+import java.util.Comparator;
+
+import org.apache.log4j.Logger;
+
+import eu.etaxonomy.cdm.model.common.Language;
+
+
+/**
+ * @author a.mueller
+ * @since 14.05.2008
+ * @version 1.0
+ */
+public class TermLanguageComparator<T extends TermBase> implements Comparator<T> {
+       @SuppressWarnings("unused")
+       private static Logger logger = Logger.getLogger(TermLanguageComparator.class);
+
+       private Language defaultLanguage = Language.DEFAULT();
+       private Language compareLanguage = Language.DEFAULT();
+
+
+
+       /**
+        *
+        */
+       public TermLanguageComparator() {
+               // TODO Auto-generated constructor stub
+       }
+
+       /* (non-Javadoc)
+        * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
+        */
+       @Override
+    public int compare(T termbase1, T termbase2) throws RuntimeException{
+
+           if (termbase1.equals(termbase2)){
+               return 0;
+           }
+               String label1 = makeCompareLabel(termbase1);
+               String label2 = makeCompareLabel(termbase2);
+
+               return label1.compareTo(label2);
+       }
+
+       private String makeCompareLabel(T termbase){
+               String result;
+               if (termbase == null){
+                       return "";
+               }
+               result = termbase.getLabel(compareLanguage);
+               if (result == null){
+                       result = termbase.getLabel(defaultLanguage);
+               }
+               if (result == null){
+                       result = "";
+               }
+               result += termbase.getUuid().toString();
+               return result;
+       }
+
+       /**
+        * @return the defaultLanguage
+        */
+       public Language getDefaultLanguage() {
+               return defaultLanguage;
+       }
+
+       /**
+        * @param defaultLanguage the defaultLanguage to set
+        */
+       public void setDefaultLanguage(Language defaultLanguage) {
+               this.defaultLanguage = defaultLanguage;
+       }
+
+       /**
+        * @return the compareLanguage
+        */
+       public Language getCompareLanguage() {
+               return compareLanguage;
+       }
+
+       /**
+        * @param compareLanguage the compareLanguage to set
+        */
+       public void setCompareLanguage(Language compareLanguage) {
+               this.compareLanguage = compareLanguage;
+       }
+}

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermType.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermType.java
similarity index 97%
rename from cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermType.java
rename to cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermType.java
index 395c9558709c9510f72a07ed4f16be09055634bb..5c5c7f6f6f882f3787a5bc2851208513bb3c76b3 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermType.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermType.java
@@ -1,596 +1,599 @@
-/**\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
-import java.util.Set;\r
-import java.util.UUID;\r
-\r
-import javax.lang.model.element.Modifier;\r
-import javax.xml.bind.annotation.XmlEnum;\r
-import javax.xml.bind.annotation.XmlEnumValue;\r
-\r
-import org.apache.log4j.Logger;\r
-\r
-import eu.etaxonomy.cdm.model.agent.Institution;\r
-import eu.etaxonomy.cdm.model.description.CategoricalData;\r
-import eu.etaxonomy.cdm.model.description.Character;\r
-import eu.etaxonomy.cdm.model.description.DescriptionBase;\r
-import eu.etaxonomy.cdm.model.description.DescriptionElementBase;\r
-import eu.etaxonomy.cdm.model.description.Distribution;\r
-import eu.etaxonomy.cdm.model.description.MeasurementUnit;\r
-import eu.etaxonomy.cdm.model.description.SpecimenDescription;\r
-import eu.etaxonomy.cdm.model.description.StateData;\r
-import eu.etaxonomy.cdm.model.description.StatisticalMeasurementValue;\r
-import eu.etaxonomy.cdm.model.description.TaxonDescription;\r
-import eu.etaxonomy.cdm.model.description.TextData;\r
-import eu.etaxonomy.cdm.model.location.NamedArea;\r
-import eu.etaxonomy.cdm.model.location.Point;\r
-import eu.etaxonomy.cdm.model.media.Rights;\r
-import eu.etaxonomy.cdm.model.molecular.Amplification;\r
-import eu.etaxonomy.cdm.model.molecular.DnaQuality;\r
-import eu.etaxonomy.cdm.model.name.HybridRelationship;\r
-import eu.etaxonomy.cdm.model.name.NameRelationship;\r
-import eu.etaxonomy.cdm.model.name.NameTypeDesignation;\r
-import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;\r
-import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;\r
-import eu.etaxonomy.cdm.model.name.TaxonName;\r
-import eu.etaxonomy.cdm.model.occurrence.DerivationEvent;\r
-import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;\r
-import eu.etaxonomy.cdm.model.taxon.Synonym;\r
-import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
-import eu.etaxonomy.cdm.model.taxon.TaxonNodeAgentRelation;\r
-import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;\r
-\r
-\r
-\r
-/**\r
- * The term type is used to define the type of a {@link TermBase term}, may it be a vocabulary or a defined term.<BR>\r
- * It is used to define in which context a term may be used. From v3.3 on this replaces the semantic part of the subclasses\r
- * of the class {@link DefinedTermBase}. E.g. before v3.3 a term defining a sex and a term defining a stage had to different\r
- * classes Sex and Stage. With v3.3 they both became {@link DefinedTerm}s but with different types.<BR>\r
- * The type of a term and the type of its vocabulary should be the same. Before v3.3 it was not always\r
- * possible to define what the context of an (empty) vocabulary is.\r
- * In future versions this enum may also be expressed as a term, not an enum. For now the general policy is to\r
- * transform former classes to general classes with enums as their types.\r
- *\r
- * @author a.mueller\r
- * @since 11.06.2013\r
- */\r
-@XmlEnum\r
-public enum TermType implements IEnumTerm<TermType>{\r
-\r
-    //0\r
-    /**\r
-     * Unknown term type is the type to be used if no information is available about the type.\r
-     * In the current model this type should never be used. However, it is a placeholder in case\r
-     * we find an appropriate usage in future.\r
-     */\r
-    @XmlEnumValue("Unknown")\r
-    Unknown(UUID.fromString("b2836c89-3b1d-4758-ba6d-568ef8d6fbc4"), "Unknown Term Type","UNK", null),\r
-\r
-    //1\r
-    /**\r
-     * Term type to represent languages.\r
-     */\r
-    @XmlEnumValue("Language")\r
-    Language(UUID.fromString("5591dc6c-ad1f-4abd-b6c2-4852ea8e46df"), "Language", "LA", null),\r
-\r
-    //2\r
-    /**\r
-     * Term type for areas.\r
-     */\r
-    @XmlEnumValue("NamedArea")\r
-    NamedArea(UUID.fromString("8c9a0bc9-da91-478d-bc8b-44b11565e160"), "Named Area", "NA", null),\r
-\r
-    //3\r
-    /**\r
-     * Term type for taxonomic ranks.\r
-     */\r
-    @XmlEnumValue("Rank")\r
-    Rank(UUID.fromString("8d26b6a9-8a89-45d5-8358-49c3e4f30ade"), "Rank", "RK", null),\r
-\r
-    //4\r
-    /**\r
-     * Term type for descriptive features.\r
-     * @see DescriptionElementBase\r
-     */\r
-    @XmlEnumValue("Feature")\r
-    Feature(UUID.fromString("b866a1d6-f962-4c23-bb8e-a3b66d33aedc"), "Feature", "FE", null),\r
-\r
-    //5\r
-    /**\r
-     * Term type for annotation types.\r
-     * @see Annotation\r
-     */\r
-    @XmlEnumValue("AnnotationType")\r
-    AnnotationType(UUID.fromString("c3aabb64-6174-4152-95b1-7cec57e485cf"), "Annotation Type", "ANT", null),\r
-\r
-    //6\r
-    /**\r
-     * Term type for marker types.\r
-     * @see Marker\r
-     */\r
-    @XmlEnumValue("MarkerType")\r
-    MarkerType(UUID.fromString("d28a1bf8-95ed-483a-8f02-3515b14998e0"), "Marker Type", "MKT", null),\r
-\r
-    //7\r
-    /**\r
-     * Term type for extension types.\r
-     * @see Extension\r
-     */\r
-    @XmlEnumValue("ExtensionType")\r
-    ExtensionType(UUID.fromString("12f5c03b-528a-4909-b81b-e525feabc97c"), "Extension Type", "EXT", null),\r
-\r
-    //8\r
-    /**\r
-     * Term type for derivation event types.\r
-     * @see DerivationEvent\r
-     */\r
-    @XmlEnumValue("DerivationEventType")\r
-    DerivationEventType(UUID.fromString("ba8e4b10-c792-42e7-a3f5-874708f10094"), "Derivation Event Type", "DET", null),\r
-\r
-    //9\r
-    /**\r
-     * Term type for presence or absence status\r
-     * @see Distribution\r
-     */\r
-    @XmlEnumValue("PresenceAbsenceTerm")\r
-    PresenceAbsenceTerm(UUID.fromString("f6b80f88-c8c5-456b-bbd6-d63ecf35606e"), "Presence or Absence Term", "PAT", null),\r
-\r
-    //10\r
-    /**\r
-     * Term type for the taxonomic nomenclatural status of a {@link TaxonName taxon name}.\r
-     * @see NomenclaturalStatus\r
-     */\r
-    @XmlEnumValue("NomenclaturalStatusType")\r
-    NomenclaturalStatusType(UUID.fromString("c1acb71a-1d11-4305-8818-c2268d341742"), "Nomenclatural Status Type", "NST", null),\r
-\r
-    //11\r
-    /**\r
-     * Term type for the type of a name relationship between {@link TaxonName taxon names}\r
-     * @see NameRelationship\r
-     */\r
-    @XmlEnumValue("NameRelationshipType")\r
-    NameRelationshipType(UUID.fromString("acd8189a-23b9-4a53-8f48-1d2aa270a6ba"), "Name Relationship Type", "NRT"),\r
-\r
-    //12\r
-    /**\r
-     * Term type for the type of a hybrid relationship between {@link TaxonName taxon names}\r
-     * @see HybridRelationship\r
-     */\r
-    @XmlEnumValue("HybridRelationshipType")\r
-    HybridRelationshipType(UUID.fromString("aade9e61-eaa1-40fe-9eb1-40f9e8ae1114"), "Hybrid Relationship Type", "HRT"),\r
-\r
-    //13\r
-    /**\r
-     * Term type for the type of a synonym relationship between 2 {@link TaxonBase taxa}\r
-     * @see Synonym#getType()\r
-     * @see TaxonBase\r
-     */\r
-    @XmlEnumValue("SynonymType")\r
-    SynonymType(UUID.fromString("1eb4fee0-7716-4531-a9ed-a95327f1f4bb"), "Synonym Type", "SRT"),\r
-\r
-    //14\r
-    /**\r
-     * Term type for the type of a taxonomic concept relationship between\r
-     * 2 {@link Taxon accepted taxa}  with different secundum referece.\r
-     * @see TaxonRelationship\r
-     * @see Taxon\r
-     */\r
-    @XmlEnumValue("TaxonRelationshipType")\r
-    TaxonRelationshipType(UUID.fromString("2d4b281c-142e-42c5-8eb5-1747592b54d8"), "Taxon Relationship Type", "TRT"),\r
-\r
-    //15\r
-    /**\r
-     * Term type for the type of a typification of a taxonomic name\r
-     * with a rank higher then species.\r
-     * @see eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus\r
-     * @see NameTypeDesignation\r
-     */\r
-    @XmlEnumValue("NameTypeDesignationStatus")\r
-    NameTypeDesignationStatus(UUID.fromString("d3860be6-8a08-4fff-984a-6ee8b42937c9"), "Name Type Designation Status", "NTD"),\r
-\r
-    //16\r
-    /**\r
-     * Term type for the type of a typification of a taxonomic name\r
-     * with a rank equal or lower then species.\r
-     * @see {@link eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus}\r
-     * @see SpecimenTypeDesignation\r
-     */\r
-    @XmlEnumValue("SpecimenTypeDesignationStatus")\r
-    SpecimenTypeDesignationStatus(UUID.fromString("4014d7d4-f2dd-4328-8015-357a1a77c1ed"), "Specimen Type Designation Status", "STD"),\r
-\r
-    //17\r
-    /**\r
-     * Term type for an institution type.\r
-     * @see Institution\r
-     */\r
-    @XmlEnumValue("InstitutionType")\r
-    InstitutionType(UUID.fromString("09d78265-18b5-4352-b154-d2f39e84d3f3"), "Institution Type", "IT", null),\r
-\r
-    //18\r
-    /**\r
-     * Term type for a named area type.\r
-     * @see NamedArea\r
-     * @see eu.etaxonomy.cdm.model.location.NamedAreaType\r
-     */\r
-    @XmlEnumValue("NamedAreaType")\r
-    NamedAreaType(UUID.fromString("6a9aba35-6272-4373-8386-000cf95b729e"), "Named Area Type", "NAT", null),\r
-\r
-    //19\r
-    /**\r
-     * Term type for a named area level.\r
-     * @see NamedArea\r
-     * @see eu.etaxonomy.cdm.model.location.NamedAreaLevel\r
-     */\r
-    @XmlEnumValue("NamedAreaLevel")\r
-    NamedAreaLevel(UUID.fromString("62c16c74-dc79-4970-9031-bb1504be46f5"), "Named Area Level", "NAL", null),\r
-\r
-    //20\r
-    /**\r
-     * Term type for rights.\r
-     * @see Rights\r
-     */\r
-    @XmlEnumValue("RightsType")\r
-    RightsType(UUID.fromString("80e06b04-8d0d-4bd5-bcd6-d35f73c24d55"), "Rights Type", "RT", null),\r
-\r
-    //21\r
-    /**\r
-     * Term type for a measurement unit.\r
-     * @see MeasurementUnit\r
-     */\r
-    @XmlEnumValue("MeasurementUnit")\r
-    MeasurementUnit(UUID.fromString("f9e6c44f-f0d6-428b-9bc0-bb00a6514883"), "Measurement Unit", "MU", null),\r
-\r
-    //22\r
-    /**\r
-     * Term type for a statistical measure.\r
-     * @see eu.etaxonomy.cdm.model.description.StatisticalMeasure\r
-     * @see StatisticalMeasurementValue\r
-     */\r
-    @XmlEnumValue("StatisticalMeasure")\r
-    StatisticalMeasure(UUID.fromString("a22d19cd-a342-4af2-b156-d688a7aa8a6b"), "Statistical Measure", "SM", null),\r
-\r
-    //23\r
-    @XmlEnumValue("MaterialOrMethod")\r
-    MaterialOrMethod(UUID.fromString("285a1406-a606-46b9-b0a4-717748296e50"), "Material or Method", "MOM"),\r
-\r
-    //23a\r
-    @XmlEnumValue("Material")\r
-    Material(UUID.fromString("58499bc1-9808-4e03-861c-4325ca889515"), "Material", "MAT", MaterialOrMethod),\r
-\r
-    //23b\r
-    @XmlEnumValue("Method")\r
-    Method(UUID.fromString("527fc141-7fdf-43c1-9d46-20be13c2590c"), "Method", "MET", MaterialOrMethod),\r
-\r
-\r
-//     //23c TODO required??\r
-//     @XmlEnumValue("PreservationMethod")   --> Method\r
-//     PreservationMethod(UUID.fromString("9cadbee4-22b5-40f5-bb37-e4f5340d246e"), "Preservation method", "PRM", MaterialOrMethod),\r
-//\r
-//     //23d TODO required??  --> Material\r
-//     @XmlEnumValue("PreservationMedium")\r
-//     PreservationMedium(UUID.fromString("c6269a06-6954-4838-a7a7-7f94ba372f3d"), "Preservation medium", "PME", MaterialOrMethod),\r
-\r
-\r
-    //24\r
-    /**\r
-     * This type represents possible modulations for the validity of\r
-     * information pieces ({@link DescriptionElementBase} description elements).\r
-     * It can cover probability ("perhaps"), frequency ("often") intensity ("very"),\r
-     * timing ("spring") and other domains. Its instances can be grouped to build\r
-     * different controlled {@link TermVocabulary term vocabularies}.\r
-     * <P>\r
-     * This class corresponds to GeneralModifierNLDType according to\r
-     * the SDD schema.\r
-     * This class is a generalization of {@link #Scope} and {@link #DeterminationModifier}\r
-     *\r
-     * @see DescriptionElementBase#getModifiers()\r
-     * @see StateData#getModifiers()\r
-     */\r
-    @XmlEnumValue("Modifier")\r
-    Modifier(UUID.fromString("97c4db67-ccf5-40bf-9fb8-83fb7446a364"), "Modifier", "MO", null),\r
-\r
-    //25\r
-    /**\r
-     * The type representing restrictions for the validity of\r
-     * {@link TaxonDescription taxon descriptions} and others.\r
-     * This could include not only Stage (life stage) and Sex\r
-     * but also for instance particular organism parts or seasons.<BR>\r
-     * Scope is a specialization of {@link #Modifier} and a generalization of\r
-     * {@link #Sex} and {@link #Stage}\r
-     *\r
-     * @see Modifier\r
-     * @see DescriptionElementBase\r
-     * @see TaxonDescription\r
-     * @see TaxonDescription#getScopes()\r
-     */\r
-    @XmlEnumValue("Scope")\r
-    Scope(UUID.fromString("8862b66e-9059-4ea4-885e-47a373357075"), "Scope", "SCO", Modifier),\r
-\r
-    //26\r
-    /** The stage type represents the restriction (scope) concerning the life stage for\r
-     * the applicability of {@link TaxonDescription taxon descriptions}. The life stage of a\r
-     * {@link SpecimenOrObservationBase specimen or observation}\r
-     * does not belong to a {@link SpecimenDescription specimen description} but is an attribute of\r
-     * the specimen itself.<BR>\r
-     *\r
-     * Stage is a specialization of {@link #Scope}.\r
-     */\r
-    @XmlEnumValue("Stage")\r
-    Stage(UUID.fromString("cf411ef0-8eee-4461-99e9-c03f4f0a1656"), "Stage", "STG", Scope),\r
-\r
-    //26a\r
-    /** The kind-of-unit type represents the restriction (scope) concerning the part(s) of an\r
-     * organism or the class of materials represented by a specimen or observation or described\r
-     * by a {@link DescriptionBase taxon or specimen description}.<BR>\r
-     * In a {@link DescriptionBase description} it can be used as a {@link #Modifier} or\r
-     * a {@link #Scope} and therefore it is a specialization of {@link #Scope}.<BR>\r
-     * The kind-of-unit of a {@link SpecimenOrObservationBase specimen or observation}\r
-     * should be added as an {@link SpecimenOrObservationBase#getKindOfUnit() kindOfUnit} attribute\r
-     * if the specimen is only a part of an organism and this part is described by the part-of-unit.\r
-     * If only a part of a specimen is described in a {@link SpecimenDescription specimen description}\r
-     * the kind-of-unit should be used as a {@link DescriptionBase description} scope\r
-     * (not yet implemented for specimen descriptions) or as a modifier in a\r
-     * {@link DescriptionElementBase description item}.<BR><BR>\r
-     *\r
-     * Value examples are: fruits, seeds, tissue, gDNA, leaves, ... <BR>\r
-     *\r
-     * KindOfUnit is a Specialization of {@link #Scope}.\r
-     *\r
-     * @see SpecimenOrObservationBase#getKindOfUnit()\r
-     * @see TaxonDescription#getScopes()\r
-     * @see DescriptionElementBase#getModifiers()\r
-     * @see StateData#getModifiers()\r
-     */\r
-    @XmlEnumValue("KindOfUnit")\r
-    KindOfUnit(UUID.fromString("e3edf086-ff7b-4e58-ab1c-d509352fe5f4"), "Kind of Unit", "KOU", Scope),\r
-\r
-\r
-    //27\r
-    /**\r
-     * The type represents the restriction concerning the sex for\r
-     * the applicability of {@link TaxonDescription taxon descriptions} or others. The sex of a\r
-     * {@link SpecimenOrObservationBase specimen or observation}\r
-     * does not belong to a {@link SpecimenDescription specimen description} but is an attribute of\r
-     * the specimen itself.<BR>\r
-     *\r
-     * Sex is a specialization of {@link #Scope}.\r
-     */\r
-    @XmlEnumValue("Sex")\r
-    Sex(UUID.fromString("4046f91f-063b-4b84-b34a-6245c2abc06f"), "Sex", "SEX", Scope),\r
-\r
-    //28\r
-    /**\r
-     * Term type for a reference system of a geographic information.\r
-     * @see Point\r
-     * @see Point#getReferenceSystem()\r
-     */\r
-    @XmlEnumValue("ReferenceSystem")\r
-    ReferenceSystem(UUID.fromString("b8cfa986-ef90-465e-9609-1dadae2a0f5b"), "Reference System", "RS", null),\r
-\r
-    //29\r
-    /**\r
-     * Term type for a term representing a state for {@link CategoricalData categorical data}\r
-     * @see CategoricalData#getStateData()\r
-     * @see StateData#getState()\r
-     */\r
-    @XmlEnumValue("State")\r
-    State(UUID.fromString("5e5b8b60-7300-440a-8706-72fbf31a594f"), "State", "STA", null),\r
-\r
-    //30\r
-    /**\r
-     * Term type representing a natural language term.\r
-     */\r
-    @XmlEnumValue("NaturalLanguageTerm")\r
-    NaturalLanguageTerm(UUID.fromString("9a42ac4e-c175-4633-8b31-74ba8203566a"), "Natural Language Term", "NLT", null),\r
-\r
-\r
-    //31\r
-    /**\r
-     * Term type for a text format.\r
-     * @see TextData\r
-     */\r
-    @XmlEnumValue("TextFormat")\r
-    TextFormat(UUID.fromString("d26cfdb4-baeb-43d0-a51b-a3428d838790"), "Text Format", "TF", null),\r
-\r
-    //32\r
-    /**\r
-     * TODO\r
-     *\r
-     * Determination modifier is a specialization of {@link #Modifier}.\r
-     */\r
-    @XmlEnumValue("DeterminationModifier")\r
-    DeterminationModifier(UUID.fromString("ce910516-bc5d-4ac5-be4d-f3c14c27dd85"), "Determination Modifier", "DMO", Modifier),\r
-\r
-    //33\r
-    /**\r
-     * A marker is a region on a DNA which is addressed in an {@link Amplification amplification process}.\r
-     * It is very similar to a locus, a term which is often used as a synonym. However, a locus is correctly\r
-     * defining one concrete place on a given DNA and therefore is more specific. As this specific information\r
-     * is usually not available the marker information is provided instead.\r
-     * Sometimes marker information includes multiple markers. To handle this it was decided that for such\r
-     * combined markers we need to create a new "parent" marker which includes the single markers as "partOf" marker.\r
-     * However, this works only if you have a distinct marker hierarchy, so futuere\r
-     * @see Amplification\r
-     * @see Amplification#getMarker()\r
-     * @see Sequencing\r
-     * @see Sequencing#getMarker()\r
-     */\r
-    @XmlEnumValue("DnaMarker")\r
-    DnaMarker(UUID.fromString("7fdddb4f-b0ec-4ce0-bc28-dc94e30e8252"), "DNA Marker", "DMA", null),\r
-\r
-  //34\r
-    /**\r
-     * An Identifier Type which can be used as a type in {@link Identifier#type} . It may often be a global unique identifier such as DOI, LSID, Barcode ....\r
-     * But also local identifier types such Sample Designation, Catalog Number,\r
-     * Accession Number, ... are allowed.\r
-     * {@link Identifier#type}\r
-     */\r
-    @XmlEnumValue("IdentifierType")\r
-    IdentifierType(UUID.fromString("d24eda99-0716-467f-aa1e-4c0f2b6c3922"), "Identifier Type", "IDE", null),\r
-\r
-    //35\r
-    /**\r
-     * DNA Quality levels {link {@link DnaQuality#getQualityTerm()} .\r
-     */\r
-    @XmlEnumValue("DnaQualityType")\r
-    DnaQualityType(UUID.fromString("18049372-56e6-4d45-85fc-6a403fecb881"), "DNA Quality Type", "DQT", null),\r
-\r
-    //36\r
-    /**\r
-     * {@link TaxonNodeAgentRelation#getType() TaxonNode Agent Relation Type}.\r
-     * The role an agent plays for a taxon node (classification subtree).\r
-     */\r
-    @XmlEnumValue("DnaQualityType")\r
-    TaxonNodeAgentRelationType(UUID.fromString("8e28881a-0744-41ff-a5ed-31246125c424"), "TaxonNode Agent Relation Type", "TART", null),\r
-\r
-    //37\r
-    /**\r
-     * {@link eu.etaxonomy.cdm.model.description.Character#getStructure() biological structure}.\r
-     * The physical structure that is part of a describing {@link Character}\r
-     * @see TermType#Property\r
-     */\r
-    @XmlEnumValue("Structure")\r
-    Structure(UUID.fromString("f9bc1d2d-85e8-4eab-81f0-603816f5e972"), "Structure", "STRU", null),\r
-\r
-    //38\r
-    /**\r
-     * {@link eu.etaxonomy.cdm.model.description.Character#getProperty() Property} of a descriptive\r
-     * {@link eu.etaxonomy.cdm.model.description.Character character}.<BR>\r
-     * The property that together with a biological structure makes up a descriptive {@link Character character}\r
-     * @see TermType#Property\r
-     */\r
-    @XmlEnumValue("Property")\r
-    Property(UUID.fromString("bbe4730c-4c3f-4d89-9823-d144cc43baf5"), "Property", "PROP", null),\r
-\r
-    //39\r
-    /**\r
-     * A modifier for {@link #Structure structures} used to define\r
-     * spatial and maybe other modifiers.\r
-     * StructureModifier is a specialization of {@link #Modifier}.\r
-     *\r
-     * @see Modifier\r
-     * @see Character#getStructureModifier()\r
-     * @see Character#getStructure()\r
-     */\r
-    @XmlEnumValue("StructureModifier")\r
-    StructureModifier(UUID.fromString("41617e59-17c9-47f5-8fe6-319e117447ce"), "Structure Modifier", "STMO", Modifier),\r
-\r
-\r
-    //37\r
-    /**\r
-     * The type for {@link Character characters}. Is subtype of {@link #Feature}\r
-     * @see TermType#Feature\r
-     * @deprecated not yet clear if really needed, might be replaced in future\r
-     * by {@value TermType#Feature}\r
-     */\r
-    @XmlEnumValue("Character")\r
-    @Deprecated\r
-    Character(UUID.fromString("70baa056-4a3c-4a79-860f-934765c626c4"), "Character", "CHA", Feature),\r
-\r
-\r
-    ;\r
-\r
-\r
-// **************** END ENUM **********************/\r
-\r
-    @SuppressWarnings("unused")\r
-    private static final Logger logger = Logger.getLogger(TermType.class);\r
-\r
-    private TermType(UUID uuid, String defaultString, String key){\r
-        this(uuid, defaultString, key, null);\r
-    }\r
-\r
-    private TermType(UUID uuid, String defaultString, String key, TermType parent){\r
-        delegateVocTerm = EnumeratedTermVoc.addTerm(getClass(), this, uuid, defaultString, key, parent);\r
-    }\r
-\r
-\r
-// *************************** DELEGATE **************************************/\r
-\r
-    private static EnumeratedTermVoc<TermType> delegateVoc;\r
-    private IEnumTerm<TermType> delegateVocTerm;\r
-\r
-    static {\r
-        delegateVoc = EnumeratedTermVoc.getVoc(TermType.class);\r
-    }\r
-\r
-    @Override\r
-    public String getKey(){return delegateVocTerm.getKey();}\r
-\r
-    @Override\r
-    public String getMessage(){return delegateVocTerm.getMessage();}\r
-\r
-    @Override\r
-    public String getMessage(Language language){return delegateVocTerm.getMessage(language);}\r
-\r
-    @Override\r
-    public UUID getUuid() {return delegateVocTerm.getUuid();}\r
-\r
-    @Override\r
-    public TermType getKindOf() {return delegateVocTerm.getKindOf();}\r
-\r
-    @Override\r
-    public Set<TermType> getGeneralizationOf() {return delegateVocTerm.getGeneralizationOf();}\r
-\r
-    @Override\r
-    public boolean isKindOf(TermType ancestor) {return delegateVocTerm.isKindOf(ancestor);     }\r
-\r
-    @Override\r
-    public Set<TermType> getGeneralizationOf(boolean recursive) {return delegateVocTerm.getGeneralizationOf(recursive);}\r
-\r
-    public static TermType getByKey(String key){return delegateVoc.getByKey(key);}\r
-    public static TermType getByUuid(UUID uuid) {return delegateVoc.getByUuid(uuid);}\r
-\r
-    /**\r
-     * Returns a defined term base object corresponding to this term type object\r
-     *\r
-     * @return a defined term base object\r
-     */\r
-    public DefinedTermBase getEmptyDefinedTermBase() {\r
-        switch(this) {\r
-            case DeterminationModifier:\r
-            case StructureModifier:\r
-            case Property:\r
-            case Structure:\r
-            case Modifier:\r
-            case Scope:\r
-            case Sex:\r
-            case Stage:\r
-            case KindOfUnit:\r
-            case IdentifierType:\r
-            case DnaMarker:\r
-                return DefinedTerm.NewInstance(this, null, "Untitled", null);\r
-            case Feature:\r
-                return eu.etaxonomy.cdm.model.description.Feature.NewInstance(null, "Untitled", null);\r
-            case Character:\r
-                return eu.etaxonomy.cdm.model.description.Character.NewInstance(null, null, null, "Untitled", null);\r
-            case State:\r
-                return eu.etaxonomy.cdm.model.description.State.NewInstance(null, "Untitled", null);\r
-            case MarkerType:\r
-                return eu.etaxonomy.cdm.model.common.MarkerType.NewInstance(null, "Untitled", null);\r
-            case ExtensionType:\r
-                return eu.etaxonomy.cdm.model.common.ExtensionType.NewInstance(null, "Untitled", null);\r
-            case NamedArea:\r
-                return eu.etaxonomy.cdm.model.location.NamedArea.NewInstance(null, "Untitled", null);\r
-            case NamedAreaLevel:\r
-                return eu.etaxonomy.cdm.model.location.NamedAreaLevel.NewInstance(null, "Untitled", null);\r
-            case NamedAreaType:\r
-                return eu.etaxonomy.cdm.model.location.NamedAreaType.NewInstance(null, "Untitled", null);\r
-            case PresenceAbsenceTerm:\r
-               return eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm.NewPresenceInstance(null, "Untitled", null);\r
-            default:\r
-                return null;\r
-        }\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 eu.etaxonomy.cdm.model.term;
+
+import java.util.Set;
+import java.util.UUID;
+
+import javax.lang.model.element.Modifier;
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+
+import org.apache.log4j.Logger;
+
+import eu.etaxonomy.cdm.model.agent.Institution;
+import eu.etaxonomy.cdm.model.common.ExtensionType;
+import eu.etaxonomy.cdm.model.common.Language;
+import eu.etaxonomy.cdm.model.common.MarkerType;
+import eu.etaxonomy.cdm.model.description.CategoricalData;
+import eu.etaxonomy.cdm.model.description.Character;
+import eu.etaxonomy.cdm.model.description.DescriptionBase;
+import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
+import eu.etaxonomy.cdm.model.description.Distribution;
+import eu.etaxonomy.cdm.model.description.MeasurementUnit;
+import eu.etaxonomy.cdm.model.description.SpecimenDescription;
+import eu.etaxonomy.cdm.model.description.StateData;
+import eu.etaxonomy.cdm.model.description.StatisticalMeasurementValue;
+import eu.etaxonomy.cdm.model.description.TaxonDescription;
+import eu.etaxonomy.cdm.model.description.TextData;
+import eu.etaxonomy.cdm.model.location.NamedArea;
+import eu.etaxonomy.cdm.model.location.Point;
+import eu.etaxonomy.cdm.model.media.Rights;
+import eu.etaxonomy.cdm.model.molecular.Amplification;
+import eu.etaxonomy.cdm.model.molecular.DnaQuality;
+import eu.etaxonomy.cdm.model.name.HybridRelationship;
+import eu.etaxonomy.cdm.model.name.NameRelationship;
+import eu.etaxonomy.cdm.model.name.NameTypeDesignation;
+import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;
+import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;
+import eu.etaxonomy.cdm.model.name.TaxonName;
+import eu.etaxonomy.cdm.model.occurrence.DerivationEvent;
+import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
+import eu.etaxonomy.cdm.model.taxon.Synonym;
+import eu.etaxonomy.cdm.model.taxon.Taxon;
+import eu.etaxonomy.cdm.model.taxon.TaxonBase;
+import eu.etaxonomy.cdm.model.taxon.TaxonNodeAgentRelation;
+import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
+
+
+
+/**
+ * The term type is used to define the type of a {@link TermBase term}, may it be a vocabulary or a defined term.<BR>
+ * It is used to define in which context a term may be used. From v3.3 on this replaces the semantic part of the subclasses
+ * of the class {@link DefinedTermBase}. E.g. before v3.3 a term defining a sex and a term defining a stage had to different
+ * classes Sex and Stage. With v3.3 they both became {@link DefinedTerm}s but with different types.<BR>
+ * The type of a term and the type of its vocabulary should be the same. Before v3.3 it was not always
+ * possible to define what the context of an (empty) vocabulary is.
+ * In future versions this enum may also be expressed as a term, not an enum. For now the general policy is to
+ * transform former classes to general classes with enums as their types.
+ *
+ * @author a.mueller
+ * @since 11.06.2013
+ */
+@XmlEnum
+public enum TermType implements IEnumTerm<TermType>{
+
+    //0
+    /**
+     * Unknown term type is the type to be used if no information is available about the type.
+     * In the current model this type should never be used. However, it is a placeholder in case
+     * we find an appropriate usage in future.
+     */
+    @XmlEnumValue("Unknown")
+    Unknown(UUID.fromString("b2836c89-3b1d-4758-ba6d-568ef8d6fbc4"), "Unknown Term Type","UNK", null),
+
+    //1
+    /**
+     * Term type to represent languages.
+     */
+    @XmlEnumValue("Language")
+    Language(UUID.fromString("5591dc6c-ad1f-4abd-b6c2-4852ea8e46df"), "Language", "LA", null),
+
+    //2
+    /**
+     * Term type for areas.
+     */
+    @XmlEnumValue("NamedArea")
+    NamedArea(UUID.fromString("8c9a0bc9-da91-478d-bc8b-44b11565e160"), "Named Area", "NA", null),
+
+    //3
+    /**
+     * Term type for taxonomic ranks.
+     */
+    @XmlEnumValue("Rank")
+    Rank(UUID.fromString("8d26b6a9-8a89-45d5-8358-49c3e4f30ade"), "Rank", "RK", null),
+
+    //4
+    /**
+     * Term type for descriptive features.
+     * @see DescriptionElementBase
+     */
+    @XmlEnumValue("Feature")
+    Feature(UUID.fromString("b866a1d6-f962-4c23-bb8e-a3b66d33aedc"), "Feature", "FE", null),
+
+    //5
+    /**
+     * Term type for annotation types.
+     * @see Annotation
+     */
+    @XmlEnumValue("AnnotationType")
+    AnnotationType(UUID.fromString("c3aabb64-6174-4152-95b1-7cec57e485cf"), "Annotation Type", "ANT", null),
+
+    //6
+    /**
+     * Term type for marker types.
+     * @see Marker
+     */
+    @XmlEnumValue("MarkerType")
+    MarkerType(UUID.fromString("d28a1bf8-95ed-483a-8f02-3515b14998e0"), "Marker Type", "MKT", null),
+
+    //7
+    /**
+     * Term type for extension types.
+     * @see Extension
+     */
+    @XmlEnumValue("ExtensionType")
+    ExtensionType(UUID.fromString("12f5c03b-528a-4909-b81b-e525feabc97c"), "Extension Type", "EXT", null),
+
+    //8
+    /**
+     * Term type for derivation event types.
+     * @see DerivationEvent
+     */
+    @XmlEnumValue("DerivationEventType")
+    DerivationEventType(UUID.fromString("ba8e4b10-c792-42e7-a3f5-874708f10094"), "Derivation Event Type", "DET", null),
+
+    //9
+    /**
+     * Term type for presence or absence status
+     * @see Distribution
+     */
+    @XmlEnumValue("PresenceAbsenceTerm")
+    PresenceAbsenceTerm(UUID.fromString("f6b80f88-c8c5-456b-bbd6-d63ecf35606e"), "Presence or Absence Term", "PAT", null),
+
+    //10
+    /**
+     * Term type for the taxonomic nomenclatural status of a {@link TaxonName taxon name}.
+     * @see NomenclaturalStatus
+     */
+    @XmlEnumValue("NomenclaturalStatusType")
+    NomenclaturalStatusType(UUID.fromString("c1acb71a-1d11-4305-8818-c2268d341742"), "Nomenclatural Status Type", "NST", null),
+
+    //11
+    /**
+     * Term type for the type of a name relationship between {@link TaxonName taxon names}
+     * @see NameRelationship
+     */
+    @XmlEnumValue("NameRelationshipType")
+    NameRelationshipType(UUID.fromString("acd8189a-23b9-4a53-8f48-1d2aa270a6ba"), "Name Relationship Type", "NRT"),
+
+    //12
+    /**
+     * Term type for the type of a hybrid relationship between {@link TaxonName taxon names}
+     * @see HybridRelationship
+     */
+    @XmlEnumValue("HybridRelationshipType")
+    HybridRelationshipType(UUID.fromString("aade9e61-eaa1-40fe-9eb1-40f9e8ae1114"), "Hybrid Relationship Type", "HRT"),
+
+    //13
+    /**
+     * Term type for the type of a synonym relationship between 2 {@link TaxonBase taxa}
+     * @see Synonym#getType()
+     * @see TaxonBase
+     */
+    @XmlEnumValue("SynonymType")
+    SynonymType(UUID.fromString("1eb4fee0-7716-4531-a9ed-a95327f1f4bb"), "Synonym Type", "SRT"),
+
+    //14
+    /**
+     * Term type for the type of a taxonomic concept relationship between
+     * 2 {@link Taxon accepted taxa}  with different secundum referece.
+     * @see TaxonRelationship
+     * @see Taxon
+     */
+    @XmlEnumValue("TaxonRelationshipType")
+    TaxonRelationshipType(UUID.fromString("2d4b281c-142e-42c5-8eb5-1747592b54d8"), "Taxon Relationship Type", "TRT"),
+
+    //15
+    /**
+     * Term type for the type of a typification of a taxonomic name
+     * with a rank higher then species.
+     * @see eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus
+     * @see NameTypeDesignation
+     */
+    @XmlEnumValue("NameTypeDesignationStatus")
+    NameTypeDesignationStatus(UUID.fromString("d3860be6-8a08-4fff-984a-6ee8b42937c9"), "Name Type Designation Status", "NTD"),
+
+    //16
+    /**
+     * Term type for the type of a typification of a taxonomic name
+     * with a rank equal or lower then species.
+     * @see {@link eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus}
+     * @see SpecimenTypeDesignation
+     */
+    @XmlEnumValue("SpecimenTypeDesignationStatus")
+    SpecimenTypeDesignationStatus(UUID.fromString("4014d7d4-f2dd-4328-8015-357a1a77c1ed"), "Specimen Type Designation Status", "STD"),
+
+    //17
+    /**
+     * Term type for an institution type.
+     * @see Institution
+     */
+    @XmlEnumValue("InstitutionType")
+    InstitutionType(UUID.fromString("09d78265-18b5-4352-b154-d2f39e84d3f3"), "Institution Type", "IT", null),
+
+    //18
+    /**
+     * Term type for a named area type.
+     * @see NamedArea
+     * @see eu.etaxonomy.cdm.model.location.NamedAreaType
+     */
+    @XmlEnumValue("NamedAreaType")
+    NamedAreaType(UUID.fromString("6a9aba35-6272-4373-8386-000cf95b729e"), "Named Area Type", "NAT", null),
+
+    //19
+    /**
+     * Term type for a named area level.
+     * @see NamedArea
+     * @see eu.etaxonomy.cdm.model.location.NamedAreaLevel
+     */
+    @XmlEnumValue("NamedAreaLevel")
+    NamedAreaLevel(UUID.fromString("62c16c74-dc79-4970-9031-bb1504be46f5"), "Named Area Level", "NAL", null),
+
+    //20
+    /**
+     * Term type for rights.
+     * @see Rights
+     */
+    @XmlEnumValue("RightsType")
+    RightsType(UUID.fromString("80e06b04-8d0d-4bd5-bcd6-d35f73c24d55"), "Rights Type", "RT", null),
+
+    //21
+    /**
+     * Term type for a measurement unit.
+     * @see MeasurementUnit
+     */
+    @XmlEnumValue("MeasurementUnit")
+    MeasurementUnit(UUID.fromString("f9e6c44f-f0d6-428b-9bc0-bb00a6514883"), "Measurement Unit", "MU", null),
+
+    //22
+    /**
+     * Term type for a statistical measure.
+     * @see eu.etaxonomy.cdm.model.description.StatisticalMeasure
+     * @see StatisticalMeasurementValue
+     */
+    @XmlEnumValue("StatisticalMeasure")
+    StatisticalMeasure(UUID.fromString("a22d19cd-a342-4af2-b156-d688a7aa8a6b"), "Statistical Measure", "SM", null),
+
+    //23
+    @XmlEnumValue("MaterialOrMethod")
+    MaterialOrMethod(UUID.fromString("285a1406-a606-46b9-b0a4-717748296e50"), "Material or Method", "MOM"),
+
+    //23a
+    @XmlEnumValue("Material")
+    Material(UUID.fromString("58499bc1-9808-4e03-861c-4325ca889515"), "Material", "MAT", MaterialOrMethod),
+
+    //23b
+    @XmlEnumValue("Method")
+    Method(UUID.fromString("527fc141-7fdf-43c1-9d46-20be13c2590c"), "Method", "MET", MaterialOrMethod),
+
+
+//     //23c TODO required??
+//     @XmlEnumValue("PreservationMethod")   --> Method
+//     PreservationMethod(UUID.fromString("9cadbee4-22b5-40f5-bb37-e4f5340d246e"), "Preservation method", "PRM", MaterialOrMethod),
+//
+//     //23d TODO required??  --> Material
+//     @XmlEnumValue("PreservationMedium")
+//     PreservationMedium(UUID.fromString("c6269a06-6954-4838-a7a7-7f94ba372f3d"), "Preservation medium", "PME", MaterialOrMethod),
+
+
+    //24
+    /**
+     * This type represents possible modulations for the validity of
+     * information pieces ({@link DescriptionElementBase} description elements).
+     * It can cover probability ("perhaps"), frequency ("often") intensity ("very"),
+     * timing ("spring") and other domains. Its instances can be grouped to build
+     * different controlled {@link TermVocabulary term vocabularies}.
+     * <P>
+     * This class corresponds to GeneralModifierNLDType according to
+     * the SDD schema.
+     * This class is a generalization of {@link #Scope} and {@link #DeterminationModifier}
+     *
+     * @see DescriptionElementBase#getModifiers()
+     * @see StateData#getModifiers()
+     */
+    @XmlEnumValue("Modifier")
+    Modifier(UUID.fromString("97c4db67-ccf5-40bf-9fb8-83fb7446a364"), "Modifier", "MO", null),
+
+    //25
+    /**
+     * The type representing restrictions for the validity of
+     * {@link TaxonDescription taxon descriptions} and others.
+     * This could include not only Stage (life stage) and Sex
+     * but also for instance particular organism parts or seasons.<BR>
+     * Scope is a specialization of {@link #Modifier} and a generalization of
+     * {@link #Sex} and {@link #Stage}
+     *
+     * @see Modifier
+     * @see DescriptionElementBase
+     * @see TaxonDescription
+     * @see TaxonDescription#getScopes()
+     */
+    @XmlEnumValue("Scope")
+    Scope(UUID.fromString("8862b66e-9059-4ea4-885e-47a373357075"), "Scope", "SCO", Modifier),
+
+    //26
+    /** The stage type represents the restriction (scope) concerning the life stage for
+     * the applicability of {@link TaxonDescription taxon descriptions}. The life stage of a
+     * {@link SpecimenOrObservationBase specimen or observation}
+     * does not belong to a {@link SpecimenDescription specimen description} but is an attribute of
+     * the specimen itself.<BR>
+     *
+     * Stage is a specialization of {@link #Scope}.
+     */
+    @XmlEnumValue("Stage")
+    Stage(UUID.fromString("cf411ef0-8eee-4461-99e9-c03f4f0a1656"), "Stage", "STG", Scope),
+
+    //26a
+    /** The kind-of-unit type represents the restriction (scope) concerning the part(s) of an
+     * organism or the class of materials represented by a specimen or observation or described
+     * by a {@link DescriptionBase taxon or specimen description}.<BR>
+     * In a {@link DescriptionBase description} it can be used as a {@link #Modifier} or
+     * a {@link #Scope} and therefore it is a specialization of {@link #Scope}.<BR>
+     * The kind-of-unit of a {@link SpecimenOrObservationBase specimen or observation}
+     * should be added as an {@link SpecimenOrObservationBase#getKindOfUnit() kindOfUnit} attribute
+     * if the specimen is only a part of an organism and this part is described by the part-of-unit.
+     * If only a part of a specimen is described in a {@link SpecimenDescription specimen description}
+     * the kind-of-unit should be used as a {@link DescriptionBase description} scope
+     * (not yet implemented for specimen descriptions) or as a modifier in a
+     * {@link DescriptionElementBase description item}.<BR><BR>
+     *
+     * Value examples are: fruits, seeds, tissue, gDNA, leaves, ... <BR>
+     *
+     * KindOfUnit is a Specialization of {@link #Scope}.
+     *
+     * @see SpecimenOrObservationBase#getKindOfUnit()
+     * @see TaxonDescription#getScopes()
+     * @see DescriptionElementBase#getModifiers()
+     * @see StateData#getModifiers()
+     */
+    @XmlEnumValue("KindOfUnit")
+    KindOfUnit(UUID.fromString("e3edf086-ff7b-4e58-ab1c-d509352fe5f4"), "Kind of Unit", "KOU", Scope),
+
+
+    //27
+    /**
+     * The type represents the restriction concerning the sex for
+     * the applicability of {@link TaxonDescription taxon descriptions} or others. The sex of a
+     * {@link SpecimenOrObservationBase specimen or observation}
+     * does not belong to a {@link SpecimenDescription specimen description} but is an attribute of
+     * the specimen itself.<BR>
+     *
+     * Sex is a specialization of {@link #Scope}.
+     */
+    @XmlEnumValue("Sex")
+    Sex(UUID.fromString("4046f91f-063b-4b84-b34a-6245c2abc06f"), "Sex", "SEX", Scope),
+
+    //28
+    /**
+     * Term type for a reference system of a geographic information.
+     * @see Point
+     * @see Point#getReferenceSystem()
+     */
+    @XmlEnumValue("ReferenceSystem")
+    ReferenceSystem(UUID.fromString("b8cfa986-ef90-465e-9609-1dadae2a0f5b"), "Reference System", "RS", null),
+
+    //29
+    /**
+     * Term type for a term representing a state for {@link CategoricalData categorical data}
+     * @see CategoricalData#getStateData()
+     * @see StateData#getState()
+     */
+    @XmlEnumValue("State")
+    State(UUID.fromString("5e5b8b60-7300-440a-8706-72fbf31a594f"), "State", "STA", null),
+
+    //30
+    /**
+     * Term type representing a natural language term.
+     */
+    @XmlEnumValue("NaturalLanguageTerm")
+    NaturalLanguageTerm(UUID.fromString("9a42ac4e-c175-4633-8b31-74ba8203566a"), "Natural Language Term", "NLT", null),
+
+
+    //31
+    /**
+     * Term type for a text format.
+     * @see TextData
+     */
+    @XmlEnumValue("TextFormat")
+    TextFormat(UUID.fromString("d26cfdb4-baeb-43d0-a51b-a3428d838790"), "Text Format", "TF", null),
+
+    //32
+    /**
+     * TODO
+     *
+     * Determination modifier is a specialization of {@link #Modifier}.
+     */
+    @XmlEnumValue("DeterminationModifier")
+    DeterminationModifier(UUID.fromString("ce910516-bc5d-4ac5-be4d-f3c14c27dd85"), "Determination Modifier", "DMO", Modifier),
+
+    //33
+    /**
+     * A marker is a region on a DNA which is addressed in an {@link Amplification amplification process}.
+     * It is very similar to a locus, a term which is often used as a synonym. However, a locus is correctly
+     * defining one concrete place on a given DNA and therefore is more specific. As this specific information
+     * is usually not available the marker information is provided instead.
+     * Sometimes marker information includes multiple markers. To handle this it was decided that for such
+     * combined markers we need to create a new "parent" marker which includes the single markers as "partOf" marker.
+     * However, this works only if you have a distinct marker hierarchy, so futuere
+     * @see Amplification
+     * @see Amplification#getMarker()
+     * @see Sequencing
+     * @see Sequencing#getMarker()
+     */
+    @XmlEnumValue("DnaMarker")
+    DnaMarker(UUID.fromString("7fdddb4f-b0ec-4ce0-bc28-dc94e30e8252"), "DNA Marker", "DMA", null),
+
+  //34
+    /**
+     * An Identifier Type which can be used as a type in {@link Identifier#type} . It may often be a global unique identifier such as DOI, LSID, Barcode ....
+     * But also local identifier types such Sample Designation, Catalog Number,
+     * Accession Number, ... are allowed.
+     * {@link Identifier#type}
+     */
+    @XmlEnumValue("IdentifierType")
+    IdentifierType(UUID.fromString("d24eda99-0716-467f-aa1e-4c0f2b6c3922"), "Identifier Type", "IDE", null),
+
+    //35
+    /**
+     * DNA Quality levels {link {@link DnaQuality#getQualityTerm()} .
+     */
+    @XmlEnumValue("DnaQualityType")
+    DnaQualityType(UUID.fromString("18049372-56e6-4d45-85fc-6a403fecb881"), "DNA Quality Type", "DQT", null),
+
+    //36
+    /**
+     * {@link TaxonNodeAgentRelation#getType() TaxonNode Agent Relation Type}.
+     * The role an agent plays for a taxon node (classification subtree).
+     */
+    @XmlEnumValue("DnaQualityType")
+    TaxonNodeAgentRelationType(UUID.fromString("8e28881a-0744-41ff-a5ed-31246125c424"), "TaxonNode Agent Relation Type", "TART", null),
+
+    //37
+    /**
+     * {@link eu.etaxonomy.cdm.model.description.Character#getStructure() biological structure}.
+     * The physical structure that is part of a describing {@link Character}
+     * @see TermType#Property
+     */
+    @XmlEnumValue("Structure")
+    Structure(UUID.fromString("f9bc1d2d-85e8-4eab-81f0-603816f5e972"), "Structure", "STRU", null),
+
+    //38
+    /**
+     * {@link eu.etaxonomy.cdm.model.description.Character#getProperty() Property} of a descriptive
+     * {@link eu.etaxonomy.cdm.model.description.Character character}.<BR>
+     * The property that together with a biological structure makes up a descriptive {@link Character character}
+     * @see TermType#Property
+     */
+    @XmlEnumValue("Property")
+    Property(UUID.fromString("bbe4730c-4c3f-4d89-9823-d144cc43baf5"), "Property", "PROP", null),
+
+    //39
+    /**
+     * A modifier for {@link #Structure structures} used to define
+     * spatial and maybe other modifiers.
+     * StructureModifier is a specialization of {@link #Modifier}.
+     *
+     * @see Modifier
+     * @see Character#getStructureModifier()
+     * @see Character#getStructure()
+     */
+    @XmlEnumValue("StructureModifier")
+    StructureModifier(UUID.fromString("41617e59-17c9-47f5-8fe6-319e117447ce"), "Structure Modifier", "STMO", Modifier),
+
+
+    //37
+    /**
+     * The type for {@link Character characters}. Is subtype of {@link #Feature}
+     * @see TermType#Feature
+     * @deprecated not yet clear if really needed, might be replaced in future
+     * by {@value TermType#Feature}
+     */
+    @XmlEnumValue("Character")
+    @Deprecated
+    Character(UUID.fromString("70baa056-4a3c-4a79-860f-934765c626c4"), "Character", "CHA", Feature),
+
+
+    ;
+
+
+// **************** END ENUM **********************/
+
+    @SuppressWarnings("unused")
+    private static final Logger logger = Logger.getLogger(TermType.class);
+
+    private TermType(UUID uuid, String defaultString, String key){
+        this(uuid, defaultString, key, null);
+    }
+
+    private TermType(UUID uuid, String defaultString, String key, TermType parent){
+        delegateVocTerm = EnumeratedTermVoc.addTerm(getClass(), this, uuid, defaultString, key, parent);
+    }
+
+
+// *************************** DELEGATE **************************************/
+
+    private static EnumeratedTermVoc<TermType> delegateVoc;
+    private IEnumTerm<TermType> delegateVocTerm;
+
+    static {
+        delegateVoc = EnumeratedTermVoc.getVoc(TermType.class);
+    }
+
+    @Override
+    public String getKey(){return delegateVocTerm.getKey();}
+
+    @Override
+    public String getMessage(){return delegateVocTerm.getMessage();}
+
+    @Override
+    public String getMessage(Language language){return delegateVocTerm.getMessage(language);}
+
+    @Override
+    public UUID getUuid() {return delegateVocTerm.getUuid();}
+
+    @Override
+    public TermType getKindOf() {return delegateVocTerm.getKindOf();}
+
+    @Override
+    public Set<TermType> getGeneralizationOf() {return delegateVocTerm.getGeneralizationOf();}
+
+    @Override
+    public boolean isKindOf(TermType ancestor) {return delegateVocTerm.isKindOf(ancestor);     }
+
+    @Override
+    public Set<TermType> getGeneralizationOf(boolean recursive) {return delegateVocTerm.getGeneralizationOf(recursive);}
+
+    public static TermType getByKey(String key){return delegateVoc.getByKey(key);}
+    public static TermType getByUuid(UUID uuid) {return delegateVoc.getByUuid(uuid);}
+
+    /**
+     * Returns a defined term base object corresponding to this term type object
+     *
+     * @return a defined term base object
+     */
+    public DefinedTermBase getEmptyDefinedTermBase() {
+        switch(this) {
+            case DeterminationModifier:
+            case StructureModifier:
+            case Property:
+            case Structure:
+            case Modifier:
+            case Scope:
+            case Sex:
+            case Stage:
+            case KindOfUnit:
+            case IdentifierType:
+            case DnaMarker:
+                return DefinedTerm.NewInstance(this, null, "Untitled", null);
+            case Feature:
+                return eu.etaxonomy.cdm.model.description.Feature.NewInstance(null, "Untitled", null);
+            case Character:
+                return eu.etaxonomy.cdm.model.description.Character.NewInstance(null, null, null, "Untitled", null);
+            case State:
+                return eu.etaxonomy.cdm.model.description.State.NewInstance(null, "Untitled", null);
+            case MarkerType:
+                return eu.etaxonomy.cdm.model.common.MarkerType.NewInstance(null, "Untitled", null);
+            case ExtensionType:
+                return eu.etaxonomy.cdm.model.common.ExtensionType.NewInstance(null, "Untitled", null);
+            case NamedArea:
+                return eu.etaxonomy.cdm.model.location.NamedArea.NewInstance(null, "Untitled", null);
+            case NamedAreaLevel:
+                return eu.etaxonomy.cdm.model.location.NamedAreaLevel.NewInstance(null, "Untitled", null);
+            case NamedAreaType:
+                return eu.etaxonomy.cdm.model.location.NamedAreaType.NewInstance(null, "Untitled", null);
+            case PresenceAbsenceTerm:
+               return eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm.NewPresenceInstance(null, "Untitled", null);
+            default:
+                return null;
+        }
+    }
+
+}

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermVocabulary.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermVocabulary.java
similarity index 98%
rename from cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermVocabulary.java
rename to cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermVocabulary.java
index a76344d93e43ed9d9a4f56418fafb6624d501d44..a93e7ef12120a1b3329ca52d865e49b53c8577a1 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermVocabulary.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermVocabulary.java
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.cdm.model.common;
+package eu.etaxonomy.cdm.model.term;
 
 
 import java.net.URI;
@@ -44,6 +44,7 @@ import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.IndexedEmbedded;
 
 import eu.etaxonomy.cdm.common.CdmUtils;
+import eu.etaxonomy.cdm.model.common.Language;
 
 
 /**
@@ -237,7 +238,7 @@ public class TermVocabulary<T extends DefinedTermBase> extends TermBase implemen
         * a new instance that differs only slightly from <i>this</i> TermVocabulary.
         * The terms of the original vocabulary are cloned
         *
-        * @see eu.etaxonomy.cdm.model.common.TermBase#clone()
+        * @see eu.etaxonomy.cdm.model.term.TermBase#clone()
         * @see java.lang.Object#clone()
         */
        @Override

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/VocabularyEnum.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/VocabularyEnum.java
similarity index 96%
rename from cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/VocabularyEnum.java
rename to cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/VocabularyEnum.java
index e79542dd9ba32bb324a057c1e4d3ec1655d49556..162fd303de83c07e375c3eacd68e0b8ae9c4066d 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/VocabularyEnum.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/VocabularyEnum.java
@@ -7,10 +7,14 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.cdm.model.common;
+package eu.etaxonomy.cdm.model.term;
 
 import java.util.UUID;
 
+import eu.etaxonomy.cdm.model.common.AnnotationType;
+import eu.etaxonomy.cdm.model.common.ExtensionType;
+import eu.etaxonomy.cdm.model.common.Language;
+import eu.etaxonomy.cdm.model.common.MarkerType;
 import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.description.MeasurementUnit;
 import eu.etaxonomy.cdm.model.description.NaturalLanguageTerm;

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/WrongTermTypeException.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/WrongTermTypeException.java
similarity index 95%
rename from cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/WrongTermTypeException.java
rename to cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/WrongTermTypeException.java
index 842cdc87fd4bb41ad68fc0995690e7b33a4511dd..7ed616f7357c877acb7e0a4df6bb4ce168a5a2b3 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/WrongTermTypeException.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/WrongTermTypeException.java
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */ 
 
-package eu.etaxonomy.cdm.model.common;
+package eu.etaxonomy.cdm.model.term;
 
 public class WrongTermTypeException extends Exception {
        private static final long serialVersionUID = 8691753260804787067L;

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/ITermInitializer.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/init/ITermInitializer.java
similarity index 93%
rename from cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/ITermInitializer.java
rename to cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/init/ITermInitializer.java
index 5db5646e7371fe1a808b8611b8ff94778850eeeb..3726ebc45f2bf75f680183f911a946f6814a7b3a 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/ITermInitializer.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/init/ITermInitializer.java
@@ -1,34 +1,34 @@
-/**\r
-* Copyright (C) 2009 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.init;\r
-\r
-\r
-/**\r
- *  Terms, vocabularies, and representations loaded during termloading by class TermLoader added \r
- *  by the user maybe stored and accessed through this interface.\r
- *  Care must be taken as TermLoader indirectly calls getTermByUuid(uuid) for the default \r
- *  language uuid during the loading process. So make sure that initialize() and getTermByUuid(uuid) \r
- *  are not implemeted in an endless recursion!\r
- * \r
- * @author a.mueller\r
- *\r
- */\r
-public interface ITermInitializer {\r
-       \r
-       /** Initializes the IVocabularStore by making sure that all basic terms that are\r
-        * loaded by the TermLoader are available afterwards.\r
-        * ATTENTION: Be aware that TermLoader indirectly calls getTermByUuid(uuid)\r
-        * for the default language. So make sure that before loading the Terms by the\r
-        * TermLoader getTermByUuid() returns a valid Object without going to endless recursion.\r
-        * @return true if terms where successfully loaded\r
-        */\r
-       public void initialize();\r
-\r
-}\r
+/**
+* Copyright (C) 2009 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 eu.etaxonomy.cdm.model.term.init;
+
+
+/**
+ *  Terms, vocabularies, and representations loaded during termloading by class TermLoader added 
+ *  by the user maybe stored and accessed through this interface.
+ *  Care must be taken as TermLoader indirectly calls getTermByUuid(uuid) for the default 
+ *  language uuid during the loading process. So make sure that initialize() and getTermByUuid(uuid) 
+ *  are not implemeted in an endless recursion!
+ * 
+ * @author a.mueller
+ *
+ */
+public interface ITermInitializer {
+       
+       /** Initializes the IVocabularStore by making sure that all basic terms that are
+        * loaded by the TermLoader are available afterwards.
+        * ATTENTION: Be aware that TermLoader indirectly calls getTermByUuid(uuid)
+        * for the default language. So make sure that before loading the Terms by the
+        * TermLoader getTermByUuid() returns a valid Object without going to endless recursion.
+        * @return true if terms where successfully loaded
+        */
+       public void initialize();
+
+}

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/ITermLoader.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/init/ITermLoader.java
similarity index 89%
rename from cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/ITermLoader.java
rename to cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/init/ITermLoader.java
index d7d731a5ba18f7584ff15f90ea87298afa4b1193..48d2e68e8f4fbbd7004e2e1396c6a0cec662973a 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/ITermLoader.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/init/ITermLoader.java
@@ -7,15 +7,15 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.cdm.model.common.init;
+package eu.etaxonomy.cdm.model.term.init;
 
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
-import eu.etaxonomy.cdm.model.common.VocabularyEnum;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
+import eu.etaxonomy.cdm.model.term.VocabularyEnum;
 
 public interface ITermLoader {
        

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/TermLoader.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/init/TermLoader.java
similarity index 94%
rename from cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/TermLoader.java
rename to cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/init/TermLoader.java
index 5bc3e5101b9615d7a6a0ea069fae1f83ae426547..0615f44506afc964d223686ccb8ab4d1d1f668f4 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/TermLoader.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/init/TermLoader.java
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.cdm.model.common.init;
+package eu.etaxonomy.cdm.model.term.init;
 
 import java.io.IOException;
 import java.lang.reflect.Constructor;
@@ -24,12 +24,12 @@ import org.springframework.stereotype.Component;
 
 import au.com.bytecode.opencsv.CSVReader;
 import eu.etaxonomy.cdm.common.CdmUtils;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
-import eu.etaxonomy.cdm.model.common.OrderedTermBase;
-import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
-import eu.etaxonomy.cdm.model.common.VocabularyEnum;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.OrderedTermBase;
+import eu.etaxonomy.cdm.model.term.OrderedTermVocabulary;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
+import eu.etaxonomy.cdm.model.term.VocabularyEnum;
 
 @Component
 public class TermLoader implements ITermLoader {

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/TermNotFoundException.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/init/TermNotFoundException.java
similarity index 90%
rename from cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/TermNotFoundException.java
rename to cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/init/TermNotFoundException.java
index 918e126829e25a18f68a94b1801d10c7759eacaa..617b19bf3c5763949806a3ec091cd9162c9ab87b 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/TermNotFoundException.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/init/TermNotFoundException.java
@@ -1,53 +1,53 @@
-/**\r
-* Copyright (C) 2009 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.init;\r
-\r
-import org.apache.log4j.Logger;\r
-\r
-/**\r
- * @author AM\r
- *\r
- */\r
-public class TermNotFoundException extends Exception {\r
-       private static final long serialVersionUID = 4288479011948189304L;\r
-       @SuppressWarnings("unused")\r
-       private static final Logger logger = Logger.getLogger(TermNotFoundException.class);\r
-       \r
-       \r
-       /**\r
-        * \r
-        */\r
-       public TermNotFoundException() {\r
-               super();\r
-       }\r
-\r
-       /**\r
-        * @param arg0\r
-        */\r
-       public TermNotFoundException(String arg0) {\r
-               super(arg0);\r
-       }\r
-\r
-       /**\r
-        * @param arg0\r
-        */\r
-       public TermNotFoundException(Throwable arg0) {\r
-               super(arg0);\r
-       }\r
-\r
-       /**\r
-        * @param arg0\r
-        * @param arg1\r
-        */\r
-       public TermNotFoundException(String arg0, Throwable arg1) {\r
-               super(arg0, arg1);\r
-       }\r
-\r
-}\r
+/**
+* Copyright (C) 2009 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 eu.etaxonomy.cdm.model.term.init;
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author AM
+ *
+ */
+public class TermNotFoundException extends Exception {
+       private static final long serialVersionUID = 4288479011948189304L;
+       @SuppressWarnings("unused")
+       private static final Logger logger = Logger.getLogger(TermNotFoundException.class);
+       
+       
+       /**
+        * 
+        */
+       public TermNotFoundException() {
+               super();
+       }
+
+       /**
+        * @param arg0
+        */
+       public TermNotFoundException(String arg0) {
+               super(arg0);
+       }
+
+       /**
+        * @param arg0
+        */
+       public TermNotFoundException(Throwable arg0) {
+               super(arg0);
+       }
+
+       /**
+        * @param arg0
+        * @param arg1
+        */
+       public TermNotFoundException(String arg0, Throwable arg1) {
+               super(arg0, arg1);
+       }
+
+}

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/description/DescriptiveDataSetDefaultCacheStrategy.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/description/DescriptiveDataSetDefaultCacheStrategy.java
index f4de31c0dd7cd4917dbeacde7b490f0b7383f940..43d79d736a6ba6d5f459e385c77f512c0d9a9af1 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/description/DescriptiveDataSetDefaultCacheStrategy.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/description/DescriptiveDataSetDefaultCacheStrategy.java
@@ -11,8 +11,8 @@ package eu.etaxonomy.cdm.strategy.cache.description;
 import java.util.UUID;
 
 import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.Representation;
 import eu.etaxonomy.cdm.model.description.DescriptiveDataSet;
+import eu.etaxonomy.cdm.model.term.Representation;
 import eu.etaxonomy.cdm.strategy.cache.common.IdentifiableEntityDefaultCacheStrategy;
 
 /**

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/NameCacheStrategyBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/NameCacheStrategyBase.java
index 82f9619ff2fa035f5fe6b2b038d283888b878c0d..d4df249c86151ab8c28bffb03b1002e6c0c22141 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/NameCacheStrategyBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/NameCacheStrategyBase.java
@@ -21,7 +21,6 @@ import eu.etaxonomy.cdm.common.CdmUtils;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.Representation;
 import eu.etaxonomy.cdm.model.name.INonViralName;
 import eu.etaxonomy.cdm.model.name.NameRelationship;
 import eu.etaxonomy.cdm.model.name.NameRelationshipType;
@@ -30,6 +29,7 @@ import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
 import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;
 import eu.etaxonomy.cdm.model.reference.Reference;
+import eu.etaxonomy.cdm.model.term.Representation;
 import eu.etaxonomy.cdm.strategy.StrategyBase;
 import eu.etaxonomy.cdm.strategy.cache.HTMLTagRules;
 import eu.etaxonomy.cdm.strategy.cache.TagEnum;

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/TaxonNameDefaultCacheStrategy.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/TaxonNameDefaultCacheStrategy.java
index 4773ab0bc1fc42af5d3e7b5ff5694d1d8cf05707..a0e89b56260f786bdc177ffb831346d2db40611c 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/TaxonNameDefaultCacheStrategy.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/TaxonNameDefaultCacheStrategy.java
@@ -22,7 +22,6 @@ import eu.etaxonomy.cdm.common.UTF8;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.agent.INomenclaturalAuthor;
 import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.Representation;
 import eu.etaxonomy.cdm.model.name.HybridRelationship;
 import eu.etaxonomy.cdm.model.name.INonViralName;
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;
@@ -31,6 +30,7 @@ import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;
 import eu.etaxonomy.cdm.model.reference.Reference;
+import eu.etaxonomy.cdm.model.term.Representation;
 import eu.etaxonomy.cdm.strategy.cache.TagEnum;
 import eu.etaxonomy.cdm.strategy.cache.TaggedText;
 import eu.etaxonomy.cdm.strategy.exceptions.UnknownCdmTypeException;

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/common/TermDefaultCacheStrategy.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/term/TermDefaultCacheStrategy.java
similarity index 91%
rename from cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/common/TermDefaultCacheStrategy.java
rename to cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/term/TermDefaultCacheStrategy.java
index dcb2526be33ebc8a40cf2ac8af828678dbb58cf8..ab90dcb5f8df5da8822c90d92a81e8fdc0de251d 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/common/TermDefaultCacheStrategy.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/term/TermDefaultCacheStrategy.java
@@ -14,8 +14,8 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;\r
 \r
 import eu.etaxonomy.cdm.model.common.Language;\r
-import eu.etaxonomy.cdm.model.common.Representation;\r
-import eu.etaxonomy.cdm.model.common.TermBase;\r
+import eu.etaxonomy.cdm.model.term.Representation;\r
+import eu.etaxonomy.cdm.model.term.TermBase;\r
 \r
 /**\r
  * @author a.mueller\r

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/DeterminationModifierParser.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/DeterminationModifierParser.java
index 35aeb2f28058e2c37f659b41d7f9d7664e9d93df..76e01bd28b4faa852dec149893ea59b9a8c09203 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/DeterminationModifierParser.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/DeterminationModifierParser.java
@@ -10,7 +10,7 @@ package eu.etaxonomy.cdm.strategy.parser;
 
 import org.apache.commons.lang.StringUtils;
 
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.strategy.exceptions.UnknownCdmTypeException;
 
 /**

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/format/TaxonRelationshipFormatterTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/format/TaxonRelationshipFormatterTest.java
index b4bb8840705e9ecd58abf8b1baa289fe86611d28..397529b0a340f079cb81a5622b73d74860413be9 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/format/TaxonRelationshipFormatterTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/format/TaxonRelationshipFormatterTest.java
@@ -18,7 +18,6 @@ import org.junit.Test;
 import eu.etaxonomy.cdm.format.taxon.TaxonRelationshipFormatter;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.Team;
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.VerbatimTimePeriod;
 import eu.etaxonomy.cdm.model.name.Rank;
@@ -29,6 +28,7 @@ import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
 import eu.etaxonomy.cdm.strategy.cache.TaggedCacheHelper;
 import eu.etaxonomy.cdm.strategy.cache.TaggedText;
 

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/ExtensionTypeTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/ExtensionTypeTest.java
index 343cf3dc1c6c1f9ac06cdf0478fe70185f6aad6b..d8090d69cb73c1c79ac12ad80fe297d53ed5436f 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/ExtensionTypeTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/ExtensionTypeTest.java
@@ -22,6 +22,8 @@ import org.junit.BeforeClass;
 import org.junit.Test;\r
 import org.springframework.util.Assert;\r
 \r
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;\r
+\r
 \r
 /**\r
  * @author a.mueller\r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/IdentifiableEntityTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/IdentifiableEntityTest.java
index e0fbd6f5b0b21684e86d1978704d0c07b229cdcc..59c99dc182e8233b9ac3d76e8a699e4ed60a77db 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/IdentifiableEntityTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/IdentifiableEntityTest.java
@@ -28,6 +28,7 @@ import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
 import eu.etaxonomy.cdm.model.reference.Reference;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;\r
 \r
 /**\r
  * @author a.babadshanjan\r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/LanguageTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/LanguageTest.java
index a10762d4a3c4a01feccd4395805dda1a96a1b9cd..7f1671394f177d7e662af21c54287f959581f1a5 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/LanguageTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/LanguageTest.java
@@ -10,6 +10,8 @@ import org.junit.Before;
 import org.junit.BeforeClass;\r
 import org.junit.Test;\r
 \r
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;\r
+\r
 \r
 /**\r
  * @author a.mueller\r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/MarkerTypeTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/MarkerTypeTest.java
index 8448a57b2fd8f5aad65bc66c427e0d66e31c1d96..107fbe560416338ae5abf6a3cbe0423b61be866e 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/MarkerTypeTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/MarkerTypeTest.java
@@ -18,6 +18,8 @@ import org.apache.log4j.Logger;
 import org.junit.BeforeClass;\r
 import org.junit.Test;\r
 \r
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;\r
+\r
 \r
 /**\r
  * @author a.mueller\r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/CategoricalDataTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/CategoricalDataTest.java
index 91f61331518dd72ad58b405f618da496d8c6d97d..9fac50bf5f9c75ae481f06f1cb1e83e26e6f6a00 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/CategoricalDataTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/CategoricalDataTest.java
@@ -21,13 +21,13 @@ import org.junit.Assert;
 import org.junit.Before;\r
 import org.junit.Test;\r
 \r
-import eu.etaxonomy.cdm.model.common.DefinedTerm;\r
 import eu.etaxonomy.cdm.model.common.OriginalSourceType;\r
-import eu.etaxonomy.cdm.model.common.TermType;\r
-import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
 import eu.etaxonomy.cdm.model.media.Media;\r
 import eu.etaxonomy.cdm.model.reference.Reference;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;\r
+import eu.etaxonomy.cdm.model.term.DefinedTerm;\r
+import eu.etaxonomy.cdm.model.term.TermType;\r
+import eu.etaxonomy.cdm.model.term.TermVocabulary;\r
 \r
 /**\r
  * @author a.mueller\r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/DescriptionElementTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/DescriptionElementTest.java
index cddc4742eb2ba3cb543ca1c0adacb1bb5f41cdb8..68a5ca83468da8de806e7a21da45527106c614b0 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/DescriptionElementTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/DescriptionElementTest.java
@@ -17,11 +17,11 @@ import org.junit.Before;
 import org.junit.BeforeClass;\r
 import org.junit.Test;\r
 \r
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;\r
-import eu.etaxonomy.cdm.model.common.DefinedTerm;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
-import eu.etaxonomy.cdm.model.common.TermType;\r
-import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;\r
+import eu.etaxonomy.cdm.model.term.DefinedTerm;\r
+import eu.etaxonomy.cdm.model.term.TermType;\r
+import eu.etaxonomy.cdm.model.term.TermVocabulary;\r
 \r
 \r
 /**\r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/FeatureTreeTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/FeatureTreeTest.java
index b7d05b880853d355decf458e18639998cc2c956a..f7fa3d34cb1955645446885b61622cd00d1ccb29 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/FeatureTreeTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/FeatureTreeTest.java
@@ -12,7 +12,7 @@ import org.junit.Before;
 import org.junit.BeforeClass;\r
 import org.junit.Test;\r
 \r
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;\r
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;\r
 \r
 public class FeatureTreeTest {\r
        @SuppressWarnings("unused")\r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/IndividualsAssociationTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/IndividualsAssociationTest.java
index fe9c65388736293b2643500621b0f964dc0510c8..fdf68241655f5741473ed04854bed8d9a3bf0de3 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/IndividualsAssociationTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/IndividualsAssociationTest.java
@@ -15,10 +15,10 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
 
 /**
  * @author a.mueller

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/PolytomousKeyNodeTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/PolytomousKeyNodeTest.java
index 18f50ebaa0ec3bffb7d0d94cdf5610c3f072fe2b..e7b373105e08981c28f9328a3b3fac64988bcf08 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/PolytomousKeyNodeTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/PolytomousKeyNodeTest.java
@@ -10,8 +10,8 @@ import org.junit.Before;
 import org.junit.BeforeClass;\r
 import org.junit.Test;\r
 \r
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;\r
 \r
 public class PolytomousKeyNodeTest {\r
        @SuppressWarnings("unused")\r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/PolytomousKeyTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/PolytomousKeyTest.java
index e22c6defa40b9797534c8e3d2ccf3d05051b120d..b19dc1f4151d650bf6d3f1c4fc2126f96091bc09 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/PolytomousKeyTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/PolytomousKeyTest.java
@@ -12,8 +12,8 @@ import org.junit.Before;
 import org.junit.BeforeClass;\r
 import org.junit.Test;\r
 \r
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;\r
 \r
 public class PolytomousKeyTest {\r
        private static Logger logger = Logger.getLogger(PolytomousKeyTest.class);\r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/PresenceAbsenceTermTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/PresenceAbsenceTermTest.java
index 67b35ea359e3e35ea730eeff007520d51c95352a..9544f51930323d4b2c62eee0691d98234ef448bc 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/PresenceAbsenceTermTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/PresenceAbsenceTermTest.java
@@ -18,7 +18,7 @@ import org.junit.Assert;
 import org.junit.BeforeClass;\r
 import org.junit.Test;\r
 \r
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;\r
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;\r
 \r
 public class PresenceAbsenceTermTest {\r
        private static final Logger logger = Logger.getLogger(PresenceAbsenceTermTest.class);\r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/QuantitativeDataTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/QuantitativeDataTest.java
index 5288cf3ded3b597e184301d29a948a930e24c285..720e95afc06b0d34ec9a5fa67a426fa086b71a14 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/QuantitativeDataTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/QuantitativeDataTest.java
@@ -15,8 +15,8 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.common.Language;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
 
 /**
  * @author a.mueller

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/TaxonInteractionTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/TaxonInteractionTest.java
index 964341b04bb57f2825b1aa07949cfc04cee1152f..002715a51ec9ee241a44a89a30c55499e6a729d2 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/TaxonInteractionTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/TaxonInteractionTest.java
@@ -15,12 +15,12 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
 
 /**
  * @author a.mueller

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/TextDataTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/TextDataTest.java
index 54cd2a6b4699f15480bfd0f7ab6e2a9072eeab51..27e0fcf81f93a7963fded7a3844c92838f2557c0 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/TextDataTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/TextDataTest.java
@@ -23,10 +23,10 @@ import org.junit.Before;
 import org.junit.BeforeClass;\r
 import org.junit.Test;\r
 \r
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
 import eu.etaxonomy.cdm.model.common.LanguageString;\r
 import eu.etaxonomy.cdm.model.common.MultilanguageText;\r
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;\r
 \r
 /**\r
  * @author a.mueller\r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/location/NamedAreaTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/location/NamedAreaTest.java
index ed91953a3cd7d869f65a96a0bbfcfad9b8da541a..75fc14948ecf3fc03cd96c440152f05085552191 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/location/NamedAreaTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/location/NamedAreaTest.java
@@ -17,10 +17,10 @@ import org.junit.Before;
 import org.junit.BeforeClass;\r
 import org.junit.Test;\r
 \r
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
 import eu.etaxonomy.cdm.model.location.NamedArea.LevelNode;\r
 import eu.etaxonomy.cdm.model.location.NamedArea.NamedAreaNode;\r
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;\r
 \r
 /**\r
  * @author a.mueller\r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/location/PointTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/location/PointTest.java
index 59468b4e06bc77517e3f65502621069b50698b70..fc942a7114bf05375a6bf3dca0eaf79693cbc45b 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/location/PointTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/location/PointTest.java
@@ -17,9 +17,9 @@ import org.junit.Before;
 import org.junit.BeforeClass;\r
 import org.junit.Test;\r
 \r
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;\r
 import eu.etaxonomy.cdm.model.location.Point.Direction;\r
 import eu.etaxonomy.cdm.model.location.Point.Sexagesimal;\r
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;\r
 \r
 /**\r
  * @author a.mueller\r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/location/TdwgAreaTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/location/TdwgAreaTest.java
index bfaaf8d252f8c0e31fd4fd80ca91ec9840f3f748..b57bf1dbe60e5126a4f0bf15b79c857f02492c5c 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/location/TdwgAreaTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/location/TdwgAreaTest.java
@@ -22,10 +22,10 @@ import org.junit.Before;
 import org.junit.BeforeClass;\r
 import org.junit.Test;\r
 \r
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
-import eu.etaxonomy.cdm.model.common.Representation;\r
-import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;\r
+import eu.etaxonomy.cdm.model.term.Representation;\r
+import eu.etaxonomy.cdm.model.term.TermVocabulary;\r
 \r
 /**\r
  * @author a.mueller\r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/media/MediaTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/media/MediaTest.java
index 774dde4ba62b829df9d907e79de31b5a239ffb81..b0ddede16599b9a4957ae3d0160ab1db849448ea 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/media/MediaTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/media/MediaTest.java
@@ -20,10 +20,10 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 
 import eu.etaxonomy.cdm.model.agent.Team;
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.TimePeriod;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
 
 /**
  * @author a.mueller

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/molecular/AmplificationTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/molecular/AmplificationTest.java
index 8b2cecca1ae153a3140e7911aa07a86a034ac356..791b7a625f5c37dd5c630e1f496ff82c96117302 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/molecular/AmplificationTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/molecular/AmplificationTest.java
@@ -16,7 +16,7 @@ import org.junit.Test;
 \r
 import eu.etaxonomy.cdm.model.agent.Institution;\r
 import eu.etaxonomy.cdm.model.agent.Person;\r
-import eu.etaxonomy.cdm.model.common.DefinedTerm;\r
+import eu.etaxonomy.cdm.model.term.DefinedTerm;\r
 import eu.etaxonomy.cdm.strategy.parser.TimePeriodParser;\r
 \r
 public class AmplificationTest {\r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/molecular/MolecularTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/molecular/MolecularTest.java
index c487a7fe8ae48286b8025088911401ca3b5cd668..ee3da13920a94279374f12fc391e9fb2498292b0 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/molecular/MolecularTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/molecular/MolecularTest.java
@@ -19,11 +19,11 @@ import org.junit.Before;
 import org.junit.BeforeClass;\r
 import org.junit.Test;\r
 \r
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;\r
-import eu.etaxonomy.cdm.model.common.DefinedTerm;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
 import eu.etaxonomy.cdm.model.common.LanguageString;\r
 import eu.etaxonomy.cdm.model.media.Media;\r
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;\r
+import eu.etaxonomy.cdm.model.term.DefinedTerm;\r
 \r
 \r
 public class MolecularTest {\r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/BotanicalNameTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/BotanicalNameTest.java
index e9c0c8f972d8a85a55936c383be9300ab2a5908b..90b6ed340c83e3ef049a9130b62e521a95db3e0e 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/BotanicalNameTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/BotanicalNameTest.java
@@ -25,9 +25,9 @@ import org.springframework.beans.BeanUtils;
 
 import eu.etaxonomy.cdm.model.agent.Team;
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
 import eu.etaxonomy.cdm.test.unit.EntityTestBase;
 
 

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/HomotypicalGroupTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/HomotypicalGroupTest.java
index 3427cd4a564a150f6a753e4c9f3d5f71a1f3c789..23681795534462e262cd0dbcc3fa782df2b10e29 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/HomotypicalGroupTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/HomotypicalGroupTest.java
@@ -20,7 +20,7 @@ import org.junit.Before;
 import org.junit.BeforeClass;\r
 import org.junit.Test;\r
 \r
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;\r
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;\r
 \r
 \r
 /**\r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/NameTypeDesignationStatusTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/NameTypeDesignationStatusTest.java
index 29cebb2bd313c6ca68e61cbd44d80e5e3cbcd555..caec5474c4a00c978fb3c9b475d91a162616dffb 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/NameTypeDesignationStatusTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/NameTypeDesignationStatusTest.java
@@ -17,7 +17,7 @@ import org.apache.log4j.Logger;
 import org.junit.BeforeClass;\r
 import org.junit.Test;\r
 \r
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;\r
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;\r
 import eu.etaxonomy.cdm.test.unit.EntityTestBase;\r
 \r
 /**\r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/NameTypeDesignationTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/NameTypeDesignationTest.java
index 575b3c61c1f43c2d181a11d39eca80eec746bc8c..20ca04faf3a4532826de012ff6497c1f4837df1f 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/NameTypeDesignationTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/NameTypeDesignationTest.java
@@ -19,7 +19,7 @@ import org.junit.Before;
 import org.junit.BeforeClass;\r
 import org.junit.Test;\r
 \r
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;\r
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;\r
 \r
 /**\r
  * @author a.babadshanjan\r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/NomenclaturalStatusTypeTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/NomenclaturalStatusTypeTest.java
index 02e1ca80176023dd531f3ce4872d1d6159df4d86..1d4c3f22084593985d6ecaa9d471d4e7fb7e7d63 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/NomenclaturalStatusTypeTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/NomenclaturalStatusTypeTest.java
@@ -16,7 +16,7 @@ import org.apache.log4j.Logger;
 import org.junit.BeforeClass;\r
 import org.junit.Test;\r
 \r
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;\r
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;\r
 import eu.etaxonomy.cdm.test.unit.EntityTestBase;\r
 \r
 /**\r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/NonViralNameTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/NonViralNameTest.java
index 23c741f39c52b695cddbc2da3264015ec7dc0b2b..5ca7f6ca7bde1461b122e9d6f7a3386be714d47e 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/NonViralNameTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/NonViralNameTest.java
@@ -23,10 +23,10 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 
 import eu.etaxonomy.cdm.model.agent.Team;
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.reference.IGeneric;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
 import eu.etaxonomy.cdm.test.unit.EntityTestBase;
 
 /**

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/RankTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/RankTest.java
index a78f8d5d5aec2a479ca90af75665f6796ee88b36..2ae676327f8b92fa592d439ef85be2f80ef98d3d 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/RankTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/RankTest.java
@@ -20,7 +20,7 @@ import org.apache.log4j.Logger;
 import org.junit.BeforeClass;\r
 import org.junit.Test;\r
 \r
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;\r
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;\r
 import eu.etaxonomy.cdm.strategy.exceptions.UnknownCdmTypeException;\r
 import eu.etaxonomy.cdm.test.unit.EntityTestBase;\r
 \r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/SpecimenTypeDesignationTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/SpecimenTypeDesignationTest.java
index 4d8ee288f4d19fa6c76a15370cb9f562fb3b3030..f0c991ea01ce9edbae6873e6f7ceb739e351c3c3 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/SpecimenTypeDesignationTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/SpecimenTypeDesignationTest.java
@@ -22,8 +22,8 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.springframework.beans.BeanUtils;
 
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
 
 /**
  * @author a.babadshanjan

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/TaxonNameTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/TaxonNameTest.java
index 3e0da080d873842d6c6f058b149418d84a7e305e..fced6f55f42dec797ae8988de2666575a8c10fc3 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/TaxonNameTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/TaxonNameTest.java
@@ -22,7 +22,6 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.RelationshipBase.Direction;
 import eu.etaxonomy.cdm.model.description.Feature;
@@ -34,6 +33,7 @@ import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
 import eu.etaxonomy.cdm.strategy.cache.name.INameCacheStrategy;
 
 /**

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/TypeDesignationBaseTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/TypeDesignationBaseTest.java
index 573d7a93034820d2d0102500162e441340cfe7e6..88b9ca5c70fc0cc7f644e15dd28600be07f40720 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/TypeDesignationBaseTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/TypeDesignationBaseTest.java
@@ -12,12 +12,12 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
 
 /**
  * @author a.mueller

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/occurrence/SpecimenTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/occurrence/SpecimenTest.java
index 73cab164046a7865cb527aff2a7eed920a40f1fc..6a70adba98f344188dab35af677fb7201360416d 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/occurrence/SpecimenTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/occurrence/SpecimenTest.java
@@ -31,7 +31,6 @@ import com.ibm.lsid.MalformedLSIDException;
 
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.common.Annotation;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.Extension;
 import eu.etaxonomy.cdm.model.common.IdentifiableSource;
 import eu.etaxonomy.cdm.model.common.LSID;
@@ -47,6 +46,7 @@ import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;
 import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 
 /**
  * @author a.mueller

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/HomotypicGroupTaxonComparatorTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/HomotypicGroupTaxonComparatorTest.java
index 586c31437ec175fe203207ca9f2088a4d6f26a46..3a9b5439f6556fefd49f57fe3e66a3cdf1d194e0 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/HomotypicGroupTaxonComparatorTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/HomotypicGroupTaxonComparatorTest.java
@@ -21,7 +21,6 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.common.VerbatimTimePeriod;
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
 import eu.etaxonomy.cdm.model.name.INonViralName;
@@ -33,6 +32,7 @@ import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
 //import eu.etaxonomy.cdm.model.reference.Book;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
 
 /**
  * @author a.mueller

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonBaseTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonBaseTest.java
index 4080a4b4e85161de938c7ca3bfe8a9cce94048a4..a8dd81e7e406d4cadcb715915d35b0b509d29260 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonBaseTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonBaseTest.java
@@ -21,7 +21,6 @@ import org.junit.Before;
 import org.junit.BeforeClass;\r
 import org.junit.Test;\r
 \r
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;\r
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;\r
 import eu.etaxonomy.cdm.model.name.IBotanicalName;\r
 import eu.etaxonomy.cdm.model.name.IZoologicalName;\r
@@ -30,6 +29,7 @@ import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.name.TaxonNameFactory;\r
 import eu.etaxonomy.cdm.model.reference.Reference;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;\r
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;\r
 import eu.etaxonomy.cdm.test.unit.EntityTestBase;\r
 \r
 /**\r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonComparatorTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonComparatorTest.java
index baf27f789dcc35ec48454efaad9b86b3243960f6..9183a6eb533b324d3d1a13f6d101920e381d5c9a 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonComparatorTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonComparatorTest.java
@@ -20,7 +20,6 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 
 import eu.etaxonomy.cdm.model.agent.Person;
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.common.VerbatimTimePeriod;
 import eu.etaxonomy.cdm.model.name.IBotanicalName;
 import eu.etaxonomy.cdm.model.name.IZoologicalName;
@@ -30,6 +29,7 @@ import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
 //import eu.etaxonomy.cdm.model.reference.Book;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
 
 /**
  * @author a.mueller

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonRelationshipTypeTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonRelationshipTypeTest.java
index 71f86f9cf9aba798b81d13d558a8a979a0575bff..8a929b65167393ae5fa88d938671645ef17cbe5b 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonRelationshipTypeTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonRelationshipTypeTest.java
@@ -14,8 +14,8 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 
 import eu.etaxonomy.cdm.common.UTF8;
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.common.Language;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
 
 /**
  * @author a.mueller

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonTest.java
index 8d738936fca694d7974725ac07847822b3d542b4..74269f996c2c98df09816f4e6461ed3f00b73bfa 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonTest.java
@@ -25,7 +25,6 @@ import org.junit.Test;
 import org.springframework.beans.BeanUtils;
 
 import eu.etaxonomy.cdm.model.agent.Person;
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
 import eu.etaxonomy.cdm.model.name.IBotanicalName;
@@ -36,6 +35,7 @@ import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
 //import eu.etaxonomy.cdm.model.reference.Book;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
 import eu.etaxonomy.cdm.test.unit.EntityTestBase;
 
 public class TaxonTest extends EntityTestBase {

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/DefaultTermInitializerTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/term/DefaultTermInitializerTest.java
similarity index 82%
rename from cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/DefaultTermInitializerTest.java
rename to cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/term/DefaultTermInitializerTest.java
index 03d94f08e1cbb1fb2ee510673122f45b4dc8c4db..9c17bd6a16249c93e7945d710f7895405818afa0 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/DefaultTermInitializerTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/term/DefaultTermInitializerTest.java
@@ -1,49 +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
-import static org.junit.Assert.*;\r
-\r
-import org.apache.log4j.Logger;\r
-import org.junit.Before;\r
-import org.junit.Ignore;\r
-import org.junit.Test;\r
-\r
-\r
-/**\r
- * @author a.mueller\r
- * @since 02.03.2009\r
- */\r
-public class DefaultTermInitializerTest {\r
-       @SuppressWarnings("unused")\r
-       private static final Logger logger = Logger.getLogger(DefaultTermInitializerTest.class);\r
-\r
-       /**\r
-        * @throws java.lang.Exception\r
-        */\r
-       @Before\r
-       public void setUp() throws Exception {\r
-       }\r
-\r
-\r
-       /**\r
-        * Test method for {@link eu.etaxonomy.cdm.model.common.DefaultTermInitializer#initialize()}.\r
-        */\r
-       @Test\r
-       @Ignore // does not run yet in a test suite as the Language.DEFAULT() is not null then\r
-       public void testInitialize() {\r
-               assertNull("At the beginning of the initialization test the default language should still be null but is not", Language.DEFAULT());\r
-               DefaultTermInitializer initalizer = new DefaultTermInitializer();\r
-               initalizer.initialize();\r
-               assertNotNull("Default language should be english but is null", Language.DEFAULT());\r
-               TermVocabulary<Language> voc = Language.DEFAULT().getVocabulary();\r
-               assertNotNull("language for language vocabulary representation was null but must be default language", voc.getRepresentation(Language.DEFAULT()));      \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 eu.etaxonomy.cdm.model.term;
+
+import static org.junit.Assert.*;
+
+import org.apache.log4j.Logger;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import eu.etaxonomy.cdm.model.common.Language;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
+
+
+/**
+ * @author a.mueller
+ * @since 02.03.2009
+ */
+public class DefaultTermInitializerTest {
+       @SuppressWarnings("unused")
+       private static final Logger logger = Logger.getLogger(DefaultTermInitializerTest.class);
+
+       /**
+        * @throws java.lang.Exception
+        */
+       @Before
+       public void setUp() throws Exception {
+       }
+
+
+       /**
+        * Test method for {@link eu.etaxonomy.cdm.model.term.DefaultTermInitializer#initialize()}.
+        */
+       @Test
+       @Ignore // does not run yet in a test suite as the Language.DEFAULT() is not null then
+       public void testInitialize() {
+               assertNull("At the beginning of the initialization test the default language should still be null but is not", Language.DEFAULT());
+               DefaultTermInitializer initalizer = new DefaultTermInitializer();
+               initalizer.initialize();
+               assertNotNull("Default language should be english but is null", Language.DEFAULT());
+               TermVocabulary<Language> voc = Language.DEFAULT().getVocabulary();
+               assertNotNull("language for language vocabulary representation was null but must be default language", voc.getRepresentation(Language.DEFAULT()));      
+       }
+}

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/DefinedTermBaseTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/term/DefinedTermBaseTest.java
similarity index 90%
rename from cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/DefinedTermBaseTest.java
rename to cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/term/DefinedTermBaseTest.java
index 152c6a040f15a169989876afd40428954a5273f2..4e1989ed1022c66464801ebed4eddab6fe5850cb 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/DefinedTermBaseTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/term/DefinedTermBaseTest.java
@@ -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.common;\r
-\r
-import org.apache.log4j.Logger;\r
-\r
-import eu.etaxonomy.cdm.test.unit.EntityTestBase;\r
-\r
-public class DefinedTermBaseTest extends EntityTestBase {\r
-       @SuppressWarnings("unused")\r
-    private static Logger logger = Logger.getLogger(DefinedTermBaseTest.class);\r
-\r
-       /** ******* TEST ************************************ */\r
-\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 eu.etaxonomy.cdm.model.term;
+
+import org.apache.log4j.Logger;
+
+import eu.etaxonomy.cdm.test.unit.EntityTestBase;
+
+public class DefinedTermBaseTest extends EntityTestBase {
+       @SuppressWarnings("unused")
+    private static Logger logger = Logger.getLogger(DefinedTermBaseTest.class);
+
+       /** ******* TEST ************************************ */
+
+
+
+}

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/OrderedTermBaseTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/term/OrderedTermBaseTest.java
similarity index 92%
rename from cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/OrderedTermBaseTest.java
rename to cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/term/OrderedTermBaseTest.java
index 56cd3df8a469379421ea4cb6c2f4acbd4bf5827a..b0817be6c8cb69bee83589ec2f306a5cb4a7f210 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/OrderedTermBaseTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/term/OrderedTermBaseTest.java
@@ -1,126 +1,131 @@
-/**\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
-import static org.junit.Assert.assertEquals;\r
-import static org.junit.Assert.assertFalse;\r
-import static org.junit.Assert.assertNotNull;\r
-import static org.junit.Assert.assertTrue;\r
-\r
-import org.apache.log4j.Logger;\r
-import org.junit.Before;\r
-import org.junit.BeforeClass;\r
-import org.junit.Test;\r
-\r
-import eu.etaxonomy.cdm.model.name.Rank;\r
-import eu.etaxonomy.cdm.test.unit.EntityTestBase;\r
-\r
-public class OrderedTermBaseTest extends EntityTestBase {\r
-       @SuppressWarnings("unused")\r
-       private static final Logger logger = Logger.getLogger(OrderedTermBaseTest.class);\r
-\r
-       private OrderedTermBase otb1;\r
-       private OrderedTermBase otb2;\r
-       private OrderedTermBase otb3;\r
-       private OrderedTermBase otb4;\r
-\r
-       @BeforeClass\r
-       public static void setUpBeforeClass() {\r
-               DefaultTermInitializer vocabularyStore = new DefaultTermInitializer();\r
-               vocabularyStore.initialize();\r
-       }\r
-\r
-       @Before\r
-       public void setUp() throws Exception {\r
-               otb1 = new DerivedOrderedTermBase();\r
-               otb2 = new DerivedOrderedTermBase(TermType.Unknown, "term", "label", null);\r
-               otb3 = new DerivedOrderedTermBase();\r
-               otb4 = new DerivedOrderedTermBase();\r
-\r
-               otb1.orderIndex = 1;\r
-               otb2.orderIndex = 4;\r
-               otb3.orderIndex = 4;\r
-               otb4.orderIndex = 5;\r
-       }\r
-\r
-       private class DerivedOrderedTermBase extends OrderedTermBase<DerivedOrderedTermBase>{\r
-               private DerivedOrderedTermBase(){\r
-                       super(TermType.Unknown);\r
-               }\r
-               private DerivedOrderedTermBase(TermType type, String term, String label, String labelAbbrev){\r
-                       super(type, term, label, labelAbbrev);\r
-               }\r
-               @Override\r
-               protected void setDefaultTerms(TermVocabulary<DerivedOrderedTermBase> termVocabulary) {}\r
-               @Override\r
-               public void resetTerms() {};\r
-       }\r
-\r
-/************ TESTS *************************************/\r
-\r
-       @Test\r
-       public final void testOrderedTermBase() {\r
-               assertNotNull(otb1);\r
-       }\r
-\r
-       @Test\r
-       public final void testOrderedTermBaseStringString() {\r
-               assertNotNull(otb2);\r
-               assertEquals("label", otb2.getLabel());\r
-               //TODO assertEquals("term", otb2.getD);\r
-       }\r
-\r
-       @Test\r
-       public final void testCompareTo() {\r
-               //since an exception is thrown when comparing OrderedTermBase that do not belong\r
-               //to the same vocabulary this dummy vocabulary is added\r
-               OrderedTermVocabulary<OrderedTermBase<?>> voc = new OrderedTermVocabulary();\r
-               otb1.vocabulary = voc;\r
-               otb2.vocabulary = voc;\r
-               otb3.vocabulary = voc;\r
-\r
-               int comp = otb1.compareTo(otb2);\r
-               assertTrue("expected:  1 > 4", comp > 0  );\r
-               assertTrue("expected:  1 = 1", otb1.compareTo(otb1) == 0  );\r
-               assertTrue("expected:  4 = 4", otb2.compareTo(otb3) == 0  );\r
-               assertTrue("expected:  5 < 1", otb3.compareTo(otb1) < 0  );\r
-\r
-               Rank genus = Rank.GENUS();\r
-               Rank species = Rank.SPECIES();\r
-               Rank kingdom = Rank.KINGDOM();\r
-               Rank family = Rank.FAMILY();\r
-\r
-               comp = genus.compareTo(species);\r
-               assertTrue( comp > 0  );\r
-               assertTrue(genus.compareTo(genus) == 0  );\r
-               assertTrue(family.compareTo(kingdom) < 0  );\r
-       }\r
-\r
-\r
-       @Test\r
-       public final void testDecreaseVoc() {\r
-               OrderedTermVocabulary<OrderedTermBase<?>> voc = new OrderedTermVocabulary();\r
-               int before = otb1.orderIndex;\r
-               otb1.decreaseIndex(voc);\r
-               int after = otb1.orderIndex;\r
-               assertEquals(before, after);\r
-       }\r
-\r
-       @Test\r
-       public final void testIncrementVoc() {\r
-               OrderedTermVocabulary<OrderedTermBase<?>> voc = new OrderedTermVocabulary();\r
-               assertFalse(voc.indexChangeAllowed(otb1));\r
-               int before = otb1.orderIndex;\r
-               otb1.incrementIndex(voc);\r
-               int after = otb1.orderIndex;\r
-               assertEquals(before, after);\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 eu.etaxonomy.cdm.model.term;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.apache.log4j.Logger;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import eu.etaxonomy.cdm.model.name.Rank;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
+import eu.etaxonomy.cdm.model.term.OrderedTermBase;
+import eu.etaxonomy.cdm.model.term.OrderedTermVocabulary;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
+import eu.etaxonomy.cdm.test.unit.EntityTestBase;
+
+public class OrderedTermBaseTest extends EntityTestBase {
+       @SuppressWarnings("unused")
+       private static final Logger logger = Logger.getLogger(OrderedTermBaseTest.class);
+
+       private OrderedTermBase otb1;
+       private OrderedTermBase otb2;
+       private OrderedTermBase otb3;
+       private OrderedTermBase otb4;
+
+       @BeforeClass
+       public static void setUpBeforeClass() {
+               DefaultTermInitializer vocabularyStore = new DefaultTermInitializer();
+               vocabularyStore.initialize();
+       }
+
+       @Before
+       public void setUp() throws Exception {
+               otb1 = new DerivedOrderedTermBase();
+               otb2 = new DerivedOrderedTermBase(TermType.Unknown, "term", "label", null);
+               otb3 = new DerivedOrderedTermBase();
+               otb4 = new DerivedOrderedTermBase();
+
+               otb1.orderIndex = 1;
+               otb2.orderIndex = 4;
+               otb3.orderIndex = 4;
+               otb4.orderIndex = 5;
+       }
+
+       private class DerivedOrderedTermBase extends OrderedTermBase<DerivedOrderedTermBase>{
+               private DerivedOrderedTermBase(){
+                       super(TermType.Unknown);
+               }
+               private DerivedOrderedTermBase(TermType type, String term, String label, String labelAbbrev){
+                       super(type, term, label, labelAbbrev);
+               }
+               @Override
+               protected void setDefaultTerms(TermVocabulary<DerivedOrderedTermBase> termVocabulary) {}
+               @Override
+               public void resetTerms() {};
+       }
+
+/************ TESTS *************************************/
+
+       @Test
+       public final void testOrderedTermBase() {
+               assertNotNull(otb1);
+       }
+
+       @Test
+       public final void testOrderedTermBaseStringString() {
+               assertNotNull(otb2);
+               assertEquals("label", otb2.getLabel());
+               //TODO assertEquals("term", otb2.getD);
+       }
+
+       @Test
+       public final void testCompareTo() {
+               //since an exception is thrown when comparing OrderedTermBase that do not belong
+               //to the same vocabulary this dummy vocabulary is added
+               OrderedTermVocabulary<OrderedTermBase<?>> voc = new OrderedTermVocabulary();
+               otb1.vocabulary = voc;
+               otb2.vocabulary = voc;
+               otb3.vocabulary = voc;
+
+               int comp = otb1.compareTo(otb2);
+               assertTrue("expected:  1 > 4", comp > 0  );
+               assertTrue("expected:  1 = 1", otb1.compareTo(otb1) == 0  );
+               assertTrue("expected:  4 = 4", otb2.compareTo(otb3) == 0  );
+               assertTrue("expected:  5 < 1", otb3.compareTo(otb1) < 0  );
+
+               Rank genus = Rank.GENUS();
+               Rank species = Rank.SPECIES();
+               Rank kingdom = Rank.KINGDOM();
+               Rank family = Rank.FAMILY();
+
+               comp = genus.compareTo(species);
+               assertTrue( comp > 0  );
+               assertTrue(genus.compareTo(genus) == 0  );
+               assertTrue(family.compareTo(kingdom) < 0  );
+       }
+
+
+       @Test
+       public final void testDecreaseVoc() {
+               OrderedTermVocabulary<OrderedTermBase<?>> voc = new OrderedTermVocabulary();
+               int before = otb1.orderIndex;
+               otb1.decreaseIndex(voc);
+               int after = otb1.orderIndex;
+               assertEquals(before, after);
+       }
+
+       @Test
+       public final void testIncrementVoc() {
+               OrderedTermVocabulary<OrderedTermBase<?>> voc = new OrderedTermVocabulary();
+               assertFalse(voc.indexChangeAllowed(otb1));
+               int before = otb1.orderIndex;
+               otb1.incrementIndex(voc);
+               int after = otb1.orderIndex;
+               assertEquals(before, after);
+       }
+
+}

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/OrderedTermVocabularyTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/term/OrderedTermVocabularyTest.java
similarity index 96%
rename from cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/OrderedTermVocabularyTest.java
rename to cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/term/OrderedTermVocabularyTest.java
index c77c36cd74af6bf597959dafe6a7dd15fc827271..e3b5e82154efcf5de31260378ce27702a3ad78f8 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/OrderedTermVocabularyTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/term/OrderedTermVocabularyTest.java
@@ -1,225 +1,229 @@
-/**\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
-import static org.junit.Assert.assertEquals;\r
-import static org.junit.Assert.assertNotNull;\r
-import static org.junit.Assert.assertTrue;\r
-import static org.junit.Assert.fail;\r
-\r
-import java.net.URI;\r
-import java.util.SortedSet;\r
-\r
-import org.apache.log4j.Logger;\r
-import org.junit.Before;\r
-import org.junit.Ignore;\r
-import org.junit.Test;\r
-\r
-import eu.etaxonomy.cdm.test.unit.EntityTestBase;\r
-\r
-\r
-public class OrderedTermVocabularyTest extends EntityTestBase {\r
-       @SuppressWarnings("unused")\r
-    private static Logger logger = Logger.getLogger(OrderedTermVocabularyTest.class);\r
-\r
-       private OrderedTermBase<?> otb1;\r
-       private OrderedTermBase<?> otb2;\r
-       private OrderedTermBase<?> otb3;\r
-       private OrderedTermBase<?> otbFree;\r
-       private OrderedTermVocabulary<OrderedTermBase<?>> oVoc1;\r
-       private OrderedTermVocabulary<OrderedTermBase<?>> oVoc2;\r
-\r
-       @Before\r
-       public void setUp() throws Exception {\r
-               otb1 = new DerivedOrderedTermBase(TermType.Unknown,"otb1", "high", null);\r
-               otb2 = new DerivedOrderedTermBase(TermType.Unknown, "term", "middel", null);\r
-               otb3 = new DerivedOrderedTermBase(TermType.Unknown, "otb3", "low", null);\r
-               otbFree = new DerivedOrderedTermBase();\r
-               oVoc1 = new OrderedTermVocabulary<>();\r
-               oVoc1.addTerm(otb1);\r
-               oVoc1.addTerm(otb2);\r
-               oVoc1.addTerm(otb3);\r
-       }\r
-\r
-\r
-       private class DerivedOrderedTermBase extends OrderedTermBase<DerivedOrderedTermBase>{\r
-        private static final long serialVersionUID = -6661559531712274867L;\r
-        private DerivedOrderedTermBase(){\r
-                       super(TermType.Unknown);\r
-               }\r
-               private DerivedOrderedTermBase(TermType type, String term, String label, String labelAbbrev){\r
-                       super(type, term, label, labelAbbrev);\r
-               }\r
-               @Override\r
-               protected void setDefaultTerms(TermVocabulary<DerivedOrderedTermBase> termVocabulary) {}\r
-               @Override\r
-               public void resetTerms() {}\r
-       }\r
-\r
-\r
-//*************************** TESTS *************************************/\r
-\r
-       @Test\r
-       public final void testSetUp() {\r
-               assertEquals(3, oVoc1.size());\r
-               assertEquals(otb3, oVoc1.getLowestTerm());\r
-               assertEquals(otb1, oVoc1.getHighestTerm());\r
-               assertEquals(0, oVoc1.getHigherTerms(otb1).size());\r
-               assertEquals(0, oVoc1.getLowerTerms(otb3).size());\r
-       }\r
-\r
-       @Test\r
-       public final void testGetNewTermSet() {\r
-               assertNotNull(oVoc1.getNewTermSet());\r
-               assertTrue(SortedSet.class.isAssignableFrom(oVoc1.getNewTermSet().getClass()));\r
-       }\r
-\r
-\r
-\r
-       @Test\r
-       public final void testGetTerms() {\r
-               assertEquals(3, oVoc1.getTerms().size());\r
-//             assertNotSame(oVoc1.terms, oVoc1.getTerms());\r
-               assertTrue( oVoc1.terms.getClass().isAssignableFrom(oVoc1.getTerms().getClass()));\r
-       }\r
-\r
-       @Test\r
-       public final void testAddTerm() {\r
-               assertEquals(3, oVoc1.size());\r
-               assertEquals(otb3, oVoc1.getLowestTerm());\r
-               oVoc1.addTerm(otbFree);\r
-\r
-               assertEquals(4, oVoc1.size());\r
-               assertEquals(otbFree, oVoc1.getLowestTerm());\r
-       }\r
-\r
-       @Test\r
-       public final void testRemoveTerm() {\r
-               assertEquals(3, oVoc1.size());\r
-               assertEquals(otb3, oVoc1.getLowestTerm());\r
-               oVoc1.removeTerm(otb3);\r
-               assertEquals(2, oVoc1.size());\r
-               assertEquals(otb2, oVoc1.getLowestTerm());\r
-               oVoc1.removeTerm(otb1);\r
-               assertEquals(1, oVoc1.size());\r
-               assertEquals(otb2, oVoc1.getLowestTerm());\r
-               assertEquals(otb2, oVoc1.getHighestTerm());\r
-               oVoc1.removeTerm(otb2);\r
-               assertEquals(0, oVoc1.size());\r
-               assertEquals(null, oVoc1.getHighestTerm());\r
-       }\r
-\r
-       @Test\r
-       public final void testOrderedTermVocabulary() {\r
-               assertNotNull(oVoc1);\r
-       }\r
-\r
-       @Test\r
-       public final void testOrderedTermVocabularyStringStringString() {\r
-               oVoc2 = new OrderedTermVocabulary<>(TermType.Unknown, "term", "label", null, URI.create("http://term.Source.Uri"));\r
-               assertEquals("label", oVoc2.getLabel());\r
-       }\r
-\r
-       @Test\r
-       public final void testGetLowerTerms() {\r
-               assertEquals(0, oVoc1.getLowerTerms(otb3).size());\r
-               assertEquals(1, oVoc1.getLowerTerms(otb2).size());\r
-               assertEquals(2, oVoc1.getLowerTerms(otb1).size());\r
-               assertEquals(otb2, oVoc1.getLowerTerms(otb1).last());\r
-       }\r
-\r
-\r
-       @Test\r
-       @Ignore\r
-       public final void testGetEqualTerms() {\r
-               assertEquals(1, oVoc1.getEqualTerms(otb1).size());\r
-//             otbFree.orderIndex = otb2.orderIndex;\r
-//             oVoc1.addTerm(otbFree);\r
-               assertEquals(3, oVoc1.size());\r
-               assertEquals(1, oVoc1.getEqualTerms(otb1).size());\r
-               assertEquals(1, oVoc1.getEqualTerms(otb2).size());\r
-               assertEquals(1, oVoc1.getEqualTerms(otb3).size());\r
-               oVoc1.addTermEqualLevel(otbFree, otb2);\r
-               assertEquals(4, oVoc1.size());\r
-               assertEquals(2, oVoc1.getEqualTerms(otb2).size());\r
-\r
-               //as long as orderedTermVocabulary.terms is a set\r
-               //this won't work because terms.add() will not result\r
-               //in adding the term\r
-\r
-       }\r
-\r
-       @Test\r
-       public final void testGetHigherTerms() {\r
-               assertEquals(2, oVoc1.getHigherTerms(otb3).size());\r
-               assertEquals(1, oVoc1.getHigherTerms(otb2).size());\r
-               assertEquals(0, oVoc1.getHigherTerms(otb1).size());\r
-               assertEquals(otb2, oVoc1.getHigherTerms(otb3).first());\r
-       }\r
-\r
-       @Test\r
-       public final void testGetNextHigherTerm() {\r
-               assertEquals(otb2.getLabel(), oVoc1.getNextHigherTerm(otb3).getLabel());\r
-               assertEquals(null, oVoc1.getNextHigherTerm(otb1));\r
-       }\r
-\r
-       @Test\r
-       public final void testGetNextLowerTerm() {\r
-               assertEquals(otb2.getLabel(), oVoc1.getNextLowerTerm(otb1).getLabel());\r
-               assertEquals(null, oVoc1.getNextLowerTerm(otb3));\r
-       }\r
-\r
-       @Test\r
-       public final void testAddTermAbove() {\r
-               try {\r
-                       oVoc1.addTermAbove(otbFree, otb2);\r
-               } catch (Exception e) {\r
-                       fail();\r
-               }\r
-               assertEquals(2, oVoc1.getLowerTerms(otbFree).size());\r
-               assertEquals(otbFree.getLabel(), oVoc1.getNextLowerTerm(otb1).getLabel());\r
-               assertEquals(otbFree.getLabel(), oVoc1.getNextHigherTerm(otb2).getLabel());\r
-       }\r
-\r
-       @Test\r
-       public final void testAddTermBelow() {\r
-               try {\r
-                       oVoc1.addTermBelow(otbFree, otb2);\r
-               } catch (Exception e) {\r
-                       fail();\r
-               }\r
-               assertEquals(1, oVoc1.getLowerTerms(otbFree).size());\r
-               assertEquals(otbFree.getLabel(), oVoc1.getNextLowerTerm(otb2).getLabel());\r
-               assertEquals(otbFree.getLabel(), oVoc1.getNextHigherTerm(otb3).getLabel());\r
-       }\r
-\r
-       @Test\r
-       public final void testAddTermEqualLevel() {\r
-               System.out.println(otb2.orderIndex);\r
-               oVoc1.addTermEqualLevel(otbFree, otb2);\r
-\r
-               assertEquals(1, oVoc1.getLowerTerms(otbFree).size());\r
-               assertEquals(2, oVoc1.getLowerAndEqualTerms(otbFree).size());\r
-               assertEquals(otb1.getLabel(), oVoc1.getNextHigherTerm(otbFree).getLabel());\r
-               assertEquals(otb3.getLabel(), oVoc1.getNextLowerTerm(otbFree).getLabel());\r
-       }\r
-\r
-       @Test\r
-       public final void testIndexChangeAllowed() {\r
-//             assertFalse(oVoc1.indexChangeAllowed(otb1));\r
-       }\r
-\r
-       @Test\r
-       public final void testSize() {\r
-               assertEquals(3, oVoc1.size());\r
-               oVoc2 = new OrderedTermVocabulary<>();\r
-               assertEquals(0, oVoc2.size());\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 eu.etaxonomy.cdm.model.term;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.net.URI;
+import java.util.SortedSet;
+
+import org.apache.log4j.Logger;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import eu.etaxonomy.cdm.model.term.OrderedTermBase;
+import eu.etaxonomy.cdm.model.term.OrderedTermVocabulary;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
+import eu.etaxonomy.cdm.test.unit.EntityTestBase;
+
+
+public class OrderedTermVocabularyTest extends EntityTestBase {
+       @SuppressWarnings("unused")
+    private static Logger logger = Logger.getLogger(OrderedTermVocabularyTest.class);
+
+       private OrderedTermBase<?> otb1;
+       private OrderedTermBase<?> otb2;
+       private OrderedTermBase<?> otb3;
+       private OrderedTermBase<?> otbFree;
+       private OrderedTermVocabulary<OrderedTermBase<?>> oVoc1;
+       private OrderedTermVocabulary<OrderedTermBase<?>> oVoc2;
+
+       @Before
+       public void setUp() throws Exception {
+               otb1 = new DerivedOrderedTermBase(TermType.Unknown,"otb1", "high", null);
+               otb2 = new DerivedOrderedTermBase(TermType.Unknown, "term", "middel", null);
+               otb3 = new DerivedOrderedTermBase(TermType.Unknown, "otb3", "low", null);
+               otbFree = new DerivedOrderedTermBase();
+               oVoc1 = new OrderedTermVocabulary<>();
+               oVoc1.addTerm(otb1);
+               oVoc1.addTerm(otb2);
+               oVoc1.addTerm(otb3);
+       }
+
+
+       private class DerivedOrderedTermBase extends OrderedTermBase<DerivedOrderedTermBase>{
+        private static final long serialVersionUID = -6661559531712274867L;
+        private DerivedOrderedTermBase(){
+                       super(TermType.Unknown);
+               }
+               private DerivedOrderedTermBase(TermType type, String term, String label, String labelAbbrev){
+                       super(type, term, label, labelAbbrev);
+               }
+               @Override
+               protected void setDefaultTerms(TermVocabulary<DerivedOrderedTermBase> termVocabulary) {}
+               @Override
+               public void resetTerms() {}
+       }
+
+
+//*************************** TESTS *************************************/
+
+       @Test
+       public final void testSetUp() {
+               assertEquals(3, oVoc1.size());
+               assertEquals(otb3, oVoc1.getLowestTerm());
+               assertEquals(otb1, oVoc1.getHighestTerm());
+               assertEquals(0, oVoc1.getHigherTerms(otb1).size());
+               assertEquals(0, oVoc1.getLowerTerms(otb3).size());
+       }
+
+       @Test
+       public final void testGetNewTermSet() {
+               assertNotNull(oVoc1.getNewTermSet());
+               assertTrue(SortedSet.class.isAssignableFrom(oVoc1.getNewTermSet().getClass()));
+       }
+
+
+
+       @Test
+       public final void testGetTerms() {
+               assertEquals(3, oVoc1.getTerms().size());
+//             assertNotSame(oVoc1.terms, oVoc1.getTerms());
+               assertTrue( oVoc1.terms.getClass().isAssignableFrom(oVoc1.getTerms().getClass()));
+       }
+
+       @Test
+       public final void testAddTerm() {
+               assertEquals(3, oVoc1.size());
+               assertEquals(otb3, oVoc1.getLowestTerm());
+               oVoc1.addTerm(otbFree);
+
+               assertEquals(4, oVoc1.size());
+               assertEquals(otbFree, oVoc1.getLowestTerm());
+       }
+
+       @Test
+       public final void testRemoveTerm() {
+               assertEquals(3, oVoc1.size());
+               assertEquals(otb3, oVoc1.getLowestTerm());
+               oVoc1.removeTerm(otb3);
+               assertEquals(2, oVoc1.size());
+               assertEquals(otb2, oVoc1.getLowestTerm());
+               oVoc1.removeTerm(otb1);
+               assertEquals(1, oVoc1.size());
+               assertEquals(otb2, oVoc1.getLowestTerm());
+               assertEquals(otb2, oVoc1.getHighestTerm());
+               oVoc1.removeTerm(otb2);
+               assertEquals(0, oVoc1.size());
+               assertEquals(null, oVoc1.getHighestTerm());
+       }
+
+       @Test
+       public final void testOrderedTermVocabulary() {
+               assertNotNull(oVoc1);
+       }
+
+       @Test
+       public final void testOrderedTermVocabularyStringStringString() {
+               oVoc2 = new OrderedTermVocabulary<>(TermType.Unknown, "term", "label", null, URI.create("http://term.Source.Uri"));
+               assertEquals("label", oVoc2.getLabel());
+       }
+
+       @Test
+       public final void testGetLowerTerms() {
+               assertEquals(0, oVoc1.getLowerTerms(otb3).size());
+               assertEquals(1, oVoc1.getLowerTerms(otb2).size());
+               assertEquals(2, oVoc1.getLowerTerms(otb1).size());
+               assertEquals(otb2, oVoc1.getLowerTerms(otb1).last());
+       }
+
+
+       @Test
+       @Ignore
+       public final void testGetEqualTerms() {
+               assertEquals(1, oVoc1.getEqualTerms(otb1).size());
+//             otbFree.orderIndex = otb2.orderIndex;
+//             oVoc1.addTerm(otbFree);
+               assertEquals(3, oVoc1.size());
+               assertEquals(1, oVoc1.getEqualTerms(otb1).size());
+               assertEquals(1, oVoc1.getEqualTerms(otb2).size());
+               assertEquals(1, oVoc1.getEqualTerms(otb3).size());
+               oVoc1.addTermEqualLevel(otbFree, otb2);
+               assertEquals(4, oVoc1.size());
+               assertEquals(2, oVoc1.getEqualTerms(otb2).size());
+
+               //as long as orderedTermVocabulary.terms is a set
+               //this won't work because terms.add() will not result
+               //in adding the term
+
+       }
+
+       @Test
+       public final void testGetHigherTerms() {
+               assertEquals(2, oVoc1.getHigherTerms(otb3).size());
+               assertEquals(1, oVoc1.getHigherTerms(otb2).size());
+               assertEquals(0, oVoc1.getHigherTerms(otb1).size());
+               assertEquals(otb2, oVoc1.getHigherTerms(otb3).first());
+       }
+
+       @Test
+       public final void testGetNextHigherTerm() {
+               assertEquals(otb2.getLabel(), oVoc1.getNextHigherTerm(otb3).getLabel());
+               assertEquals(null, oVoc1.getNextHigherTerm(otb1));
+       }
+
+       @Test
+       public final void testGetNextLowerTerm() {
+               assertEquals(otb2.getLabel(), oVoc1.getNextLowerTerm(otb1).getLabel());
+               assertEquals(null, oVoc1.getNextLowerTerm(otb3));
+       }
+
+       @Test
+       public final void testAddTermAbove() {
+               try {
+                       oVoc1.addTermAbove(otbFree, otb2);
+               } catch (Exception e) {
+                       fail();
+               }
+               assertEquals(2, oVoc1.getLowerTerms(otbFree).size());
+               assertEquals(otbFree.getLabel(), oVoc1.getNextLowerTerm(otb1).getLabel());
+               assertEquals(otbFree.getLabel(), oVoc1.getNextHigherTerm(otb2).getLabel());
+       }
+
+       @Test
+       public final void testAddTermBelow() {
+               try {
+                       oVoc1.addTermBelow(otbFree, otb2);
+               } catch (Exception e) {
+                       fail();
+               }
+               assertEquals(1, oVoc1.getLowerTerms(otbFree).size());
+               assertEquals(otbFree.getLabel(), oVoc1.getNextLowerTerm(otb2).getLabel());
+               assertEquals(otbFree.getLabel(), oVoc1.getNextHigherTerm(otb3).getLabel());
+       }
+
+       @Test
+       public final void testAddTermEqualLevel() {
+               System.out.println(otb2.orderIndex);
+               oVoc1.addTermEqualLevel(otbFree, otb2);
+
+               assertEquals(1, oVoc1.getLowerTerms(otbFree).size());
+               assertEquals(2, oVoc1.getLowerAndEqualTerms(otbFree).size());
+               assertEquals(otb1.getLabel(), oVoc1.getNextHigherTerm(otbFree).getLabel());
+               assertEquals(otb3.getLabel(), oVoc1.getNextLowerTerm(otbFree).getLabel());
+       }
+
+       @Test
+       public final void testIndexChangeAllowed() {
+//             assertFalse(oVoc1.indexChangeAllowed(otb1));
+       }
+
+       @Test
+       public final void testSize() {
+               assertEquals(3, oVoc1.size());
+               oVoc2 = new OrderedTermVocabulary<>();
+               assertEquals(0, oVoc2.size());
+       }
+}

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/TermTypeTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/term/TermTypeTest.java
similarity index 95%
rename from cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/TermTypeTest.java
rename to cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/term/TermTypeTest.java
index ebf832db75bcdee16c198ee2680101e45657a103..d529fdbb44561d8ec3e61489f1bd16c222aebb60 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/TermTypeTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/term/TermTypeTest.java
@@ -1,51 +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
-package eu.etaxonomy.cdm.model.common;\r
-\r
-import static org.junit.Assert.*;\r
-\r
-import org.junit.Test;\r
-\r
-public class TermTypeTest {\r
-\r
-       @Test\r
-       public void test() {\r
-               TermType languageType = TermType.Language;\r
-               assertEquals(TermType.getByKey("LA"), languageType);\r
-       }\r
-       \r
-       @Test\r
-       public void testKindOf(){\r
-               assertSame(TermType.Modifier, TermType.DeterminationModifier.getKindOf());\r
-               assertSame(TermType.Modifier, TermType.Scope.getKindOf());\r
-               assertSame(TermType.Scope, TermType.Sex.getKindOf());\r
-               assertSame(TermType.Scope, TermType.Stage.getKindOf());\r
-       }\r
-       \r
-       @Test\r
-       public void testGeneralisationOf(){\r
-               assertTrue(TermType.Modifier.getGeneralizationOf().contains(TermType.DeterminationModifier));\r
-               assertTrue(TermType.Modifier.getGeneralizationOf().contains(TermType.Scope));\r
-               assertTrue(TermType.Scope.getGeneralizationOf().contains(TermType.Sex));\r
-               assertTrue(TermType.Scope.getGeneralizationOf().contains(TermType.Stage));\r
-               assertFalse("generalisationOf may contain only contain only direct children, but stage is a grandchild", TermType.Modifier.getGeneralizationOf().contains(TermType.Stage));     \r
-       }\r
-       \r
-       @Test\r
-       public void testGeneralisationOfRecursive(){\r
-               boolean recursive = true;\r
-               assertTrue(TermType.Modifier.getGeneralizationOf(recursive).contains(TermType.Scope));\r
-               assertTrue(TermType.Modifier.getGeneralizationOf(! recursive).contains(TermType.Scope));\r
-               assertTrue(TermType.Scope.getGeneralizationOf(recursive).contains(TermType.Sex));\r
-               assertTrue(TermType.Modifier.getGeneralizationOf(recursive).contains(TermType.Stage));          \r
-               assertFalse(TermType.Modifier.getGeneralizationOf(!recursive).contains(TermType.Stage));                \r
-       }\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 eu.etaxonomy.cdm.model.term;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+import eu.etaxonomy.cdm.model.term.TermType;
+
+public class TermTypeTest {
+
+       @Test
+       public void test() {
+               TermType languageType = TermType.Language;
+               assertEquals(TermType.getByKey("LA"), languageType);
+       }
+       
+       @Test
+       public void testKindOf(){
+               assertSame(TermType.Modifier, TermType.DeterminationModifier.getKindOf());
+               assertSame(TermType.Modifier, TermType.Scope.getKindOf());
+               assertSame(TermType.Scope, TermType.Sex.getKindOf());
+               assertSame(TermType.Scope, TermType.Stage.getKindOf());
+       }
+       
+       @Test
+       public void testGeneralisationOf(){
+               assertTrue(TermType.Modifier.getGeneralizationOf().contains(TermType.DeterminationModifier));
+               assertTrue(TermType.Modifier.getGeneralizationOf().contains(TermType.Scope));
+               assertTrue(TermType.Scope.getGeneralizationOf().contains(TermType.Sex));
+               assertTrue(TermType.Scope.getGeneralizationOf().contains(TermType.Stage));
+               assertFalse("generalisationOf may contain only contain only direct children, but stage is a grandchild", TermType.Modifier.getGeneralizationOf().contains(TermType.Stage));     
+       }
+       
+       @Test
+       public void testGeneralisationOfRecursive(){
+               boolean recursive = true;
+               assertTrue(TermType.Modifier.getGeneralizationOf(recursive).contains(TermType.Scope));
+               assertTrue(TermType.Modifier.getGeneralizationOf(! recursive).contains(TermType.Scope));
+               assertTrue(TermType.Scope.getGeneralizationOf(recursive).contains(TermType.Sex));
+               assertTrue(TermType.Modifier.getGeneralizationOf(recursive).contains(TermType.Stage));          
+               assertFalse(TermType.Modifier.getGeneralizationOf(!recursive).contains(TermType.Stage));                
+       }
+       
+
+}

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/TermVocabularyTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/term/TermVocabularyTest.java
similarity index 95%
rename from cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/TermVocabularyTest.java
rename to cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/term/TermVocabularyTest.java
index e17f7f7e77cca7de196da4774593f16ee744cd6e..60fcbe85f633ace4ce3c02b4ebcc14b50a753c39 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/TermVocabularyTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/term/TermVocabularyTest.java
@@ -1,208 +1,212 @@
-/**\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
-import static org.junit.Assert.assertEquals;\r
-import static org.junit.Assert.assertFalse;\r
-import static org.junit.Assert.assertNotNull;\r
-import static org.junit.Assert.assertTrue;\r
-\r
-import java.net.URI;\r
-import java.util.Iterator;\r
-import java.util.Set;\r
-import java.util.SortedSet;\r
-import java.util.TreeSet;\r
-\r
-import org.apache.log4j.Logger;\r
-import org.junit.After;\r
-import org.junit.AfterClass;\r
-import org.junit.Before;\r
-import org.junit.BeforeClass;\r
-import org.junit.Test;\r
-\r
-import eu.etaxonomy.cdm.test.unit.EntityTestBase;\r
-\r
-\r
-public class TermVocabularyTest extends EntityTestBase {\r
-       private static Logger logger = Logger.getLogger(TermVocabularyTest.class);\r
-\r
-       private DefinedTermBase<?> dtb1;\r
-       private DefinedTermBase<?> dtb2;\r
-       private DefinedTermBase<?> dtb3;\r
-       private DefinedTermBase<?> dtbFree;\r
-       private TermVocabulary<DefinedTermBase<?>> voc1;\r
-       private TermVocabulary<DefinedTermBase<?>> voc2;\r
-\r
-\r
-       @BeforeClass\r
-       public static void setUpBeforeClass() throws Exception {\r
-       }\r
-\r
-       @AfterClass\r
-       public static void tearDownAfterClass() throws Exception {\r
-       }\r
-\r
-       @Before\r
-       public void setUp() throws Exception {\r
-               dtb1 = new DerivedDefinedTermBase(TermType.Unknown, "otb1", "high", "h");\r
-               dtb1.setIdInVocabulary("x");\r
-               dtb2 = new DerivedDefinedTermBase(TermType.Unknown, "term", "middel", "m");\r
-               dtb3 = new DerivedDefinedTermBase(TermType.Unknown, "otb3", "low", "l");\r
-               dtbFree = new DerivedDefinedTermBase();\r
-               voc1 = new TermVocabulary<>();\r
-               voc1.addTerm(dtb1);\r
-               voc1.addTerm(dtb2);\r
-               voc1.addTerm(dtb3);\r
-       }\r
-\r
-       @After\r
-       public void tearDown() throws Exception {\r
-       }\r
-\r
-       private class DerivedDefinedTermBase extends OrderedTermBase<DerivedDefinedTermBase>{\r
-        private static final long serialVersionUID = 280869784120656292L;\r
-        private DerivedDefinedTermBase(){\r
-                       super(TermType.Unknown);\r
-               }\r
-               private DerivedDefinedTermBase(TermType type, String term, String label, String labelAbbrev){\r
-                       super(type, term, label, labelAbbrev);\r
-               }\r
-               @Override\r
-               protected void setDefaultTerms(TermVocabulary<DerivedDefinedTermBase> termVocabulary) {}\r
-               @Override\r
-               public void resetTerms() {}\r
-       }\r
-\r
-/****************** TESTS ****************************************/\r
-\r
-       @Test\r
-       public final void testSetUp() {\r
-               assertEquals(3, voc1.size());\r
-               assertEquals(3, voc1.getTerms().size());\r
-       }\r
-\r
-       @Test\r
-       public final void testGetNewTermSet() {\r
-//             assertNotNull(voc1.getNewTermSet());\r
-//             assertTrue(Set.class.isAssignableFrom(voc1.getNewTermSet().getClass()));\r
-       }\r
-\r
-       @Test\r
-       public final void testTermVocabulary() {\r
-               assertNotNull(voc1);\r
-       }\r
-\r
-       @Test\r
-       public final void testTermVocabularyStringStringString() {\r
-               voc2 = new TermVocabulary<>(TermType.Unknown, "term", "label", null, URI.create("http://term.Source.Uri"));\r
-               assertEquals("label", voc2.getLabel());\r
-       }\r
-\r
-       @Test\r
-    public final void testTermIdInVocabularyComparator() {\r
-        assertNotNull(voc1);\r
-        Set<DefinedTermBase<?>> terms = voc1.getTerms();\r
-        TermIdInVocabularyComparator<DefinedTermBase<?>> comparator = new TermIdInVocabularyComparator<>();\r
-        int res = comparator.compare(dtb1, dtb2);\r
-        int res2 = comparator.compare(dtb2, dtb1);\r
-        assertEquals(res, -res2);\r
-        SortedSet<DefinedTermBase<?>> result = new TreeSet<>(comparator);\r
-        for (DefinedTermBase<?> term:terms){\r
-            result.add(term);\r
-        }\r
-       assertEquals(result.first(), dtb3);\r
-       assertEquals(result.last(), dtb1);\r
-\r
-       }\r
-\r
-       @Test\r
-       public final void testGetTerms() {\r
-               assertEquals(3, voc1.getTerms().size());\r
-               //assertNotSame(voc1.terms, voc1.getTerms());\r
-               assertTrue( voc1.terms.getClass().isAssignableFrom(voc1.getTerms().getClass()));\r
-       }\r
-\r
-       @Test\r
-       public final void testSetTerms() {\r
-               logger.warn("Not yet implemented"); // TODO\r
-       }\r
-\r
-       @Test\r
-       public final void testAddTerm() {\r
-               voc1.addTerm(dtbFree);\r
-               assertEquals(4, voc1.size());\r
-       }\r
-\r
-       @Test\r
-       public final void testAddTerm_2() {\r
-//             Rank rank = Rank.SPECIES();\r
-//             voc2 = new TermVocabulary<DefinedTermBase>();\r
-//             try {\r
-//                     voc2.addTerm(rank);\r
-//             } catch (WrongTermTypeException e) {\r
-//                     fail();\r
-//             }\r
-//             Language lang = Language.ENGLISH();\r
-//             try {\r
-//                     voc2.addTerm(lang);\r
-//                     fail("Exception should be thrown");\r
-//             } catch (WrongTermTypeException e) {\r
-//                     assertTrue(true);\r
-//             }\r
-       }\r
-\r
-       @Test\r
-       public final void testRemoveTerm() {\r
-               assertEquals(3, voc1.size());\r
-               assertTrue(voc1.getTerms().contains(dtb3));\r
-               voc1.removeTerm(dtb3);\r
-               assertFalse(voc1.getTerms().contains(dtb3));\r
-               assertEquals(2, voc1.size());\r
-               voc1.removeTerm(dtb3);\r
-               assertEquals(2, voc1.size());\r
-               assertTrue(voc1.getTerms().contains(dtb1));\r
-               voc1.removeTerm(dtb1);\r
-               assertFalse(voc1.getTerms().contains(dtb1));\r
-               assertEquals(1, voc1.size());\r
-               assertTrue(voc1.getTerms().contains(dtb2));\r
-               voc1.removeTerm(dtb2);\r
-               assertFalse(voc1.getTerms().contains(dtb2));\r
-               assertEquals(0, voc1.size());\r
-       }\r
-\r
-       @Test\r
-       public final void testGetTermSourceUri() {\r
-               assertEquals(null, voc1.getTermSourceUri());\r
-               voc2 = new TermVocabulary<>(TermType.Unknown,"term", "label", null, URI.create("http://term.Source.Uri"));\r
-               assertEquals("http://term.Source.Uri", voc2.getTermSourceUri().toString());\r
-       }\r
-\r
-       @Test\r
-       public final void testSetTermSourceUri() {\r
-               voc1.setTermSourceUri(URI.create("http://term.Source.Uri"));\r
-               assertEquals("http://term.Source.Uri", voc1.getTermSourceUri().toString());\r
-       }\r
-\r
-       @Test\r
-       public final void testGetTermClass() {\r
-//             assertEquals(dtb1.getClass(), voc1.getTermClass());\r
-       }\r
-\r
-       @Test\r
-       public final void testIterator() {\r
-               Iterator<DefinedTermBase<?>> it = voc1.iterator();\r
-               int i = 0;\r
-               while (it.hasNext()){\r
-                       i++;\r
-                       assertTrue(voc1.getTerms().contains(it.next()));\r
-               }\r
-               assertEquals(3, i);\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 eu.etaxonomy.cdm.model.term;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.net.URI;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import org.apache.log4j.Logger;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.OrderedTermBase;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
+import eu.etaxonomy.cdm.test.unit.EntityTestBase;
+
+
+public class TermVocabularyTest extends EntityTestBase {
+       private static Logger logger = Logger.getLogger(TermVocabularyTest.class);
+
+       private DefinedTermBase<?> dtb1;
+       private DefinedTermBase<?> dtb2;
+       private DefinedTermBase<?> dtb3;
+       private DefinedTermBase<?> dtbFree;
+       private TermVocabulary<DefinedTermBase<?>> voc1;
+       private TermVocabulary<DefinedTermBase<?>> voc2;
+
+
+       @BeforeClass
+       public static void setUpBeforeClass() throws Exception {
+       }
+
+       @AfterClass
+       public static void tearDownAfterClass() throws Exception {
+       }
+
+       @Before
+       public void setUp() throws Exception {
+               dtb1 = new DerivedDefinedTermBase(TermType.Unknown, "otb1", "high", "h");
+               dtb1.setIdInVocabulary("x");
+               dtb2 = new DerivedDefinedTermBase(TermType.Unknown, "term", "middel", "m");
+               dtb3 = new DerivedDefinedTermBase(TermType.Unknown, "otb3", "low", "l");
+               dtbFree = new DerivedDefinedTermBase();
+               voc1 = new TermVocabulary<>();
+               voc1.addTerm(dtb1);
+               voc1.addTerm(dtb2);
+               voc1.addTerm(dtb3);
+       }
+
+       @After
+       public void tearDown() throws Exception {
+       }
+
+       private class DerivedDefinedTermBase extends OrderedTermBase<DerivedDefinedTermBase>{
+        private static final long serialVersionUID = 280869784120656292L;
+        private DerivedDefinedTermBase(){
+                       super(TermType.Unknown);
+               }
+               private DerivedDefinedTermBase(TermType type, String term, String label, String labelAbbrev){
+                       super(type, term, label, labelAbbrev);
+               }
+               @Override
+               protected void setDefaultTerms(TermVocabulary<DerivedDefinedTermBase> termVocabulary) {}
+               @Override
+               public void resetTerms() {}
+       }
+
+/****************** TESTS ****************************************/
+
+       @Test
+       public final void testSetUp() {
+               assertEquals(3, voc1.size());
+               assertEquals(3, voc1.getTerms().size());
+       }
+
+       @Test
+       public final void testGetNewTermSet() {
+//             assertNotNull(voc1.getNewTermSet());
+//             assertTrue(Set.class.isAssignableFrom(voc1.getNewTermSet().getClass()));
+       }
+
+       @Test
+       public final void testTermVocabulary() {
+               assertNotNull(voc1);
+       }
+
+       @Test
+       public final void testTermVocabularyStringStringString() {
+               voc2 = new TermVocabulary<>(TermType.Unknown, "term", "label", null, URI.create("http://term.Source.Uri"));
+               assertEquals("label", voc2.getLabel());
+       }
+
+       @Test
+    public final void testTermIdInVocabularyComparator() {
+        assertNotNull(voc1);
+        Set<DefinedTermBase<?>> terms = voc1.getTerms();
+        TermIdInVocabularyComparator<DefinedTermBase<?>> comparator = new TermIdInVocabularyComparator<>();
+        int res = comparator.compare(dtb1, dtb2);
+        int res2 = comparator.compare(dtb2, dtb1);
+        assertEquals(res, -res2);
+        SortedSet<DefinedTermBase<?>> result = new TreeSet<>(comparator);
+        for (DefinedTermBase<?> term:terms){
+            result.add(term);
+        }
+       assertEquals(result.first(), dtb3);
+       assertEquals(result.last(), dtb1);
+
+       }
+
+       @Test
+       public final void testGetTerms() {
+               assertEquals(3, voc1.getTerms().size());
+               //assertNotSame(voc1.terms, voc1.getTerms());
+               assertTrue( voc1.terms.getClass().isAssignableFrom(voc1.getTerms().getClass()));
+       }
+
+       @Test
+       public final void testSetTerms() {
+               logger.warn("Not yet implemented"); // TODO
+       }
+
+       @Test
+       public final void testAddTerm() {
+               voc1.addTerm(dtbFree);
+               assertEquals(4, voc1.size());
+       }
+
+       @Test
+       public final void testAddTerm_2() {
+//             Rank rank = Rank.SPECIES();
+//             voc2 = new TermVocabulary<DefinedTermBase>();
+//             try {
+//                     voc2.addTerm(rank);
+//             } catch (WrongTermTypeException e) {
+//                     fail();
+//             }
+//             Language lang = Language.ENGLISH();
+//             try {
+//                     voc2.addTerm(lang);
+//                     fail("Exception should be thrown");
+//             } catch (WrongTermTypeException e) {
+//                     assertTrue(true);
+//             }
+       }
+
+       @Test
+       public final void testRemoveTerm() {
+               assertEquals(3, voc1.size());
+               assertTrue(voc1.getTerms().contains(dtb3));
+               voc1.removeTerm(dtb3);
+               assertFalse(voc1.getTerms().contains(dtb3));
+               assertEquals(2, voc1.size());
+               voc1.removeTerm(dtb3);
+               assertEquals(2, voc1.size());
+               assertTrue(voc1.getTerms().contains(dtb1));
+               voc1.removeTerm(dtb1);
+               assertFalse(voc1.getTerms().contains(dtb1));
+               assertEquals(1, voc1.size());
+               assertTrue(voc1.getTerms().contains(dtb2));
+               voc1.removeTerm(dtb2);
+               assertFalse(voc1.getTerms().contains(dtb2));
+               assertEquals(0, voc1.size());
+       }
+
+       @Test
+       public final void testGetTermSourceUri() {
+               assertEquals(null, voc1.getTermSourceUri());
+               voc2 = new TermVocabulary<>(TermType.Unknown,"term", "label", null, URI.create("http://term.Source.Uri"));
+               assertEquals("http://term.Source.Uri", voc2.getTermSourceUri().toString());
+       }
+
+       @Test
+       public final void testSetTermSourceUri() {
+               voc1.setTermSourceUri(URI.create("http://term.Source.Uri"));
+               assertEquals("http://term.Source.Uri", voc1.getTermSourceUri().toString());
+       }
+
+       @Test
+       public final void testGetTermClass() {
+//             assertEquals(dtb1.getClass(), voc1.getTermClass());
+       }
+
+       @Test
+       public final void testIterator() {
+               Iterator<DefinedTermBase<?>> it = voc1.iterator();
+               int i = 0;
+               while (it.hasNext()){
+                       i++;
+                       assertTrue(voc1.getTerms().contains(it.next()));
+               }
+               assertEquals(3, i);
+       }
+}

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/init/DefaultTermInitializerTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/term/init/DefaultTermInitializerTest.java
similarity index 87%
rename from cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/init/DefaultTermInitializerTest.java
rename to cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/term/init/DefaultTermInitializerTest.java
index c8f562cc88e9a6ff6a61970729099c8cc36074ba..aa3e80cc81973bdd6da269ffd3d1054a1a50793c 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/init/DefaultTermInitializerTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/term/init/DefaultTermInitializerTest.java
@@ -1,58 +1,58 @@
-/**\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.init;\r
-\r
-import static org.junit.Assert.assertEquals;\r
-import static org.junit.Assert.assertNotNull;\r
-\r
-import java.util.UUID;\r
-\r
-import org.apache.log4j.Logger;\r
-import org.junit.Before;\r
-import org.junit.Test;\r
-\r
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;\r
-import eu.etaxonomy.cdm.model.common.Language;\r
-\r
-/**\r
- * @author AM\r
- *\r
- */\r
-public class DefaultTermInitializerTest {\r
-       static Logger logger = Logger.getLogger(DefaultTermInitializerTest.class);\r
-\r
-       private DefaultTermInitializer defaultVocabularyStore;\r
-       private UUID uuidEnglish;\r
-       private UUID uuidGerman;\r
-       \r
-       @Before\r
-       public void setUp() {\r
-               defaultVocabularyStore = new DefaultTermInitializer();\r
-               uuidEnglish = UUID.fromString("e9f8cdb7-6819-44e8-95d3-e2d0690c3523");\r
-               uuidGerman = UUID.fromString("d1131746-e58b-4e80-a865-f5182c9c3073");\r
-       }\r
-\r
-/*********************** TEST *************************************************/\r
-\r
-       /**\r
-        * Test method for {@link eu.etaxonomy.cdm.model.common.DefaultTermInitializer#loadBasicTerms()}.\r
-        */\r
-       @Test\r
-       public void testInitialize() {\r
-               defaultVocabularyStore.initialize();\r
-               \r
-               assertNotNull("ENGLISH should not be null",Language.ENGLISH());\r
-               assertEquals("The uuid of ENGLISH should equal e9f8cdb7-6819-44e8-95d3-e2d0690c3523",uuidEnglish,Language.ENGLISH().getUuid());\r
-               assertNotNull("ENGLISH should have an ENGLISH representation",Language.ENGLISH().getRepresentation(Language.ENGLISH()));\r
-               assertNotNull("GERMAN should not be null",Language.GERMAN());\r
-               assertEquals("The uuid of GERMAN should equal d1131746-e58b-4e80-a865-f5182c9c3073",uuidGerman,Language.GERMAN().getUuid());\r
-               assertNotNull("GERMAN should have an ENGLISH representation",Language.GERMAN().getRepresentation(Language.ENGLISH()));\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 eu.etaxonomy.cdm.model.term.init;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.UUID;
+
+import org.apache.log4j.Logger;
+import org.junit.Before;
+import org.junit.Test;
+
+import eu.etaxonomy.cdm.model.common.Language;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
+
+/**
+ * @author AM
+ *
+ */
+public class DefaultTermInitializerTest {
+       static Logger logger = Logger.getLogger(DefaultTermInitializerTest.class);
+
+       private DefaultTermInitializer defaultVocabularyStore;
+       private UUID uuidEnglish;
+       private UUID uuidGerman;
+       
+       @Before
+       public void setUp() {
+               defaultVocabularyStore = new DefaultTermInitializer();
+               uuidEnglish = UUID.fromString("e9f8cdb7-6819-44e8-95d3-e2d0690c3523");
+               uuidGerman = UUID.fromString("d1131746-e58b-4e80-a865-f5182c9c3073");
+       }
+
+/*********************** TEST *************************************************/
+
+       /**
+        * Test method for {@link eu.etaxonomy.cdm.model.term.DefaultTermInitializer#loadBasicTerms()}.
+        */
+       @Test
+       public void testInitialize() {
+               defaultVocabularyStore.initialize();
+               
+               assertNotNull("ENGLISH should not be null",Language.ENGLISH());
+               assertEquals("The uuid of ENGLISH should equal e9f8cdb7-6819-44e8-95d3-e2d0690c3523",uuidEnglish,Language.ENGLISH().getUuid());
+               assertNotNull("ENGLISH should have an ENGLISH representation",Language.ENGLISH().getRepresentation(Language.ENGLISH()));
+               assertNotNull("GERMAN should not be null",Language.GERMAN());
+               assertEquals("The uuid of GERMAN should equal d1131746-e58b-4e80-a865-f5182c9c3073",uuidGerman,Language.GERMAN().getUuid());
+               assertNotNull("GERMAN should have an ENGLISH representation",Language.GERMAN().getRepresentation(Language.ENGLISH()));
+       }
+}

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/init/TermLoaderTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/term/init/TermLoaderTest.java
similarity index 82%
rename from cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/init/TermLoaderTest.java
rename to cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/term/init/TermLoaderTest.java
index c5055f4765e27a1432e9082501ce020f180b929a..da140ca380b2186ed5a8916bc13b442a4dda3981 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/init/TermLoaderTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/term/init/TermLoaderTest.java
@@ -1,84 +1,85 @@
-/**\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.init;\r
-\r
-import static org.junit.Assert.assertNotNull;\r
-import static org.junit.Assert.assertTrue;\r
-\r
-import java.util.HashMap;\r
-import java.util.Map;\r
-import java.util.UUID;\r
-\r
-import org.apache.log4j.Logger;\r
-import org.junit.Assert;\r
-import org.junit.Before;\r
-import org.junit.Test;\r
-\r
-import eu.etaxonomy.cdm.model.common.AnnotationType;\r
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;\r
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
-import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
-import eu.etaxonomy.cdm.model.common.VocabularyEnum;\r
-import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus;\r
-import eu.etaxonomy.cdm.model.name.Rank;\r
-\r
-/**\r
- * @author a.mueller\r
- *\r
- */\r
-public class TermLoaderTest {\r
-       static Logger logger = Logger.getLogger(TermLoaderTest.class);\r
-\r
-       private TermLoader termLoader;\r
-       private Map<UUID,DefinedTermBase> terms;\r
-\r
-       private UUID uuidGenus;\r
-       private UUID uuidTautonymy;\r
-\r
-       /**\r
-        * @throws java.lang.Exception\r
-        */\r
-       @Before\r
-       public void setUp() throws Exception {\r
-               termLoader = new TermLoader();\r
-               terms = new HashMap<UUID,DefinedTermBase>();\r
-               uuidGenus = UUID.fromString("1b11c34c-48a8-4efa-98d5-84f7f66ef43a");\r
-               uuidTautonymy = UUID.fromString("84521f09-3e10-43f5-aa6f-2173a55a6790");\r
-       }\r
-       \r
-/************** TESTS **********************************/\r
-\r
-       /**\r
-        * Test method for {@link eu.etaxonomy.cdm.model.common.init.TermLoader#loadTerms(java.lang.Class, java.lang.String, boolean)}.\r
-        */\r
-       @Test\r
-       public void testLoadRanks() {\r
-               \r
-        TermVocabulary<Rank> defaultRanks = termLoader.loadTerms(VocabularyEnum.Rank, terms);\r
-               assertNotNull(defaultRanks.findTermByUuid(uuidGenus));\r
-               assertTrue(terms.containsKey(uuidGenus));\r
-       }\r
-\r
-       @Test\r
-       public void testLoadNameTypeDesignationStatus() {\r
-        TermVocabulary<NameTypeDesignationStatus> defaultStatus = termLoader.loadTerms(VocabularyEnum.NameTypeDesignationStatus, terms);\r
-               assertNotNull(defaultStatus.findTermByUuid(uuidTautonymy));\r
-               assertTrue(terms.containsKey(uuidTautonymy));\r
-       }\r
-       \r
-       @Test\r
-       public void testUnloadAllTerms(){\r
-               DefaultTermInitializer initializer = new DefaultTermInitializer();\r
-               initializer.initialize();\r
-               Assert.assertNotNull("Editorial annotation type should be loaded", AnnotationType.EDITORIAL());\r
-               termLoader.unloadAllTerms();\r
-               Assert.assertNull("Editorial annotation type should be unloaded now", AnnotationType.EDITORIAL());\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 eu.etaxonomy.cdm.model.term.init;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import org.apache.log4j.Logger;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import eu.etaxonomy.cdm.model.common.AnnotationType;
+import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus;
+import eu.etaxonomy.cdm.model.name.Rank;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
+import eu.etaxonomy.cdm.model.term.VocabularyEnum;
+import eu.etaxonomy.cdm.model.term.init.TermLoader;
+
+/**
+ * @author a.mueller
+ *
+ */
+public class TermLoaderTest {
+       static Logger logger = Logger.getLogger(TermLoaderTest.class);
+
+       private TermLoader termLoader;
+       private Map<UUID,DefinedTermBase> terms;
+
+       private UUID uuidGenus;
+       private UUID uuidTautonymy;
+
+       /**
+        * @throws java.lang.Exception
+        */
+       @Before
+       public void setUp() throws Exception {
+               termLoader = new TermLoader();
+               terms = new HashMap<UUID,DefinedTermBase>();
+               uuidGenus = UUID.fromString("1b11c34c-48a8-4efa-98d5-84f7f66ef43a");
+               uuidTautonymy = UUID.fromString("84521f09-3e10-43f5-aa6f-2173a55a6790");
+       }
+       
+/************** TESTS **********************************/
+
+       /**
+        * Test method for {@link eu.etaxonomy.cdm.model.term.init.TermLoader#loadTerms(java.lang.Class, java.lang.String, boolean)}.
+        */
+       @Test
+       public void testLoadRanks() {
+               
+        TermVocabulary<Rank> defaultRanks = termLoader.loadTerms(VocabularyEnum.Rank, terms);
+               assertNotNull(defaultRanks.findTermByUuid(uuidGenus));
+               assertTrue(terms.containsKey(uuidGenus));
+       }
+
+       @Test
+       public void testLoadNameTypeDesignationStatus() {
+        TermVocabulary<NameTypeDesignationStatus> defaultStatus = termLoader.loadTerms(VocabularyEnum.NameTypeDesignationStatus, terms);
+               assertNotNull(defaultStatus.findTermByUuid(uuidTautonymy));
+               assertTrue(terms.containsKey(uuidTautonymy));
+       }
+       
+       @Test
+       public void testUnloadAllTerms(){
+               DefaultTermInitializer initializer = new DefaultTermInitializer();
+               initializer.initialize();
+               Assert.assertNotNull("Editorial annotation type should be loaded", AnnotationType.EDITORIAL());
+               termLoader.unloadAllTerms();
+               Assert.assertNull("Editorial annotation type should be unloaded now", AnnotationType.EDITORIAL());
+       }
+}

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/media/MediaDefaultCacheStrategyTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/media/MediaDefaultCacheStrategyTest.java
index a17c7df5991d015c4130c9fe76b5f104231df966..4c1a25cb15eb957b1152e5d8e92d6070e396c5ea 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/media/MediaDefaultCacheStrategyTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/media/MediaDefaultCacheStrategyTest.java
@@ -18,10 +18,10 @@ import org.junit.Before;
 import org.junit.BeforeClass;\r
 import org.junit.Test;\r
 \r
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
 import eu.etaxonomy.cdm.model.media.Media;\r
 import eu.etaxonomy.cdm.model.media.MediaRepresentation;\r
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;\r
 \r
 /**\r
  * @author a.mueller\r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/BotanicNameCacheStrategyTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/BotanicNameCacheStrategyTest.java
index 81a1652d402c4f6c646b3d239bb5218533e61174..c79725d5d76bbdf05eba36e9f35feb9b605e7f2a 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/BotanicNameCacheStrategyTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/BotanicNameCacheStrategyTest.java
@@ -23,7 +23,6 @@ import org.junit.Test;
 
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.common.VerbatimTimePeriod;
 import eu.etaxonomy.cdm.model.name.INonViralName;
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;
@@ -33,6 +32,7 @@ import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
 
 /**
  * @author a.mueller

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategyTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategyTest.java
index f9f8dff2fb812003565991c9dec46e3400643c0d..a72ead8a1569f1af97420a02f720db8c7e7b034c 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategyTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategyTest.java
@@ -24,7 +24,6 @@ import eu.etaxonomy.cdm.common.UTF8;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.Team;
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.name.HybridRelationshipType;
 import eu.etaxonomy.cdm.model.name.IBotanicalName;
 import eu.etaxonomy.cdm.model.name.INonViralName;
@@ -37,6 +36,7 @@ import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
 import eu.etaxonomy.cdm.strategy.cache.HTMLTagRules;
 import eu.etaxonomy.cdm.strategy.cache.TagEnum;
 import eu.etaxonomy.cdm.strategy.cache.TaggedCacheHelper;

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/ViralNameDefaultCacheStrategyTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/ViralNameDefaultCacheStrategyTest.java
index e1de6770f56d455566f73228813f95cf52601a22..7786c385d9f94956178e66ad6963985be2d1cd5d 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/ViralNameDefaultCacheStrategyTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/ViralNameDefaultCacheStrategyTest.java
@@ -16,10 +16,10 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
 
 /**
  * @author a.mueller

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/ZooNameNoMarkerCacheStrategyTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/ZooNameNoMarkerCacheStrategyTest.java
index 29fe15d556e44e763505e3e06920e17049bd2a82..798ed7adbfae7a2ad176393356793b763ae89455 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/ZooNameNoMarkerCacheStrategyTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/ZooNameNoMarkerCacheStrategyTest.java
@@ -21,11 +21,11 @@ import org.junit.Test;
 
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.name.INonViralName;
 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
 
 /**
  * @author a.mueller

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/ZoologicalNameCacheStrategyTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/ZoologicalNameCacheStrategyTest.java
index 69ebfd4b2e1695a1f0ff6dc66f4c60ecc6d2ec8f..c1591ba263d4f95f56e005034ef2705ba1d12b97 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/ZoologicalNameCacheStrategyTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/ZoologicalNameCacheStrategyTest.java
@@ -23,12 +23,12 @@ import org.junit.Test;
 
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.name.INonViralName;
 import eu.etaxonomy.cdm.model.name.IZoologicalName;
 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
 
 /**
  * @author a.mueller

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/taxon/TaxonBaseDefaultCacheStrategyTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/taxon/TaxonBaseDefaultCacheStrategyTest.java
index b6c9be1a4a1bf383fc1c4113d185ff15c1af0a25..e52edc82d7e6a9aa84acdf0cad02dbd6ca6b69dd 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/taxon/TaxonBaseDefaultCacheStrategyTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/taxon/TaxonBaseDefaultCacheStrategyTest.java
@@ -21,7 +21,6 @@ import org.junit.Test;
 
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.Team;
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.name.IBotanicalName;
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
 import eu.etaxonomy.cdm.model.name.Rank;
@@ -32,6 +31,7 @@ import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
 import eu.etaxonomy.cdm.strategy.parser.NonViralNameParserImpl;
 
 /**

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/common/TermDefaultCacheStrategyTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/term/TermDefaultCacheStrategyTest.java
similarity index 94%
rename from cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/common/TermDefaultCacheStrategyTest.java
rename to cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/term/TermDefaultCacheStrategyTest.java
index 1b6a3a2d24dac6ed5ced407bf8b8dd1c71c8ccad..706b14ecc0d2af108ae884f9bfb6fab2376b7f0b 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/common/TermDefaultCacheStrategyTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/term/TermDefaultCacheStrategyTest.java
@@ -17,10 +17,10 @@ import org.junit.Before;
 import org.junit.BeforeClass;\r
 import org.junit.Test;\r
 \r
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;\r
 import eu.etaxonomy.cdm.model.location.NamedArea;\r
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;\r
 \r
 /**\r
  * @author a.mueller\r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/homotypicgroup/BasionymRelationCreatorTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/homotypicgroup/BasionymRelationCreatorTest.java
index 2103075c6b3cef6a8e7bda130454729723dfc74a..898941934edda6cf8068de65b461cfba0b41bb19 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/homotypicgroup/BasionymRelationCreatorTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/homotypicgroup/BasionymRelationCreatorTest.java
@@ -15,7 +15,6 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 
 import eu.etaxonomy.cdm.model.agent.Person;
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
 import eu.etaxonomy.cdm.model.name.NameRelationshipType;
 import eu.etaxonomy.cdm.model.name.Rank;
@@ -24,6 +23,7 @@ import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.SynonymType;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
 
 /**
  * @author a.mueller

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/match/DefaultMatchStrategyTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/match/DefaultMatchStrategyTest.java
index 3f54b4c55455afa59d44d6c93ccb9e1a1e973a33..0a92f1c76260c888cdefebc8b218d38e5dfcde70 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/match/DefaultMatchStrategyTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/match/DefaultMatchStrategyTest.java
@@ -25,7 +25,6 @@ import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.Team;
 import eu.etaxonomy.cdm.model.common.AnnotatableEntity;
 import eu.etaxonomy.cdm.model.common.Annotation;
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.common.LSID;
 import eu.etaxonomy.cdm.model.common.VerbatimTimePeriod;
 import eu.etaxonomy.cdm.model.location.Country;
@@ -40,6 +39,7 @@ import eu.etaxonomy.cdm.model.reference.IBookSection;
 import eu.etaxonomy.cdm.model.reference.IPrintSeries;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
 
 /**
  * @author a.mueller

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/match/MatchStrategyFactoryTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/match/MatchStrategyFactoryTest.java
index b1e0e3d389c36984e3570affa827709b5714ee9d..aad600d88eb749c768b4c400073786b518f49ca9 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/match/MatchStrategyFactoryTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/match/MatchStrategyFactoryTest.java
@@ -20,13 +20,13 @@ import org.junit.Test;
 import eu.etaxonomy.cdm.model.agent.Institution;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.Team;
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.reference.IArticle;
 import eu.etaxonomy.cdm.model.reference.IBook;
 import eu.etaxonomy.cdm.model.reference.IBookSection;
 import eu.etaxonomy.cdm.model.reference.IJournal;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
 import eu.etaxonomy.cdm.strategy.parser.TimePeriodParser;
 
 /**

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/merge/DefaultMergeStrategyTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/merge/DefaultMergeStrategyTest.java
index dd690d601badaa4708dcf4edef511d2736f0fa3b..2ebe6a7a02ac613168cb1d1df5e9fb5b150c69c0 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/merge/DefaultMergeStrategyTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/merge/DefaultMergeStrategyTest.java
@@ -30,7 +30,6 @@ import eu.etaxonomy.cdm.model.agent.InstitutionalMembership;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.Team;
 import eu.etaxonomy.cdm.model.common.Annotation;
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.common.LSID;
 import eu.etaxonomy.cdm.model.common.TimePeriod;
 import eu.etaxonomy.cdm.model.common.VerbatimTimePeriod;
@@ -49,6 +48,7 @@ import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
 import eu.etaxonomy.cdm.strategy.cache.reference.INomenclaturalReferenceCacheStrategy;
 
 /**

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/parser/NameTypeParserTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/parser/NameTypeParserTest.java
index 7ec12035091f09df429cb8e9b84d95a116d0d120..ff51359f309a4b6474b31c0eb3f2d65a823d131f 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/parser/NameTypeParserTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/parser/NameTypeParserTest.java
@@ -14,8 +14,8 @@ import org.junit.Before;
 import org.junit.BeforeClass;\r
 import org.junit.Test;\r
 \r
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;\r
 import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus;\r
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;\r
 import eu.etaxonomy.cdm.strategy.exceptions.UnknownCdmTypeException;\r
 \r
 /**\r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImplTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImplTest.java
index 18e79de6109015e0bad2c1a6713ade7b636f1edb..aa5da9fee3be2fae5831fb98e57688e19cff8bc3 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImplTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImplTest.java
@@ -35,7 +35,6 @@ import eu.etaxonomy.cdm.model.agent.INomenclaturalAuthor;
 import eu.etaxonomy.cdm.model.agent.Person;\r
 import eu.etaxonomy.cdm.model.agent.Team;\r
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;\r
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;\r
 import eu.etaxonomy.cdm.model.name.HybridRelationship;\r
 import eu.etaxonomy.cdm.model.name.IBotanicalName;\r
 import eu.etaxonomy.cdm.model.name.INonViralName;\r
@@ -54,6 +53,7 @@ import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;
 import eu.etaxonomy.cdm.model.reference.IVolumeReference;\r
 import eu.etaxonomy.cdm.model.reference.Reference;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceType;\r
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;\r
 import eu.etaxonomy.cdm.strategy.exceptions.StringNotParsableException;\r
 /**\r
  * @author a.mueller\r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/test/suite/CdmTestSuite.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/test/suite/CdmTestSuite.java
index c970609eba3539a2f84665cdba44cef843182281..fd46f28e1cdf681f2bf18c4b93b23889bdfd3574 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/test/suite/CdmTestSuite.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/test/suite/CdmTestSuite.java
@@ -15,15 +15,15 @@ import org.junit.runners.Suite;
 \r
 import eu.etaxonomy.cdm.aspectj.PropertyChangeTest;\r
 import eu.etaxonomy.cdm.model.common.CdmBaseTest;\r
-import eu.etaxonomy.cdm.model.common.DefinedTermBaseTest;\r
 import eu.etaxonomy.cdm.model.common.MarkerTypeTest;\r
-import eu.etaxonomy.cdm.model.common.OrderedTermBaseTest;\r
-import eu.etaxonomy.cdm.model.common.OrderedTermVocabularyTest;\r
-import eu.etaxonomy.cdm.model.common.TermVocabularyTest;\r
-import eu.etaxonomy.cdm.model.common.init.TermLoaderTest;\r
 import eu.etaxonomy.cdm.model.description.TextDataTest;\r
 import eu.etaxonomy.cdm.model.name.BotanicalNameTest;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonTest;\r
+import eu.etaxonomy.cdm.model.term.DefinedTermBaseTest;\r
+import eu.etaxonomy.cdm.model.term.OrderedTermBaseTest;\r
+import eu.etaxonomy.cdm.model.term.OrderedTermVocabularyTest;\r
+import eu.etaxonomy.cdm.model.term.TermVocabularyTest;\r
+import eu.etaxonomy.cdm.model.term.init.TermLoaderTest;\r
 import eu.etaxonomy.cdm.strategy.cache.name.BotanicNameCacheStrategyTest;\r
 import eu.etaxonomy.cdm.strategy.parser.NonViralNameParserImplTest;\r
 \r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/BasionymsMustShareEpithetsAndAuthorsTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/BasionymsMustShareEpithetsAndAuthorsTest.java
index 7a3e1dd8c46f372dd10364a8f958ad3cc23cd3c7..effdaf4ab7a52e1c7da9740e2bdb5b09a4bf57e5 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/BasionymsMustShareEpithetsAndAuthorsTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/BasionymsMustShareEpithetsAndAuthorsTest.java
@@ -19,7 +19,6 @@ import org.junit.Before;
 import org.junit.Test;
 
 import eu.etaxonomy.cdm.model.agent.Person;
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.name.IBotanicalName;
 import eu.etaxonomy.cdm.model.name.IZoologicalName;
 import eu.etaxonomy.cdm.model.name.NameRelationship;
@@ -28,6 +27,7 @@ import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
 import eu.etaxonomy.cdm.validation.constraint.BasionymsMustShareEpithetsAndAuthorsValidator;
 
 

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/CorrectEpithetsForRankTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/CorrectEpithetsForRankTest.java
index 9f13856d99dd00caaff6750d422aa39090b9bebf..c8cc891a0acd8baf0be2ddcb14d68a40ea7ad917 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/CorrectEpithetsForRankTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/CorrectEpithetsForRankTest.java
@@ -21,10 +21,10 @@ import org.apache.log4j.Logger;
 import org.junit.Before;\r
 import org.junit.Test;\r
 \r
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;\r
 import eu.etaxonomy.cdm.model.name.IBotanicalName;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameFactory;\r
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;\r
 import eu.etaxonomy.cdm.validation.constraint.CorrectEpithetsForRankValidator;\r
 \r
 \r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/MustHaveAuthorityTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/MustHaveAuthorityTest.java
index 181d4e18b5ad0f04466ec87efbef6545c19d3de0..b17ed6c060e866ac9081826ff95f98160466e8d0 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/MustHaveAuthorityTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/MustHaveAuthorityTest.java
@@ -21,10 +21,10 @@ import org.junit.Before;
 import org.junit.Test;
 
 import eu.etaxonomy.cdm.model.agent.Person;
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.name.IBotanicalName;
 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
 
 
 

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/NameMustFollowCodeTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/NameMustFollowCodeTest.java
index 5a30fa5d5b0676c1c3cec86667fa237300abe20c..c105ea6dc1baa72d659878210a44991647c66238 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/NameMustFollowCodeTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/NameMustFollowCodeTest.java
@@ -21,11 +21,11 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.name.HybridRelationshipType;
 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
 import eu.etaxonomy.cdm.validation.constraint.NameMustFollowCodeValidator;
 
 

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/NameValidCharactersTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/NameValidCharactersTest.java
index 6f146e151fd258f8dceef57918c2e3797dfe3f9c..85938fe6f34bd4812d01dd582b8a05a45c69979a 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/NameValidCharactersTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/NameValidCharactersTest.java
@@ -24,10 +24,10 @@ import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.name.IBotanicalName;
 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
 
 
 /**

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/ReferenceValidationTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/ReferenceValidationTest.java
index e048018173c27f31e1152e6340ba6afe6de5d6f0..a35ea697c6244b1a79bad328124a13559340b47c 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/ReferenceValidationTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/ReferenceValidationTest.java
@@ -24,11 +24,11 @@ import org.junit.Assert;
 import org.junit.Before;\r
 import org.junit.Test;\r
 \r
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;\r
 import eu.etaxonomy.cdm.model.reference.IBook;\r
 import eu.etaxonomy.cdm.model.reference.IBookSection;\r
 import eu.etaxonomy.cdm.model.reference.Reference;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;\r
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;\r
 import eu.etaxonomy.cdm.validation.constraint.InReferenceValidator;\r
 import eu.etaxonomy.cdm.validation.constraint.NoRecursiveInReferenceValidator;\r
 \r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/TaxonNameCannotBeAcceptedAndSynonymTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/TaxonNameCannotBeAcceptedAndSynonymTest.java
index e648a369763302271bd83d90ccf3ad1f4dc71a6b..181bb76a9db54b0447cb39b20f9d4693309531fe 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/TaxonNameCannotBeAcceptedAndSynonymTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/TaxonNameCannotBeAcceptedAndSynonymTest.java
@@ -19,7 +19,6 @@ import org.apache.log4j.Logger;
 import org.junit.Before;\r
 import org.junit.Test;\r
 \r
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;\r
 import eu.etaxonomy.cdm.model.name.IBotanicalName;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.name.TaxonName;\r
@@ -28,6 +27,7 @@ import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;\r
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;\r
 \r
 \r
 /**\r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/ValidLectotypeSourceTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/ValidLectotypeSourceTest.java
index d8135060bde6e8d37446793b281bf32f9653a98d..c18bcdfde7407a522528375c4a2864a8866d8af4 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/ValidLectotypeSourceTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/ValidLectotypeSourceTest.java
@@ -13,7 +13,6 @@ import org.apache.log4j.Logger;
 import org.junit.Before;
 import org.junit.Test;
 
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.name.IBotanicalName;
 import eu.etaxonomy.cdm.model.name.NameTypeDesignation;
 import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus;
@@ -26,6 +25,7 @@ import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
 import eu.etaxonomy.cdm.validation.constraint.LectotypeSourceValidator;
 
 

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/ValidPointTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/ValidPointTest.java
index 97437c46d6288600f47e8181280f20070de73567..4102b5b492af967acabd0d1751442cf93ca31ada 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/ValidPointTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/ValidPointTest.java
@@ -20,9 +20,9 @@ import org.hibernate.validator.internal.constraintvalidators.bv.NotNullValidator
 import org.junit.Before;
 import org.junit.Test;
 
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.location.Point;
 import eu.etaxonomy.cdm.model.occurrence.GatheringEvent;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
 
 
 /**

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/ValidTaxonomicYearTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/ValidTaxonomicYearTest.java
index aab2c5961aff507242c2746e9a30e544f0d6026a..258165bb852b8a163f7bf44dd9dcdf9f0adfb09e 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/ValidTaxonomicYearTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/ValidTaxonomicYearTest.java
@@ -13,13 +13,13 @@ import org.apache.log4j.Logger;
 import org.junit.Before;\r
 import org.junit.Test;\r
 \r
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;\r
 import eu.etaxonomy.cdm.model.name.IBotanicalName;\r
 import eu.etaxonomy.cdm.model.name.IZoologicalName;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameFactory;\r
 import eu.etaxonomy.cdm.model.reference.Reference;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;\r
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;\r
 import eu.etaxonomy.cdm.strategy.parser.TimePeriodParser;\r
 import eu.etaxonomy.cdm.validation.constraint.ValidTaxonomicYearValidator;\r
 \r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/ValidTypeDesignationTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/ValidTypeDesignationTest.java
index 573cfac335d621bcae4a7f066a403c606481a4cf..ecf8cf4e7595de1ac3e09fce3afc0c8472200dcb 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/ValidTypeDesignationTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/ValidTypeDesignationTest.java
@@ -13,7 +13,6 @@ import org.apache.log4j.Logger;
 import org.junit.Before;\r
 import org.junit.Test;\r
 \r
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;\r
 import eu.etaxonomy.cdm.model.name.IBotanicalName;\r
 import eu.etaxonomy.cdm.model.name.NameTypeDesignation;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r
@@ -22,6 +21,7 @@ import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.name.TaxonNameFactory;\r
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;\r
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;\r
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;\r
 import eu.etaxonomy.cdm.validation.constraint.TypeDesignationValidator;\r
 \r
 \r

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/PersistentTermInitializer.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/PersistentTermInitializer.java
index d57044dd21cc2f99489314e68df0bdfc9cac935f..6d68290e02c457255b8955f848bcef7fd6538bdf 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/PersistentTermInitializer.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/PersistentTermInitializer.java
@@ -27,12 +27,12 @@ import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.DefaultTransactionDefinition;
 
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
-import eu.etaxonomy.cdm.model.common.Representation;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
-import eu.etaxonomy.cdm.model.common.VocabularyEnum;
-import eu.etaxonomy.cdm.model.common.init.TermLoader;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.Representation;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
+import eu.etaxonomy.cdm.model.term.VocabularyEnum;
+import eu.etaxonomy.cdm.model.term.init.TermLoader;
 import eu.etaxonomy.cdm.persistence.dao.common.ITermVocabularyDao;
 
 /**

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/data/FullCoverageDataGenerator.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/data/FullCoverageDataGenerator.java
index 77699b5c9ff36801838da8f0f3a2a18d1a1e2500..169b58939f9946f165d8f7b6ce680e73013687a9 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/data/FullCoverageDataGenerator.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/data/FullCoverageDataGenerator.java
@@ -22,7 +22,6 @@ import eu.etaxonomy.cdm.model.common.AnnotatableEntity;
 import eu.etaxonomy.cdm.model.common.Annotation;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.Credit;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.EventBase;
 import eu.etaxonomy.cdm.model.common.Extension;
 import eu.etaxonomy.cdm.model.common.ExtensionType;
@@ -38,9 +37,6 @@ import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.Marker;
 import eu.etaxonomy.cdm.model.common.MarkerType;
 import eu.etaxonomy.cdm.model.common.OriginalSourceType;
-import eu.etaxonomy.cdm.model.common.Representation;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.common.TimePeriod;
 import eu.etaxonomy.cdm.model.common.User;
 import eu.etaxonomy.cdm.model.description.CategoricalData;
@@ -133,6 +129,10 @@ import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.cdm.model.taxon.TaxonNodeAgentRelation;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.Representation;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.strategy.parser.TimePeriodParser;
 
 /**

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/SingleTermUpdater.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/SingleTermUpdater.java
index 07ca09fb120910a04f35a9d14c16bba7f387746e..2fb79bf07e17ee61e4234d4a874ef302894ff918 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/SingleTermUpdater.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/SingleTermUpdater.java
@@ -16,10 +16,10 @@ import org.apache.log4j.Logger;
 \r
 import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;\r
 import eu.etaxonomy.cdm.database.ICdmDataSource;\r
-import eu.etaxonomy.cdm.model.common.TermType;\r
 import eu.etaxonomy.cdm.model.description.Feature;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.name.RankClass;\r
+import eu.etaxonomy.cdm.model.term.TermType;\r
 \r
 /**\r
  * Creates a new term if a term with the same given uuid does not exist yet\r

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/VocabularyCreator.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/VocabularyCreator.java
index 47eb04e76d2e7c9d555ddb2bf892062a45b2261a..6d0b662e38e7f67d905aba15cc7d62181548fc81 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/VocabularyCreator.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/VocabularyCreator.java
@@ -18,7 +18,7 @@ import org.apache.log4j.Logger;
 import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;\r
 import eu.etaxonomy.cdm.database.ICdmDataSource;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
-import eu.etaxonomy.cdm.model.common.TermType;\r
+import eu.etaxonomy.cdm.model.term.TermType;\r
 \r
 /**\r
  * @author a.mueller\r

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v31_33/SchemaUpdater_31_33.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v31_33/SchemaUpdater_31_33.java
index e5c7db3db267719207c0431fce31e4b2ebd08593..24245eb8297866be1b417d87c3676811474ee203 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v31_33/SchemaUpdater_31_33.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v31_33/SchemaUpdater_31_33.java
@@ -39,7 +39,6 @@ import eu.etaxonomy.cdm.model.common.ExtensionType;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.MarkerType;
 import eu.etaxonomy.cdm.model.common.OriginalSourceType;
-import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.description.MeasurementUnit;
 import eu.etaxonomy.cdm.model.description.NaturalLanguageTerm;
@@ -67,6 +66,7 @@ import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.reference.ReferenceType;
 import eu.etaxonomy.cdm.model.taxon.SynonymType;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
+import eu.etaxonomy.cdm.model.term.TermType;
 
 /**
  * @author a.mueller

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v31_33/TermVocabularyRepresentationUpdater.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v31_33/TermVocabularyRepresentationUpdater.java
index bc2873219cd56e2d759a43540d509d71b350f9ed..5bdae9805c7df37a5cd111674cb32985677b1703 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v31_33/TermVocabularyRepresentationUpdater.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v31_33/TermVocabularyRepresentationUpdater.java
@@ -23,10 +23,10 @@ import eu.etaxonomy.cdm.database.update.CaseType;
 import eu.etaxonomy.cdm.database.update.SchemaUpdateResult;\r
 import eu.etaxonomy.cdm.database.update.SchemaUpdaterStepBase;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
-import eu.etaxonomy.cdm.model.common.Representation;\r
-import eu.etaxonomy.cdm.model.common.TermType;\r
-import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
-import eu.etaxonomy.cdm.model.common.VocabularyEnum;\r
+import eu.etaxonomy.cdm.model.term.Representation;\r
+import eu.etaxonomy.cdm.model.term.TermType;\r
+import eu.etaxonomy.cdm.model.term.TermVocabulary;\r
+import eu.etaxonomy.cdm.model.term.VocabularyEnum;\r
 \r
 /**\r
  * @author a.mueller\r

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v36_40/ReferencedObjTypeUpdater.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v36_40/ReferencedObjTypeUpdater.java
index 4c476cc6cb754e6d54e684d3f7fb46ad9fd65083..dc75d9f1c137a077734f7c5e86c0f7119d9eccd2 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v36_40/ReferencedObjTypeUpdater.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v36_40/ReferencedObjTypeUpdater.java
@@ -29,7 +29,6 @@ import eu.etaxonomy.cdm.model.common.AnnotatableEntity;
 import eu.etaxonomy.cdm.model.common.Annotation;
 import eu.etaxonomy.cdm.model.common.AnnotationType;
 import eu.etaxonomy.cdm.model.common.Credit;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.EventBase;
 import eu.etaxonomy.cdm.model.common.ExtensionType;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
@@ -39,14 +38,9 @@ import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.LanguageStringBase;
 import eu.etaxonomy.cdm.model.common.MarkerType;
-import eu.etaxonomy.cdm.model.common.OrderedTerm;
-import eu.etaxonomy.cdm.model.common.OrderedTermBase;
-import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary;
 import eu.etaxonomy.cdm.model.common.ReferencedEntityBase;
 import eu.etaxonomy.cdm.model.common.RelationshipBase;
 import eu.etaxonomy.cdm.model.common.RelationshipTermBase;
-import eu.etaxonomy.cdm.model.common.Representation;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.description.CategoricalData;
 import eu.etaxonomy.cdm.model.description.CommonTaxonName;
 import eu.etaxonomy.cdm.model.description.DescriptionElementSource;
@@ -120,6 +114,12 @@ import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.cdm.model.taxon.TaxonNodeAgentRelation;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.OrderedTerm;
+import eu.etaxonomy.cdm.model.term.OrderedTermBase;
+import eu.etaxonomy.cdm.model.term.OrderedTermVocabulary;
+import eu.etaxonomy.cdm.model.term.Representation;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 
 /**

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v47_50/ProParteSynonymUpdater.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v47_50/ProParteSynonymUpdater.java
index 491da71e3beef19b4729ee39e033be3bbd7d37f8..cb21875683d6191f9219b9dab393cc6acb0354f0 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v47_50/ProParteSynonymUpdater.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v47_50/ProParteSynonymUpdater.java
@@ -23,8 +23,8 @@ import eu.etaxonomy.cdm.database.update.SchemaUpdateResult;
 import eu.etaxonomy.cdm.database.update.SchemaUpdaterStepBase;
 import eu.etaxonomy.cdm.database.update.SingleTermUpdater;
 import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
+import eu.etaxonomy.cdm.model.term.TermType;
 
 
 /**

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v50_55/SchemaUpdater_50_55.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v50_55/SchemaUpdater_50_55.java
index 4c128b081d9c6a80c4e77f6edab872b12f22b5a2..e9663e081245b96c1384bf959e0fb9d302b63290 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v50_55/SchemaUpdater_50_55.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v50_55/SchemaUpdater_50_55.java
@@ -28,7 +28,7 @@ import eu.etaxonomy.cdm.database.update.SimpleSchemaUpdaterStep;
 import eu.etaxonomy.cdm.database.update.TableNameChanger;
 import eu.etaxonomy.cdm.database.update.TermRepresentationUpdater;
 import eu.etaxonomy.cdm.database.update.v47_50.SchemaUpdater_47_50;
-import eu.etaxonomy.cdm.model.common.TermType;
+import eu.etaxonomy.cdm.model.term.TermType;
 
 /**
 /**

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/IDefinedTermDao.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/IDefinedTermDao.java
index cc92e3ff5aea850340aeeecc3e9f9beb0e4091ab..a781e1b132fc11437034c0d738948e6a95288f05 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/IDefinedTermDao.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/IDefinedTermDao.java
@@ -17,15 +17,15 @@ import java.util.Locale;
 import java.util.Set;
 import java.util.UUID;
 
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.location.Country;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.location.NamedAreaLevel;
 import eu.etaxonomy.cdm.model.location.NamedAreaType;
 import eu.etaxonomy.cdm.model.media.Media;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.persistence.dao.initializer.IBeanInitializer;
 import eu.etaxonomy.cdm.persistence.dto.TermDto;
 import eu.etaxonomy.cdm.persistence.query.OrderHint;

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/IIdentifiableDao.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/IIdentifiableDao.java
index 4f99aa4ca0588e9163008279730a106d4c5643d0..88bc91392d1ef049e912632866e08eda884e899d 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/IIdentifiableDao.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/IIdentifiableDao.java
@@ -14,12 +14,12 @@ import java.util.UUID;
 
 import org.hibernate.criterion.Criterion;
 
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.IdentifiableSource;
 import eu.etaxonomy.cdm.model.common.LSID;
 import eu.etaxonomy.cdm.model.common.MarkerType;
 import eu.etaxonomy.cdm.model.media.Rights;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.persistence.dao.initializer.IBeanInitializer;
 import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
 import eu.etaxonomy.cdm.persistence.query.MatchMode;

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/IOrderedTermVocabularyDao.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/IOrderedTermVocabularyDao.java
index 137745d68d203d5e0353451f6fd9e5ddce016198..ad0873dbfbbd892974d27fe658e075a9173799bf 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/IOrderedTermVocabularyDao.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/IOrderedTermVocabularyDao.java
@@ -9,8 +9,8 @@
 \r
 package eu.etaxonomy.cdm.persistence.dao.common;\r
 \r
-import eu.etaxonomy.cdm.model.common.OrderedTermBase;\r
-import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary;\r
+import eu.etaxonomy.cdm.model.term.OrderedTermBase;\r
+import eu.etaxonomy.cdm.model.term.OrderedTermVocabulary;\r
 \r
 \r
 /**\r

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/IRepresentationDao.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/IRepresentationDao.java
index 37cbc3838fc10f27be1b41ff9d3e959a0698b3d2..b28216ddd99e84849aff39a7ecb21871166a247f 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/IRepresentationDao.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/IRepresentationDao.java
@@ -11,7 +11,7 @@ package eu.etaxonomy.cdm.persistence.dao.common;
 \r
 import java.util.List;\r
 \r
-import eu.etaxonomy.cdm.model.common.Representation;\r
+import eu.etaxonomy.cdm.model.term.Representation;\r
 \r
 public interface IRepresentationDao extends ILanguageStringBaseDao<Representation> {\r
 \r

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/ITermVocabularyDao.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/ITermVocabularyDao.java
index becb70a18fc8f597372fe0deb292c0561257c1d9..758d0357c1de06d95dcb617b90892574e32137c7 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/ITermVocabularyDao.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/ITermVocabularyDao.java
@@ -16,9 +16,9 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.persistence.dto.TermDto;
 import eu.etaxonomy.cdm.persistence.dto.TermVocabularyDto;
 import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/description/IDescriptionDao.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/description/IDescriptionDao.java
index 3ccac50478d3fac0b4bc6805bbce8a7b16f1e406..d2ae504a03433eb1c7ebe71190eaa7cb7d435e9f 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/description/IDescriptionDao.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/description/IDescriptionDao.java
@@ -13,7 +13,6 @@ import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.MarkerType;
 import eu.etaxonomy.cdm.model.description.CommonTaxonName;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
@@ -27,6 +26,7 @@ import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.persistence.dao.common.IIdentifiableDao;
 import eu.etaxonomy.cdm.persistence.dao.initializer.IBeanInitializer;
 import eu.etaxonomy.cdm.persistence.dao.media.IMediaDao;

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/description/IFeatureTreeDao.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/description/IFeatureTreeDao.java
index 801be119557616fcbf5bf89d3faa1ec7ab53da1a..4206a3cb458ab624c9968c905474f0a113f18614 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/description/IFeatureTreeDao.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/description/IFeatureTreeDao.java
@@ -12,9 +12,9 @@ package eu.etaxonomy.cdm.persistence.dao.description;
 import java.util.List;\r
 import java.util.UUID;\r
 \r
-import eu.etaxonomy.cdm.model.common.TermType;\r
 import eu.etaxonomy.cdm.model.description.FeatureNode;\r
 import eu.etaxonomy.cdm.model.description.FeatureTree;\r
+import eu.etaxonomy.cdm.model.term.TermType;\r
 import eu.etaxonomy.cdm.persistence.dao.common.IIdentifiableDao;\r
 import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;\r
 \r

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/DefinedTermDaoImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/DefinedTermDaoImpl.java
index dafee88187f344fe045d08b97e7deed46b019be0..77a90ae4301fdde1e694fbcd44f9a384c080bd16 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/DefinedTermDaoImpl.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/DefinedTermDaoImpl.java
@@ -33,13 +33,9 @@ import org.springframework.stereotype.Repository;
 
 import eu.etaxonomy.cdm.model.common.AnnotationType;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.ExtensionType;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.MarkerType;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.description.MeasurementUnit;
 import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;
 import eu.etaxonomy.cdm.model.description.State;
@@ -61,6 +57,10 @@ import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;
 import eu.etaxonomy.cdm.model.occurrence.DerivationEventType;
 import eu.etaxonomy.cdm.model.taxon.SynonymType;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.model.view.AuditEvent;
 import eu.etaxonomy.cdm.persistence.dao.common.IDefinedTermDao;
 import eu.etaxonomy.cdm.persistence.dto.TermDto;

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/IdentifiableDaoBase.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/IdentifiableDaoBase.java
index 8c5331fa5b928f43431158668f017f329df78de5..500c847e879d4b830f4108ef56246eaf1d74c445 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/IdentifiableDaoBase.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/IdentifiableDaoBase.java
@@ -32,13 +32,13 @@ import org.hibernate.search.SearchFactory;
 
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.Credit;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.IAnnotatableEntity;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.IdentifiableSource;
 import eu.etaxonomy.cdm.model.common.LSID;
 import eu.etaxonomy.cdm.model.common.MarkerType;
 import eu.etaxonomy.cdm.model.media.Rights;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.persistence.dao.QueryParseException;
 import eu.etaxonomy.cdm.persistence.dao.common.IIdentifiableDao;
 import eu.etaxonomy.cdm.persistence.dao.common.Restriction;

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/OrderedTermVocabularyDaoImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/OrderedTermVocabularyDaoImpl.java
index 6f715c8a9136b87c77e905d227766457a8217006..be1f72ef5153a9f824094076e8ab7348bdf008df 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/OrderedTermVocabularyDaoImpl.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/OrderedTermVocabularyDaoImpl.java
@@ -11,8 +11,8 @@ package eu.etaxonomy.cdm.persistence.dao.hibernate.common;
 \r
 import org.springframework.stereotype.Repository;\r
 \r
-import eu.etaxonomy.cdm.model.common.OrderedTermBase;\r
-import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary;\r
+import eu.etaxonomy.cdm.model.term.OrderedTermBase;\r
+import eu.etaxonomy.cdm.model.term.OrderedTermVocabulary;\r
 import eu.etaxonomy.cdm.persistence.dao.common.IOrderedTermVocabularyDao;\r
 \r
 /**\r

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/RepresentationDaoImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/RepresentationDaoImpl.java
index 2ed5f11c083c1cedea026ba719be792a58a1c865..53b3b92aee04412379e9b09924b31e8781597fe6 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/RepresentationDaoImpl.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/RepresentationDaoImpl.java
@@ -12,7 +12,7 @@ import org.apache.log4j.Logger;
 import org.hibernate.Criteria;\r
 import org.springframework.stereotype.Repository;\r
 \r
-import eu.etaxonomy.cdm.model.common.Representation;\r
+import eu.etaxonomy.cdm.model.term.Representation;\r
 import eu.etaxonomy.cdm.persistence.dao.common.IRepresentationDao;\r
 \r
 /**\r

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/TermVocabularyDaoImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/TermVocabularyDaoImpl.java
index 76b61f67c4739469ed9df7771b4f1e6e90f6f1ba..c16ccb914c4f6345c0484f8791f5fd4bddef1917 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/TermVocabularyDaoImpl.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/TermVocabularyDaoImpl.java
@@ -26,11 +26,11 @@ import org.hibernate.envers.query.AuditEntity;
 import org.hibernate.envers.query.AuditQuery;
 import org.springframework.stereotype.Repository;
 
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
-import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary;
-import eu.etaxonomy.cdm.model.common.Representation;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.OrderedTermVocabulary;
+import eu.etaxonomy.cdm.model.term.Representation;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.model.view.AuditEvent;
 import eu.etaxonomy.cdm.persistence.dao.common.ITermVocabularyDao;
 import eu.etaxonomy.cdm.persistence.dto.TermDto;

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/DescriptionDaoImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/DescriptionDaoImpl.java
index a3fc1180663a93e9ccaee4be5fbc4591a8e38493..fcfab82e80f84f17f0e6eb6cc4a78e89e8ee83fd 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/DescriptionDaoImpl.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/DescriptionDaoImpl.java
@@ -28,7 +28,6 @@ import org.hibernate.envers.query.AuditQuery;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Repository;
 
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.LSID;
 import eu.etaxonomy.cdm.model.common.MarkerType;
 import eu.etaxonomy.cdm.model.description.CommonTaxonName;
@@ -44,6 +43,7 @@ import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.model.view.AuditEvent;
 import eu.etaxonomy.cdm.persistence.dao.common.OperationNotSupportedInPriorViewException;
 import eu.etaxonomy.cdm.persistence.dao.description.IDescriptionDao;

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/FeatureTreeDaoImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/FeatureTreeDaoImpl.java
index 5a3c320d3193132a2dd9f16dd1858341e8e91559..d71f2776201cbae63ee74611fc2aebb3a83bab10 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/FeatureTreeDaoImpl.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/FeatureTreeDaoImpl.java
@@ -20,12 +20,12 @@ import org.hibernate.Session;
 import org.springframework.beans.factory.annotation.Autowired;\r
 import org.springframework.stereotype.Repository;\r
 \r
-import eu.etaxonomy.cdm.model.common.TermType;\r
-import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
-import eu.etaxonomy.cdm.model.common.VocabularyEnum;\r
 import eu.etaxonomy.cdm.model.description.Feature;\r
 import eu.etaxonomy.cdm.model.description.FeatureNode;\r
 import eu.etaxonomy.cdm.model.description.FeatureTree;\r
+import eu.etaxonomy.cdm.model.term.TermType;\r
+import eu.etaxonomy.cdm.model.term.TermVocabulary;\r
+import eu.etaxonomy.cdm.model.term.VocabularyEnum;\r
 import eu.etaxonomy.cdm.persistence.dao.common.ITermVocabularyDao;\r
 import eu.etaxonomy.cdm.persistence.dao.description.IFeatureTreeDao;\r
 import eu.etaxonomy.cdm.persistence.dao.hibernate.common.IdentifiableDaoBase;\r

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/reference/ReferenceDaoHibernateImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/reference/ReferenceDaoHibernateImpl.java
index ae5b333784da9694284ee0a9433c67c1250d5598..7a3afcb53092fa33854e6a91e77288a012d7f8b4 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/reference/ReferenceDaoHibernateImpl.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/reference/ReferenceDaoHibernateImpl.java
@@ -25,7 +25,6 @@ import org.hibernate.search.Search;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Repository;
 
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.reference.IArticle;
 import eu.etaxonomy.cdm.model.reference.IBookSection;
 import eu.etaxonomy.cdm.model.reference.IInProceedings;
@@ -35,6 +34,7 @@ import eu.etaxonomy.cdm.model.reference.IThesis;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.reference.ReferenceType;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
 import eu.etaxonomy.cdm.persistence.dao.hibernate.common.IdentifiableDaoBase;
 import eu.etaxonomy.cdm.persistence.dao.reference.IReferenceDao;
 import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java
index 508044142bf4474075ba6c812b89236353c8d273..9aeddeb10ab35314f349abcda1facce367a93344 100755 (executable)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java
@@ -42,7 +42,6 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Repository;
 
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.IdentifiableSource;
 import eu.etaxonomy.cdm.model.common.LSID;
@@ -62,6 +61,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
 import eu.etaxonomy.cdm.model.taxon.UuidAndTitleCacheTaxonComparator;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.model.view.AuditEvent;
 import eu.etaxonomy.cdm.persistence.dao.hibernate.common.IdentifiableDaoBase;
 import eu.etaxonomy.cdm.persistence.dao.name.ITaxonNameDao;
@@ -1650,7 +1650,7 @@ public class TaxonDaoHibernateImpl
 
        /**
         * @param
-        * @see eu.etaxonomy.cdm.persistence.dao.taxon.ITaxonDao#countByIdentifier(java.lang.Class, java.lang.String, eu.etaxonomy.cdm.model.common.DefinedTerm, eu.etaxonomy.cdm.model.taxon.TaxonNode, eu.etaxonomy.cdm.persistence.query.MatchMode)
+        * @see eu.etaxonomy.cdm.persistence.dao.taxon.ITaxonDao#countByIdentifier(java.lang.Class, java.lang.String, eu.etaxonomy.cdm.model.term.DefinedTerm, eu.etaxonomy.cdm.model.taxon.TaxonNode, eu.etaxonomy.cdm.persistence.query.MatchMode)
         */
        @Override
        public <S extends TaxonBase> long countByIdentifier(Class<S> clazz,

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/initializer/TermBaseAutoInitializer.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/initializer/TermBaseAutoInitializer.java
index c1b8b283e91999f38d65cc7668b83b64eedb045b..e7e15d9a167125dc144d07a4643020329af38c94 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/initializer/TermBaseAutoInitializer.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/initializer/TermBaseAutoInitializer.java
@@ -10,7 +10,7 @@ package eu.etaxonomy.cdm.persistence.dao.initializer;
 \r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
 import eu.etaxonomy.cdm.model.common.RelationshipTermBase;\r
-import eu.etaxonomy.cdm.model.common.TermBase;\r
+import eu.etaxonomy.cdm.model.term.TermBase;\r
 \r
 /**\r
  * Note: Probably not really needed as we are currently loading representations and inverse representations eager.\r

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/reference/IReferenceDao.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/reference/IReferenceDao.java
index d3e55ab61185f430d4d355382d5a6a2b299217ce..12486a8f46386e327e2956e326ac9a0d971d5191 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/reference/IReferenceDao.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/reference/IReferenceDao.java
@@ -12,10 +12,10 @@ import java.util.List;
 import java.util.Set;\r
 import java.util.UUID;\r
 \r
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.reference.Reference;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceType;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;\r
 import eu.etaxonomy.cdm.persistence.dao.common.IIdentifiableDao;\r
 import eu.etaxonomy.cdm.persistence.dao.common.ITitledDao;\r
 import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;\r

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/taxon/ITaxonDao.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/taxon/ITaxonDao.java
index 0a3db02b0aa4eeac8d8c7bd7b8af4b1b6a8eeb1e..211ad1eeb93d579ddac932c1e269057fe83096c0 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/taxon/ITaxonDao.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/taxon/ITaxonDao.java
@@ -15,7 +15,6 @@ import java.util.UUID;
 
 import org.hibernate.criterion.Criterion;
 
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.MarkerType;
 import eu.etaxonomy.cdm.model.common.RelationshipBase.Direction;
@@ -31,6 +30,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.persistence.dao.common.IIdentifiableDao;
 import eu.etaxonomy.cdm.persistence.dao.common.IPublishableDao;
 import eu.etaxonomy.cdm.persistence.dao.common.ITitledDao;

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dto/AbstractTermDto.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dto/AbstractTermDto.java
index cee7845a392a189a1679d801ecb102ce975f1282..8e49dd0f22dda8fbab035a59ad0407879d5ac723 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dto/AbstractTermDto.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dto/AbstractTermDto.java
@@ -14,8 +14,8 @@ import java.net.URI;
 import java.util.Set;
 import java.util.UUID;
 
-import eu.etaxonomy.cdm.model.common.Representation;
-import eu.etaxonomy.cdm.model.common.TermType;
+import eu.etaxonomy.cdm.model.term.Representation;
+import eu.etaxonomy.cdm.model.term.TermType;
 
 /**
  * @author pplitzner

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dto/ITermRepresentation_L10n.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dto/ITermRepresentation_L10n.java
index 5e8dbfb77a90df52dcfe67f4294524a958499b02..316196d0af12ea8b6e672cdd2e2be185282b479f 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dto/ITermRepresentation_L10n.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dto/ITermRepresentation_L10n.java
@@ -10,8 +10,8 @@ package eu.etaxonomy.cdm.persistence.dto;
 
 import java.util.Set;
 
-import eu.etaxonomy.cdm.model.common.Representation;
-import eu.etaxonomy.cdm.model.common.TermBase;
+import eu.etaxonomy.cdm.model.term.Representation;
+import eu.etaxonomy.cdm.model.term.TermBase;
 
 /**
  * @author andreas

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dto/TermDto.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dto/TermDto.java
index 8c73659ec6fff0dde6b8ff1f2f21a64c64144dad..16f7c0086f7a6f9819fe732296fd5786caa04cea 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dto/TermDto.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dto/TermDto.java
@@ -18,11 +18,11 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
-import eu.etaxonomy.cdm.model.common.OrderedTermBase;
-import eu.etaxonomy.cdm.model.common.Representation;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.OrderedTermBase;
+import eu.etaxonomy.cdm.model.term.Representation;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 /**
  * @author andreas

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dto/TermVocabularyDto.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dto/TermVocabularyDto.java
index 3e463cf131848eab2f9f1ffaa9b17eb1d3c5109f..76142b7c50d70fe7d763578e94a1764ee83c0771 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dto/TermVocabularyDto.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dto/TermVocabularyDto.java
@@ -13,7 +13,7 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.UUID;
 
-import eu.etaxonomy.cdm.model.common.Representation;
+import eu.etaxonomy.cdm.model.term.Representation;
 
 /**
  * @author pplitzner

diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/PersistentTermInitializerTest.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/PersistentTermInitializerTest.java
index 38272eb0bcf3763064ddebab00f31c45949026c2..319215e9298e38eb102e5ea2854a7f171b99a7b2 100644 (file)
--- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/PersistentTermInitializerTest.java
+++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/PersistentTermInitializerTest.java
@@ -22,8 +22,8 @@ import org.unitils.spring.annotation.SpringApplicationContext;
 import org.unitils.spring.annotation.SpringBeanByType;
 
 import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.name.Rank;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.test.integration.CdmIntegrationTest;
 
 @Ignore
@@ -47,7 +47,7 @@ public class PersistentTermInitializerTest extends CdmIntegrationTest {
 //     }
 
        /**
-        * Test method for {@link eu.etaxonomy.cdm.model.common.DefaultTermInitializer#initialize()}.
+        * Test method for {@link eu.etaxonomy.cdm.model.term.DefaultTermInitializer#initialize()}.
         */
        @Test
        @Ignore // does not run yet in a test suite as the Language.DEFAULT() is not null then

diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmGenericDaoImplTest.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmGenericDaoImplTest.java
index 640777f69fef368920d9a02f8df2fe9241be9e20..0cd7b40421792adc5745b7ab3ebab655ddb4a837 100644 (file)
--- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmGenericDaoImplTest.java
+++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmGenericDaoImplTest.java
@@ -45,8 +45,6 @@ import eu.etaxonomy.cdm.model.common.Annotation;
 import eu.etaxonomy.cdm.model.common.AnnotationType;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.Credit;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.Extension;
 import eu.etaxonomy.cdm.model.common.ExtensionType;
 import eu.etaxonomy.cdm.model.common.GrantedAuthorityImpl;
@@ -60,13 +58,9 @@ import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.Marker;
 import eu.etaxonomy.cdm.model.common.MarkerType;
-import eu.etaxonomy.cdm.model.common.OrderedTermBase;
-import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary;
 import eu.etaxonomy.cdm.model.common.OriginalSourceBase;
 import eu.etaxonomy.cdm.model.common.OriginalSourceType;
 import eu.etaxonomy.cdm.model.common.RelationshipTermBase;
-import eu.etaxonomy.cdm.model.common.Representation;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.common.TimePeriod;
 import eu.etaxonomy.cdm.model.common.User;
 import eu.etaxonomy.cdm.model.common.VerbatimTimePeriod;
@@ -152,6 +146,12 @@ import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.OrderedTermBase;
+import eu.etaxonomy.cdm.model.term.OrderedTermVocabulary;
+import eu.etaxonomy.cdm.model.term.Representation;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.model.view.AuditEvent;
 import eu.etaxonomy.cdm.persistence.dao.agent.IAgentDao;
 import eu.etaxonomy.cdm.persistence.dao.common.ICdmGenericDao;

diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/DefinedTermDaoImplTest.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/DefinedTermDaoImplTest.java
index a31631b2d2f917019c4d9e140229f844efd3be9f..bd26806872e67bb350cc5c9940cf46f9786957ec 100644 (file)
--- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/DefinedTermDaoImplTest.java
+++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/DefinedTermDaoImplTest.java
@@ -30,15 +30,15 @@ import org.junit.Before;
 import org.junit.Test;\r
 import org.unitils.spring.annotation.SpringBeanByType;\r
 \r
-import eu.etaxonomy.cdm.model.common.DefinedTerm;\r
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.common.ExtensionType;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
-import eu.etaxonomy.cdm.model.common.Representation;\r
-import eu.etaxonomy.cdm.model.common.TermType;\r
-import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
 import eu.etaxonomy.cdm.model.description.Feature;\r
 import eu.etaxonomy.cdm.model.location.NamedArea;\r
+import eu.etaxonomy.cdm.model.term.DefinedTerm;\r
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;\r
+import eu.etaxonomy.cdm.model.term.Representation;\r
+import eu.etaxonomy.cdm.model.term.TermType;\r
+import eu.etaxonomy.cdm.model.term.TermVocabulary;\r
 import eu.etaxonomy.cdm.model.view.AuditEvent;\r
 import eu.etaxonomy.cdm.model.view.context.AuditEventContextHolder;\r
 import eu.etaxonomy.cdm.persistence.dao.common.IDefinedTermDao;\r

diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/TermVocabularyDaoImplTest.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/TermVocabularyDaoImplTest.java
index 6b0166893509961fc300fe924a6f294649453e1c..a0ace94464d066034b8e8ae504cc2482a6aea2d2 100644 (file)
--- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/TermVocabularyDaoImplTest.java
+++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/TermVocabularyDaoImplTest.java
@@ -28,9 +28,9 @@ import org.unitils.dbunit.annotation.DataSet;
 import org.unitils.spring.annotation.SpringBeanByType;
 
 import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.Representation;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
+import eu.etaxonomy.cdm.model.term.Representation;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.persistence.dao.common.ITermVocabularyDao;
 import eu.etaxonomy.cdm.test.integration.CdmIntegrationTest;
 

diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/DescriptionDaoHibernateImplTest.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/DescriptionDaoHibernateImplTest.java
index 67e0bcac4849dd8e8c9f515a02fff9064f75e404..059fe38622c9995e455d51b9a5f0aaac9f71bb7c 100644 (file)
--- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/DescriptionDaoHibernateImplTest.java
+++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/DescriptionDaoHibernateImplTest.java
@@ -32,12 +32,9 @@ import org.unitils.dbunit.annotation.DataSet;
 import org.unitils.dbunit.annotation.DataSets;
 import org.unitils.spring.annotation.SpringBeanByType;
 
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.MarkerType;
-import eu.etaxonomy.cdm.model.common.Representation;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.description.Distribution;
@@ -49,6 +46,9 @@ import eu.etaxonomy.cdm.model.description.TextData;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.Representation;
 import eu.etaxonomy.cdm.persistence.dao.common.IDefinedTermDao;
 import eu.etaxonomy.cdm.persistence.dao.description.IDescriptionDao;
 import eu.etaxonomy.cdm.persistence.dao.taxon.ITaxonDao;

diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/DescriptionElementDaoHibernateImplTest.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/DescriptionElementDaoHibernateImplTest.java
index 20be5d16b135701272fc0c387db09fc27e3782d9..8b8dc94f57a48695a5d0252c37944284a7d36d3c 100644 (file)
--- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/DescriptionElementDaoHibernateImplTest.java
+++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/DescriptionElementDaoHibernateImplTest.java
@@ -22,7 +22,6 @@ import org.unitils.dbunit.annotation.ExpectedDataSet;
 import org.unitils.dbunit.datasetfactory.impl.MultiSchemaXmlDataSetFactory;
 import org.unitils.spring.annotation.SpringBeanByType;
 
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.description.CategoricalData;
@@ -30,6 +29,7 @@ import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.description.State;
 import eu.etaxonomy.cdm.model.description.StateData;
 import eu.etaxonomy.cdm.model.description.TextData;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.persistence.dao.common.IDefinedTermDao;
 import eu.etaxonomy.cdm.persistence.dao.description.IDescriptionDao;
 import eu.etaxonomy.cdm.persistence.dao.description.IDescriptionElementDao;

diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/molecular/MolecularHibernateImplTest.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/molecular/MolecularHibernateImplTest.java
index e22f24918b6cb5415100ce4e0ed4713f1fe0f616..8bf3f6615a70eda1665cf9e96ed995f9247151d7 100644 (file)
--- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/molecular/MolecularHibernateImplTest.java
+++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/molecular/MolecularHibernateImplTest.java
@@ -10,10 +10,10 @@ import org.junit.Test;
 import org.unitils.dbunit.annotation.DataSet;\r
 import org.unitils.spring.annotation.SpringBeanByType;\r
 \r
-import eu.etaxonomy.cdm.model.common.DefinedTerm;\r
 import eu.etaxonomy.cdm.model.molecular.DnaSample;\r
 import eu.etaxonomy.cdm.model.molecular.PhylogeneticTree;\r
 import eu.etaxonomy.cdm.model.molecular.Sequence;\r
+import eu.etaxonomy.cdm.model.term.DefinedTerm;\r
 import eu.etaxonomy.cdm.persistence.dao.media.IMediaDao;\r
 import eu.etaxonomy.cdm.persistence.dao.occurrence.IOccurrenceDao;\r
 import eu.etaxonomy.cdm.test.integration.CdmTransactionalIntegrationTest;\r

diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.java
index 9e69e241fa034420d09c9109fa208646ef1bf0de..3852f5be6e012b1c059e39dc1bf80451f743467b 100644 (file)
--- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.java
+++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.java
@@ -32,7 +32,6 @@ import org.unitils.spring.annotation.SpringBeanByType;
 
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.name.Rank;
@@ -42,6 +41,7 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.cdm.model.taxon.TaxonNodeAgentRelation;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.model.view.context.AuditEventContextHolder;
 import eu.etaxonomy.cdm.persistence.dao.common.IDefinedTermDao;
 import eu.etaxonomy.cdm.persistence.dao.taxon.IClassificationDao;

diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/hibernate/CacheStrategyGeneratorTest.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/hibernate/CacheStrategyGeneratorTest.java
index 6085660e5af8e134910971a54a778587bccf61a0..95985e876eb54d1d898e2040cf434ce1f3c54bc3 100644 (file)
--- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/hibernate/CacheStrategyGeneratorTest.java
+++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/hibernate/CacheStrategyGeneratorTest.java
@@ -27,7 +27,6 @@ import org.unitils.spring.annotation.SpringBeanByType;
 import eu.etaxonomy.cdm.model.agent.Institution;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.Team;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.VerbatimTimePeriod;
 import eu.etaxonomy.cdm.model.molecular.Amplification;
 import eu.etaxonomy.cdm.model.name.IBotanicalName;
@@ -41,6 +40,7 @@ import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.persistence.dao.agent.IAgentDao;
 import eu.etaxonomy.cdm.persistence.dao.common.IDefinedTermDao;
 import eu.etaxonomy.cdm.persistence.dao.molecular.IAmplificationDao;

diff --git a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml
deleted file mode 100644 (file)
index 0ced10a..0000000
Binary files a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml and /dev/null differ

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/AbstractIdentifiableListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/AbstractIdentifiableListController.java
index 34692ec6931243e8fda9fcd7d8eaf9498b7f1c65..6cd59ef66d72592a695833d7e1ef1db6b3ebb238 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/AbstractIdentifiableListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/AbstractIdentifiableListController.java
@@ -29,10 +29,10 @@ import eu.etaxonomy.cdm.api.service.dto.IdentifiedEntityDTO;
 import eu.etaxonomy.cdm.api.service.dto.MarkedEntityDTO;
 import eu.etaxonomy.cdm.api.service.pager.Pager;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.MarkerType;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
 import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
 import eu.etaxonomy.cdm.persistence.query.MatchMode;
 import eu.etaxonomy.cdm.remote.controller.util.PagerParameters;

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationController.java
index cc59adc085a0fda6eac95ae15dbd3ab9d2be0748..1a8fd7137fede89f88437d229ad662892e33ddc9 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationController.java
@@ -35,11 +35,11 @@ import eu.etaxonomy.cdm.api.service.NodeSortMode;
 import eu.etaxonomy.cdm.api.service.dto.GroupedTaxonDTO;
 import eu.etaxonomy.cdm.api.service.dto.TaxonInContextDTO;
 import eu.etaxonomy.cdm.api.service.pager.Pager;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.MarkerType;
 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
 import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
 import eu.etaxonomy.cdm.remote.controller.util.PagerParameters;
 import eu.etaxonomy.cdm.remote.editor.RankPropertyEditor;

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationPortalListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationPortalListController.java
index 62aa79dbe7a87a41ef9941928c13448282ccdaf4..748ac3b73224da0991a242e4693b6bc7587bedb2 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationPortalListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationPortalListController.java
@@ -32,11 +32,11 @@ import eu.etaxonomy.cdm.api.service.ITaxonService;
 import eu.etaxonomy.cdm.api.service.ITermService;\r
 import eu.etaxonomy.cdm.exception.FilterException;\r
 import eu.etaxonomy.cdm.exception.UnpublishedException;\r
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.taxon.Classification;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;\r
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;\r
 import eu.etaxonomy.cdm.remote.editor.RankPropertyEditor;\r
 import io.swagger.annotations.Api;\r
 \r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/OrderHintPreset.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/OrderHintPreset.java
index 9eb8b3eb9cbe0d855b2420c7176403583ecac490..1f0783850faac65edd74a4733b7ee8fcc0e1f482 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/OrderHintPreset.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/OrderHintPreset.java
@@ -14,7 +14,7 @@ import java.util.List;
 import org.apache.log4j.Logger;
 
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary;
+import eu.etaxonomy.cdm.model.term.OrderedTermVocabulary;
 import eu.etaxonomy.cdm.persistence.query.OrderHint;
 
 enum OrderHintPreset {

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonController.java
index e636b967e15b6b1ecbec392c9bbae62f08258f3e..4308d5b2a71f7d0c8a3a7972efbc3a0420598aa8 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonController.java
@@ -45,7 +45,6 @@ import eu.etaxonomy.cdm.api.service.dto.TaxonRelationshipsDTO;
 import eu.etaxonomy.cdm.api.service.pager.Pager;\r
 import eu.etaxonomy.cdm.exception.UnpublishedException;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.common.MarkerType;\r
 import eu.etaxonomy.cdm.model.common.RelationshipBase.Direction;\r
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;\r
@@ -58,6 +57,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonNodeAgentRelation;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;\r
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;\r
 import eu.etaxonomy.cdm.persistence.query.OrderHint;\r
 import eu.etaxonomy.cdm.persistence.query.OrderHint.SortOrder;\r
 import eu.etaxonomy.cdm.remote.controller.util.PagerParameters;\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonListController.java
index ca6b631ff0d20714ce8ace36f87ea0bca64b1655..217d0c4133729dd7260fd6b5e56864654b33f460 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonListController.java
@@ -44,8 +44,6 @@ import eu.etaxonomy.cdm.api.service.search.LuceneMultiSearchException;
 import eu.etaxonomy.cdm.api.service.search.LuceneParseException;
 import eu.etaxonomy.cdm.api.service.search.SearchResult;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.MarkerType;
@@ -59,6 +57,8 @@ import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
 import eu.etaxonomy.cdm.persistence.query.MatchMode;
 import eu.etaxonomy.cdm.persistence.query.NameSearchOrder;
 import eu.etaxonomy.cdm.persistence.query.OrderHint;

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermController.java
index 6e09d636255d197f38d157f028384eb3c04eb84d..ac2d04f3ec45bf5dc757f440d3637f6308d48fc3 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermController.java
@@ -24,8 +24,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.ModelAndView;\r
 \r
 import eu.etaxonomy.cdm.api.service.ITermService;\r
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
-import eu.etaxonomy.cdm.model.common.OrderedTermBase;\r
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;\r
+import eu.etaxonomy.cdm.model.term.OrderedTermBase;\r
 import io.swagger.annotations.Api;\r
 \r
 /**\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermListController.java
index a63f4277981efa62ebc306615b93a6d947817e66..8c79d73ea3be46347e143ecc2939f67ee4afc08e 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermListController.java
@@ -13,7 +13,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;\r
 \r
 import eu.etaxonomy.cdm.api.service.ITermService;\r
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;\r
 import io.swagger.annotations.Api;\r
 \r
 /**\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/VocabularyController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/VocabularyController.java
index e0d430a9ed8b961b2223a80b8522cd9ae5407bfe..a7c5f3688b4f348215a4b76286ad726e28ec2261 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/VocabularyController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/VocabularyController.java
@@ -25,8 +25,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 \r
 import eu.etaxonomy.cdm.api.service.IVocabularyService;\r
 import eu.etaxonomy.cdm.api.service.pager.Pager;\r
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
-import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;\r
+import eu.etaxonomy.cdm.model.term.TermVocabulary;\r
 import io.swagger.annotations.Api;\r
 \r
 /**\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/VocabularyListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/VocabularyListController.java
index abfd39de31e30e406bcd91f21c27ae45f14818c6..c4255623ea03a79aa314bac1a6ab0d338e333c64 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/VocabularyListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/VocabularyListController.java
@@ -16,7 +16,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;\r
 \r
 import eu.etaxonomy.cdm.api.service.IVocabularyService;\r
-import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
+import eu.etaxonomy.cdm.model.term.TermVocabulary;\r
 \r
 /**\r
  * @author a.kohlbecker\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ext/ExternalGeoController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ext/ExternalGeoController.java
index d43eba62efa5272cdbfd61cb0ccfcf2f5cafec94..40a4ed1b5b8c4d0f59c2e8b5e53398ccc35ce976 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ext/ExternalGeoController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ext/ExternalGeoController.java
@@ -44,7 +44,6 @@ import eu.etaxonomy.cdm.database.UpdatableRoutingDataSource;
 import eu.etaxonomy.cdm.ext.geo.EditGeoServiceUtilities;\r
 import eu.etaxonomy.cdm.ext.geo.IEditGeoService;\r
 import eu.etaxonomy.cdm.ext.geo.OccurrenceServiceRequestParameterDto;\r
-import eu.etaxonomy.cdm.model.common.DefinedTerm;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
 import eu.etaxonomy.cdm.model.common.Marker;\r
 import eu.etaxonomy.cdm.model.common.MarkerType;\r
@@ -56,6 +55,7 @@ import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
+import eu.etaxonomy.cdm.model.term.DefinedTerm;\r
 import eu.etaxonomy.cdm.persistence.query.OrderHint;\r
 import eu.etaxonomy.cdm.persistence.query.OrderHint.SortOrder;\r
 import eu.etaxonomy.cdm.remote.controller.BaseController;\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/DefinedTermBaseList.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/DefinedTermBaseList.java
index def245acab7b13693726c398b84fd620abd9b551..e718acb951fe458b9ad2fb664b64d7b07a78938a 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/DefinedTermBaseList.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/DefinedTermBaseList.java
@@ -5,7 +5,7 @@ import java.util.HashSet;
 import java.util.Iterator;\r
 import java.util.Set;\r
 \r
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;\r
 \r
 \r
 /**\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/TermBaseListPropertyEditor.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/TermBaseListPropertyEditor.java
index 1ea43f0f22febae93eb28b66b437126a521c2055..67c7cef6666e9c17bd7a600738d4661a965eed16 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/TermBaseListPropertyEditor.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/TermBaseListPropertyEditor.java
@@ -16,7 +16,7 @@ import java.util.UUID;
 import org.apache.commons.lang.StringUtils;
 
 import eu.etaxonomy.cdm.api.service.ITermService;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
 
 /**
  * This PropertyEditor translates concatenated lists string identifiers into

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/TermBasePropertyEditor.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/TermBasePropertyEditor.java
index 91ebf8d23eac826f3669e19833d519c9c0d68c81..2dc71e139bdf8b4be249257d8f86e33b63698a5e 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/TermBasePropertyEditor.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/TermBasePropertyEditor.java
@@ -12,7 +12,7 @@ import java.beans.PropertyEditorSupport;
 import java.util.UUID;
 
 import eu.etaxonomy.cdm.api.service.ITermService;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
 
 /**
  * This PropertyEditor translates a single string identifiers into a

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/term/EnumTermList.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/term/EnumTermList.java
index ba4c3eea06a4938fdb7b3cca7de9bb64e4b4bb28..843c36320fc6303c15cf2ca0333729002bff6138 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/term/EnumTermList.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/term/EnumTermList.java
@@ -5,8 +5,8 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
-import eu.etaxonomy.cdm.model.common.EnumeratedTermVoc;
-import eu.etaxonomy.cdm.model.common.IEnumTerm;
+import eu.etaxonomy.cdm.model.term.EnumeratedTermVoc;
+import eu.etaxonomy.cdm.model.term.IEnumTerm;
 
 
 /**

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/term/EnumTermListPropertyEditor.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/term/EnumTermListPropertyEditor.java
index 06030c1bfa099a7ac58bff84d6629933cedb7cd7..18a17c816b5960e1484838c949f7a92dc93a3786 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/term/EnumTermListPropertyEditor.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/term/EnumTermListPropertyEditor.java
@@ -13,13 +13,13 @@ import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
 
-import eu.etaxonomy.cdm.model.common.EnumeratedTermVoc;
-import eu.etaxonomy.cdm.model.common.IEnumTerm;
+import eu.etaxonomy.cdm.model.term.EnumeratedTermVoc;
+import eu.etaxonomy.cdm.model.term.IEnumTerm;
 
 /**
  * This PropertyEditor translates concatenated lists string identifiers into
- * {@link eu.etaxonomy.cdm.model.common.IEnumTerm} instances. The instances can be identified by the value of the
- * {@link eu.etaxonomy.cdm.model.common.IKeyTerm#getKey() key} property. The separator for concatenations is the colon: ','
+ * {@link eu.etaxonomy.cdm.model.term.IEnumTerm} instances. The instances can be identified by the value of the
+ * {@link eu.etaxonomy.cdm.model.term.IKeyTerm#getKey() key} property. The separator for concatenations is the colon: ','
  *
  * @author a.kohlbecker
  * @since Jun 25, 2013

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/term/EnumTermPropertyEditor.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/term/EnumTermPropertyEditor.java
index bb319fb6022993e1b375f46276087c454e4d1b5f..e884c3074393296f22f74ba0017369ab517eb7d8 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/term/EnumTermPropertyEditor.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/term/EnumTermPropertyEditor.java
@@ -10,13 +10,13 @@ package eu.etaxonomy.cdm.remote.editor.term;
 
 import java.beans.PropertyEditorSupport;
 
-import eu.etaxonomy.cdm.model.common.EnumeratedTermVoc;
-import eu.etaxonomy.cdm.model.common.IEnumTerm;
+import eu.etaxonomy.cdm.model.term.EnumeratedTermVoc;
+import eu.etaxonomy.cdm.model.term.IEnumTerm;
 
 /**
- * This PropertyEditor translates a single string into a {@link eu.etaxonomy.cdm.model.common.IEnumTerm} instance.
+ * This PropertyEditor translates a single string into a {@link eu.etaxonomy.cdm.model.term.IEnumTerm} instance.
  * The instance can be identified by the value of the
- * {@link eu.etaxonomy.cdm.model.common.IKeyTerm#getKey() key} property.
+ * {@link eu.etaxonomy.cdm.model.term.IKeyTerm#getKey() key} property.
  *
  * @author a.kohlbecker
  * @since Jun 25, 2013

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/RepresentationBeanProcessor.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/RepresentationBeanProcessor.java
index 3f43818ba79b56db4daa5a845a3ae865c9d5187c..1838a8a507a76b45249edb615d6e2f246be84032 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/RepresentationBeanProcessor.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/RepresentationBeanProcessor.java
@@ -16,7 +16,7 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 
 import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.Representation;
+import eu.etaxonomy.cdm.model.term.Representation;
 import net.sf.json.JSONObject;
 import net.sf.json.JsonConfig;
 

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TermBaseBeanProcessor.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TermBaseBeanProcessor.java
index 465d5beb7663defa5da7851a29c753b94c388b03..228d10dafc301427a5e83b7ee808c712af310abc 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TermBaseBeanProcessor.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TermBaseBeanProcessor.java
@@ -15,10 +15,10 @@ import java.util.List;
 import org.apache.log4j.Logger;\r
 import org.hibernate.Hibernate;\r
 \r
-import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary;\r
 import eu.etaxonomy.cdm.model.common.RelationshipTermBase;\r
-import eu.etaxonomy.cdm.model.common.TermBase;\r
-import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
+import eu.etaxonomy.cdm.model.term.OrderedTermVocabulary;\r
+import eu.etaxonomy.cdm.model.term.TermBase;\r
+import eu.etaxonomy.cdm.model.term.TermVocabulary;\r
 import eu.etaxonomy.cdm.persistence.dto.ITermRepresentation_L10n;\r
 import eu.etaxonomy.cdm.remote.l10n.TermRepresentation_L10n;\r
 import net.sf.json.JSONObject;\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/matcher/CdmProxyBeanProcessorMatcher.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/matcher/CdmProxyBeanProcessorMatcher.java
index 9add0f2a6451b84683d188bf1e3669f0d854efd8..bec6e91f23edc7cb0d1f26768180487d0121f449 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/matcher/CdmProxyBeanProcessorMatcher.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/matcher/CdmProxyBeanProcessorMatcher.java
@@ -14,13 +14,13 @@ import org.apache.log4j.Logger;
 import org.hibernate.proxy.HibernateProxy;
 
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
-import eu.etaxonomy.cdm.model.common.TermBase;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.name.TypeDesignationBase;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
+import eu.etaxonomy.cdm.model.term.TermBase;
 import net.sf.json.processors.JsonBeanProcessorMatcher;
 
 /**

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/l10n/TermRepresentation_L10n.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/l10n/TermRepresentation_L10n.java
index 1696895570ee654186219cc74980eb54bf334a4f..93c618dd8c441e0bf8cdf72847b71015b6995821 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/l10n/TermRepresentation_L10n.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/l10n/TermRepresentation_L10n.java
@@ -14,12 +14,12 @@ import java.util.Set;
 import org.apache.log4j.Logger;\r
 import org.hibernate.Hibernate;\r
 \r
-import eu.etaxonomy.cdm.model.common.DefinedTerm;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
 import eu.etaxonomy.cdm.model.common.RelationshipTermBase;\r
-import eu.etaxonomy.cdm.model.common.Representation;\r
-import eu.etaxonomy.cdm.model.common.TermBase;\r
-import eu.etaxonomy.cdm.model.common.TermType;\r
+import eu.etaxonomy.cdm.model.term.DefinedTerm;\r
+import eu.etaxonomy.cdm.model.term.Representation;\r
+import eu.etaxonomy.cdm.model.term.TermBase;\r
+import eu.etaxonomy.cdm.model.term.TermType;\r
 import eu.etaxonomy.cdm.persistence.dto.ITermRepresentation_L10n;\r
 \r
 /**\r

diff --git a/cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/dto/assembler/lsid/AssemblerTest.java b/cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/dto/assembler/lsid/AssemblerTest.java
index 67ed1e51437750cbe5addb73a5930e02a06e074a..ffb4cfa57047eb4446dec0b0cf721674cb7b0871 100644 (file)
--- a/cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/dto/assembler/lsid/AssemblerTest.java
+++ b/cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/dto/assembler/lsid/AssemblerTest.java
@@ -41,7 +41,6 @@ import eu.etaxonomy.cdm.common.UriUtils;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
 import eu.etaxonomy.cdm.model.common.Credit;
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.common.IdentifiableSource;
 import eu.etaxonomy.cdm.model.common.LSID;
 import eu.etaxonomy.cdm.model.common.Language;
@@ -64,6 +63,7 @@ import eu.etaxonomy.cdm.model.taxon.SynonymType;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
 import eu.etaxonomy.cdm.remote.dto.dwc.SimpleDarwinRecord;
 import eu.etaxonomy.cdm.remote.dto.oaipmh.OaiDc;
 import eu.etaxonomy.cdm.remote.dto.tdwg.voc.SpeciesProfileModel;

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationController.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationController.java
index c34e2c095a2e0ec5c7273f5c1de3e854c92f34de..c2e944132362fec489ed0e13fb63af2747b4be68 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationController.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationController.java
@@ -76,7 +76,7 @@ import eu.etaxonomy.cdm.database.DataSourceNotFoundException;
 import eu.etaxonomy.cdm.database.DbSchemaValidation;\r
 import eu.etaxonomy.cdm.database.ICdmDataSource;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;\r
 import eu.etaxonomy.cdm.persistence.hibernate.HibernateConfiguration;\r
 import eu.etaxonomy.cdm.persistence.hibernate.permission.CRUD;\r
 import eu.etaxonomy.cdm.persistence.hibernate.permission.ICdmPermissionEvaluator;\r

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/cache/CdmTermCacher.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/cache/CdmTermCacher.java
index 40b6dbdbcf9ea50e148e7f0fcb95fdc67774ee5c..776c11f7b026edddb1c043f7c042a025abd62632 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/cache/CdmTermCacher.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/cache/CdmTermCacher.java
@@ -7,7 +7,7 @@ import org.springframework.stereotype.Component;
 
 import eu.etaxonomy.cdm.api.service.ITermService;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
 
 /**
  * CDM Entity Cacher class which handles the caching of Defined Terms.

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacade.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacade.java
index 55891cc40e192bb19016206646aaca64771d708b..4b5eff06e220911bccda80dc99406910a3ef6f25 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacade.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacade.java
@@ -32,7 +32,6 @@ import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.common.Annotation;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.IOriginalSource;
 import eu.etaxonomy.cdm.model.common.IdentifiableSource;
 import eu.etaxonomy.cdm.model.common.Identifier;
@@ -61,6 +60,7 @@ import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
 import eu.etaxonomy.cdm.model.reference.Reference;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 
 /**
  * This class is a facade to the eu.etaxonomy.cdm.model.occurrence package from

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeFieldUnitCacheStrategy.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeFieldUnitCacheStrategy.java
index cdd5d84265516645bd71c9dbe052737d10c39b35..5c45a93b9fdad846e1f4c393ce3c39f3e69344bd 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeFieldUnitCacheStrategy.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeFieldUnitCacheStrategy.java
@@ -21,12 +21,12 @@ import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.Team;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.Representation;
 import eu.etaxonomy.cdm.model.common.TimePeriod;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.occurrence.Collection;
 import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
+import eu.etaxonomy.cdm.model.term.Representation;
 import eu.etaxonomy.cdm.strategy.StrategyBase;
 import eu.etaxonomy.cdm.strategy.cache.agent.TeamDefaultCacheStrategy;
 import eu.etaxonomy.cdm.strategy.cache.common.IIdentifiableEntityCacheStrategy;

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ClassificationServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ClassificationServiceImpl.java
index f26b12d6c3b13b2d7418c11b46dcb3c3423dc957..c6e468ba546a8fcb0e3c2d5cba48b4435efd085d 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ClassificationServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ClassificationServiceImpl.java
@@ -48,7 +48,6 @@ import eu.etaxonomy.cdm.exception.UnpublishedException;
 import eu.etaxonomy.cdm.hibernate.HHH_9751_Util;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.ITreeNode;
 import eu.etaxonomy.cdm.model.common.MarkerType;
 import eu.etaxonomy.cdm.model.common.TreeIndex;
@@ -69,6 +68,7 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
 import eu.etaxonomy.cdm.persistence.dao.common.IDefinedTermDao;
 import eu.etaxonomy.cdm.persistence.dao.initializer.IBeanInitializer;
 import eu.etaxonomy.cdm.persistence.dao.taxon.IClassificationDao;

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DatabaseServiceHibernateImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DatabaseServiceHibernateImpl.java
index 14a6907dfb333be592fc0782c833755b164a89f4..c7c11918552c491acb29f794203b4107232e6f79 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DatabaseServiceHibernateImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DatabaseServiceHibernateImpl.java
@@ -36,8 +36,8 @@ import eu.etaxonomy.cdm.database.DataSourceNotFoundException;
 import eu.etaxonomy.cdm.database.DatabaseTypeEnum;
 import eu.etaxonomy.cdm.database.H2Mode;
 import eu.etaxonomy.cdm.database.ICdmDataSource;
-import eu.etaxonomy.cdm.model.common.init.TermNotFoundException;
 import eu.etaxonomy.cdm.model.metadata.CdmMetaDataPropertyName;
+import eu.etaxonomy.cdm.model.term.init.TermNotFoundException;
 
 
 

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DefaultCategoricalDescriptionBuilder.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DefaultCategoricalDescriptionBuilder.java
index b8a1869de33fd7946ee3309f341d6dbf27ee175c..4f4a910da7dcdb1552112e145189088905d37f90 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DefaultCategoricalDescriptionBuilder.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DefaultCategoricalDescriptionBuilder.java
@@ -4,12 +4,12 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.description.State;
 import eu.etaxonomy.cdm.model.description.StateData;
 import eu.etaxonomy.cdm.model.description.TextData;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 
 public class DefaultCategoricalDescriptionBuilder extends AbstractCategoricalDescriptionBuilder{
 

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptionBuilder.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptionBuilder.java
index 0e384a162044565a827a80936b2540139dce25d4..011e262e7e65c89da81eadb5f5e23bfd73f0af8a 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptionBuilder.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptionBuilder.java
@@ -3,10 +3,10 @@ package eu.etaxonomy.cdm.api.service;
 import java.util.List;
 
 import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.Representation;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.description.TextData;
+import eu.etaxonomy.cdm.model.term.Representation;
 
 /**
  * Abstract class that defines the basic element for constructing natural language descriptions.

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptionServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptionServiceImpl.java
index 46e3062e8042cf972fd455b7797cce9cdd1a8035..65f7200fa280b7328dc589544ea33fc9f87a76df 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptionServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptionServiceImpl.java
@@ -35,11 +35,9 @@ import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.common.Annotation;
 import eu.etaxonomy.cdm.model.common.AnnotationType;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.Marker;
 import eu.etaxonomy.cdm.model.common.MarkerType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.description.DescriptiveDataSet;
@@ -57,6 +55,8 @@ import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.persistence.dao.common.IDefinedTermDao;
 import eu.etaxonomy.cdm.persistence.dao.common.ITermVocabularyDao;
 import eu.etaxonomy.cdm.persistence.dao.description.IDescriptionDao;

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/FeatureNodeServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/FeatureNodeServiceImpl.java
index fdb3d0ddf127420d9ba94040dab1e6723aefbe51..42baa4ed658da266adadb52266328a2b6251945d 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/FeatureNodeServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/FeatureNodeServiceImpl.java
@@ -24,9 +24,9 @@ import eu.etaxonomy.cdm.api.service.config.NodeDeletionConfigurator.ChildHandlin
 import eu.etaxonomy.cdm.api.service.exception.ReferencedObjectUndeletableException;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.description.FeatureNode;
 import eu.etaxonomy.cdm.model.description.FeatureTree;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
 import eu.etaxonomy.cdm.persistence.dao.description.IFeatureNodeDao;
 
 /**

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/FeatureTreeServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/FeatureTreeServiceImpl.java
index f04ba6d2dbce35e48176acc017211645779285e2..ce957ed41ed6421ee66721772dc5fe320fb85988 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/FeatureTreeServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/FeatureTreeServiceImpl.java
@@ -25,9 +25,9 @@ import eu.etaxonomy.cdm.api.service.config.FeatureNodeDeletionConfigurator;
 import eu.etaxonomy.cdm.api.service.config.NodeDeletionConfigurator.ChildHandling;\r
 import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;\r
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;\r
-import eu.etaxonomy.cdm.model.common.TermType;\r
 import eu.etaxonomy.cdm.model.description.FeatureNode;\r
 import eu.etaxonomy.cdm.model.description.FeatureTree;\r
+import eu.etaxonomy.cdm.model.term.TermType;\r
 import eu.etaxonomy.cdm.persistence.dao.description.IFeatureNodeDao;\r
 import eu.etaxonomy.cdm.persistence.dao.description.IFeatureTreeDao;\r
 import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;\r

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDatabaseService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDatabaseService.java
index 68ae0c47ca6538bcca3c70cdbc5b75addacb3638..7919db70bd1a3fac702cafb3093e10f3cf6cd1d5 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDatabaseService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDatabaseService.java
@@ -18,8 +18,8 @@ import eu.etaxonomy.cdm.database.DataSourceNotFoundException;
 import eu.etaxonomy.cdm.database.DatabaseTypeEnum;\r
 import eu.etaxonomy.cdm.database.H2Mode;\r
 import eu.etaxonomy.cdm.database.ICdmDataSource;\r
-import eu.etaxonomy.cdm.model.common.init.TermNotFoundException;\r
 import eu.etaxonomy.cdm.model.metadata.CdmMetaDataPropertyName;\r
+import eu.etaxonomy.cdm.model.term.init.TermNotFoundException;\r
 \r
 /**\r
  * Service interface which provides functionality to directly access database\r

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDescriptionService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDescriptionService.java
index 0d516182bad928a3f7b2194aa5d00e09e5cf8d07..7aaf4420eb6a2b42a87f1ecbf1562f4ff9b69022 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDescriptionService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDescriptionService.java
@@ -19,11 +19,9 @@ import eu.etaxonomy.cdm.api.service.dto.TaxonDistributionDTO;
 import eu.etaxonomy.cdm.api.service.pager.Pager;
 import eu.etaxonomy.cdm.api.utility.DescriptionUtility;
 import eu.etaxonomy.cdm.model.common.Annotation;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.Marker;
 import eu.etaxonomy.cdm.model.common.MarkerType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.description.Distribution;
@@ -37,6 +35,8 @@ import eu.etaxonomy.cdm.model.location.NamedAreaLevel;
 import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.persistence.dao.initializer.IBeanInitializer;
 import eu.etaxonomy.cdm.persistence.dto.MergeResult;
 import eu.etaxonomy.cdm.persistence.dto.TermDto;

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IFeatureNodeService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IFeatureNodeService.java
index 59b1c82c80bdb25b7f8c38cbee685dceefd8fedb..a8d83227e1804f4fc43e5a4a40e2ea043463f349 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IFeatureNodeService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IFeatureNodeService.java
@@ -12,8 +12,8 @@ package eu.etaxonomy.cdm.api.service;
 import java.util.UUID;\r
 \r
 import eu.etaxonomy.cdm.api.service.config.FeatureNodeDeletionConfigurator;\r
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.description.FeatureNode;\r
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;\r
 \r
 /**\r
  * @author n.hoffmann\r

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IFeatureTreeService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IFeatureTreeService.java
index c1fced5d27a7a1fe381b759d91caa290879d6c79..b2b0a650ef53de9ef95d449aa85c0943432ce384 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IFeatureTreeService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IFeatureTreeService.java
@@ -14,9 +14,9 @@ import java.util.List;
 import java.util.Map;\r
 import java.util.UUID;\r
 \r
-import eu.etaxonomy.cdm.model.common.TermType;\r
 import eu.etaxonomy.cdm.model.description.FeatureNode;\r
 import eu.etaxonomy.cdm.model.description.FeatureTree;\r
+import eu.etaxonomy.cdm.model.term.TermType;\r
 import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;\r
 \r
 public interface IFeatureTreeService extends IIdentifiableEntityService<FeatureTree> {\r

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IIdentifiableEntityService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IIdentifiableEntityService.java
index 1adee7da8daa0518dd76687fecf315783e05394d..c14b308aa5051a7d54fc50cc430a8e53bc01e50f 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IIdentifiableEntityService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IIdentifiableEntityService.java
@@ -19,13 +19,13 @@ import eu.etaxonomy.cdm.api.service.dto.IdentifiedEntityDTO;
 import eu.etaxonomy.cdm.api.service.dto.MarkedEntityDTO;
 import eu.etaxonomy.cdm.api.service.pager.Pager;
 import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.ISourceable;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.IdentifiableSource;
 import eu.etaxonomy.cdm.model.common.LSID;
 import eu.etaxonomy.cdm.model.common.MarkerType;
 import eu.etaxonomy.cdm.model.media.Rights;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.persistence.dao.common.Restriction;
 import eu.etaxonomy.cdm.persistence.dao.initializer.IBeanInitializer;
 import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ILocationService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ILocationService.java
index ca52209f84027b22de1ce429331a4a796e6afa98..5102d92b810b02784e5f095924f8bd4114d64471 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ILocationService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ILocationService.java
@@ -11,13 +11,13 @@ package eu.etaxonomy.cdm.api.service;
 
 import java.util.List;
 
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
-import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.location.NamedAreaLevel;
 import eu.etaxonomy.cdm.model.location.NamedAreaType;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.OrderedTermVocabulary;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 /**
  * @author n.hoffman

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IReferenceService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IReferenceService.java
index e03769bfd6190d629df9b282c3ac582bbf9291fa..7172a34f4bdb32b0b49cee723d4320fd834af804 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IReferenceService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IReferenceService.java
@@ -15,10 +15,10 @@ import java.util.UUID;
 
 import eu.etaxonomy.cdm.api.service.dto.IdentifiedEntityDTO;
 import eu.etaxonomy.cdm.api.service.pager.Pager;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.reference.ReferenceType;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
 import eu.etaxonomy.cdm.persistence.query.MatchMode;
 import eu.etaxonomy.cdm.persistence.query.OrderHint;

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonNodeService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonNodeService.java
index a7edf293721b10f9b7224d6fd39a5b5954fd90b3..d9cb22670372553042e4729dad92875a85cdbc99 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonNodeService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonNodeService.java
@@ -20,7 +20,6 @@ import eu.etaxonomy.cdm.api.service.dto.TaxonDistributionDTO;
 import eu.etaxonomy.cdm.api.service.pager.Pager;
 import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
 import eu.etaxonomy.cdm.filter.TaxonNodeFilter;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
@@ -28,6 +27,7 @@ import eu.etaxonomy.cdm.model.taxon.SynonymType;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.cdm.model.taxon.TaxonNodeAgentRelation;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
 import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
 

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonService.java
index d37445947459a1813951ea6d0ac2d72e5bc28925..39729dc6a8e0831d5a002e810a1559b8c11373af 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonService.java
@@ -32,7 +32,6 @@ import eu.etaxonomy.cdm.api.service.search.LuceneParseException;
 import eu.etaxonomy.cdm.api.service.search.SearchResult;
 import eu.etaxonomy.cdm.api.service.util.TaxonRelationshipEdge;
 import eu.etaxonomy.cdm.exception.UnpublishedException;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.MarkerType;
@@ -54,6 +53,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.persistence.dao.initializer.IBeanInitializer;
 import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
 import eu.etaxonomy.cdm.persistence.query.MatchMode;

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITermService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITermService.java
index 773b79885506fb3bf14649ffae7f590db7dfbd35..95b25ee44ac95586306b91ea96c417aea257bc56 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITermService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITermService.java
@@ -21,19 +21,19 @@ import java.util.UUID;
 import eu.etaxonomy.cdm.api.service.TermServiceImpl.TermMovePosition;
 import eu.etaxonomy.cdm.api.service.config.TermDeletionConfigurator;
 import eu.etaxonomy.cdm.api.service.pager.Pager;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.LanguageStringBase;
-import eu.etaxonomy.cdm.model.common.OrderedTermBase;
-import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary;
-import eu.etaxonomy.cdm.model.common.Representation;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.location.NamedAreaLevel;
 import eu.etaxonomy.cdm.model.location.NamedAreaType;
 import eu.etaxonomy.cdm.model.media.Media;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.OrderedTermBase;
+import eu.etaxonomy.cdm.model.term.OrderedTermVocabulary;
+import eu.etaxonomy.cdm.model.term.Representation;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.persistence.dao.initializer.IBeanInitializer;
 import eu.etaxonomy.cdm.persistence.dto.TermDto;
 import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IVocabularyService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IVocabularyService.java
index 975a8a9f4137df3a66723d9e65111584d05eb41c..47a19fa0fb4fe510dd2629ca9742db4e8c31a777 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IVocabularyService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IVocabularyService.java
@@ -14,10 +14,10 @@ import java.util.List;
 import java.util.UUID;
 
 import eu.etaxonomy.cdm.api.service.pager.Pager;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.persistence.dto.TermDto;
 import eu.etaxonomy.cdm.persistence.dto.TermVocabularyDto;
 import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBase.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBase.java
index 468a6fb8e555d15ee5353967db2d90ac34545e2e..44deb596f0b3142ac072a0b061df0363fcd93512 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBase.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBase.java
@@ -31,13 +31,13 @@ import eu.etaxonomy.cdm.common.monitor.DefaultProgressMonitor;
 import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.ISourceable;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.IdentifiableSource;
 import eu.etaxonomy.cdm.model.common.LSID;
 import eu.etaxonomy.cdm.model.common.MarkerType;
 import eu.etaxonomy.cdm.model.media.Rights;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.persistence.dao.common.IIdentifiableDao;
 import eu.etaxonomy.cdm.persistence.dao.common.Restriction;
 import eu.etaxonomy.cdm.persistence.dao.hibernate.HibernateBeanInitializer;

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/LocationServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/LocationServiceImpl.java
index d540a9e2f5cad7e70ec3f56fc264ca668b73bb07..ceb0568bcf3fcdb45cf3f15238dcd4c6add0c231 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/LocationServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/LocationServiceImpl.java
@@ -20,13 +20,13 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
-import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.location.NamedAreaLevel;
 import eu.etaxonomy.cdm.model.location.NamedAreaType;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.OrderedTermVocabulary;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.persistence.dao.common.IDefinedTermDao;
 import eu.etaxonomy.cdm.persistence.dao.common.IOrderedTermVocabularyDao;
 import eu.etaxonomy.cdm.persistence.dao.common.ITermVocabularyDao;

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/MicroFormatCategoricalDescriptionBuilder.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/MicroFormatCategoricalDescriptionBuilder.java
index f4613e29b61e3b4a10604a00b82ea98233d78b13..990ef541e09a7cdfe0911f04a6e57d35076f51ac 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/MicroFormatCategoricalDescriptionBuilder.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/MicroFormatCategoricalDescriptionBuilder.java
@@ -6,13 +6,13 @@ import java.util.Set;
 
 import org.apache.commons.lang.StringUtils;
 
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.description.State;
 import eu.etaxonomy.cdm.model.description.StateData;
 import eu.etaxonomy.cdm.model.description.TextData;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 
 public class MicroFormatCategoricalDescriptionBuilder extends AbstractCategoricalDescriptionBuilder{
 

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceImpl.java
index c42d9c60f1e080140bb1d930a27d07a08eb8ce3f..adda2bbdb20d61f4a5e91dae54a75daff6c8cb8f 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceImpl.java
@@ -76,8 +76,6 @@ import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.CdmBaseType;
 import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.description.CategoricalData;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
@@ -110,6 +108,8 @@ import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
 import eu.etaxonomy.cdm.persistence.dao.common.IDefinedTermDao;
 import eu.etaxonomy.cdm.persistence.dao.initializer.AbstractBeanInitializer;
 import eu.etaxonomy.cdm.persistence.dao.occurrence.IOccurrenceDao;

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ReferenceServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ReferenceServiceImpl.java
index ccea17e1bdee9ea345b010003c51918aaf7d210b..02ecf01979dd65e3e6d2fc24c083ebf143b0175c 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ReferenceServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ReferenceServiceImpl.java
@@ -21,10 +21,10 @@ import org.springframework.transaction.annotation.Transactional;
 \r
 import eu.etaxonomy.cdm.api.service.dto.IdentifiedEntityDTO;\r
 import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;\r
-import eu.etaxonomy.cdm.model.common.DefinedTerm;\r
 import eu.etaxonomy.cdm.model.reference.Reference;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceType;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
+import eu.etaxonomy.cdm.model.term.DefinedTerm;\r
 import eu.etaxonomy.cdm.persistence.dao.reference.IReferenceDao;\r
 import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;\r
 import eu.etaxonomy.cdm.persistence.query.MatchMode;\r

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java
index 8d9da787781915bd4edea19500f7bbbae72fba91..6b43c1beac0cd4ebc5da0b7578d2c5442c6088b7 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java
@@ -44,7 +44,6 @@ import eu.etaxonomy.cdm.hibernate.HHH_9751_Util;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.TreeIndex;
@@ -64,6 +63,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.cdm.model.taxon.TaxonNodeAgentRelation;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.persistence.dao.initializer.IBeanInitializer;
 import eu.etaxonomy.cdm.persistence.dao.taxon.ITaxonNodeDao;
 import eu.etaxonomy.cdm.persistence.dao.taxon.ITaxonNodeFilterDao;

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java
index e71243b5e4a3ec664312ec2c204482a4a400bba9..6781c2926ced809ca960b64d9ddfb16d24feafb1 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java
@@ -72,7 +72,6 @@ import eu.etaxonomy.cdm.model.CdmBaseType;
 import eu.etaxonomy.cdm.model.common.Annotation;
 import eu.etaxonomy.cdm.model.common.AnnotationType;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.IdentifiableSource;
 import eu.etaxonomy.cdm.model.common.Language;
@@ -112,6 +111,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.persistence.dao.initializer.AbstractBeanInitializer;
 import eu.etaxonomy.cdm.persistence.dao.name.ITaxonNameDao;
 import eu.etaxonomy.cdm.persistence.dao.occurrence.IOccurrenceDao;

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TermServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TermServiceImpl.java
index a7630fba8dc8280bc5c0b905264893e09c1f3555..f9641c82d04e906a79665818c35c2cdf968c2d7c 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TermServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TermServiceImpl.java
@@ -37,19 +37,19 @@ import eu.etaxonomy.cdm.api.service.pager.impl.DefaultPagerImpl;
 import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.LanguageStringBase;
-import eu.etaxonomy.cdm.model.common.OrderedTermBase;
-import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary;
-import eu.etaxonomy.cdm.model.common.Representation;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.location.NamedAreaLevel;
 import eu.etaxonomy.cdm.model.location.NamedAreaType;
 import eu.etaxonomy.cdm.model.media.Media;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.OrderedTermBase;
+import eu.etaxonomy.cdm.model.term.OrderedTermVocabulary;
+import eu.etaxonomy.cdm.model.term.Representation;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.persistence.dao.common.IDefinedTermDao;
 import eu.etaxonomy.cdm.persistence.dao.common.ILanguageStringBaseDao;
 import eu.etaxonomy.cdm.persistence.dao.common.ILanguageStringDao;

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/VocabularyServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/VocabularyServiceImpl.java
index 8a9426d2e68942d3c4b8b867f6bdb6400d72c03e..63ae17be15dbbf70eac19018798d11b18817d452 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/VocabularyServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/VocabularyServiceImpl.java
@@ -21,10 +21,10 @@ import org.springframework.transaction.annotation.Transactional;
 import eu.etaxonomy.cdm.api.service.pager.Pager;
 import eu.etaxonomy.cdm.api.service.pager.impl.DefaultPagerImpl;
 import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.persistence.dao.common.ITermVocabularyDao;
 import eu.etaxonomy.cdm.persistence.dto.TermDto;
 import eu.etaxonomy.cdm.persistence.dto.TermVocabularyDto;

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/description/TransmissionEngineDistribution.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/description/TransmissionEngineDistribution.java
index 22b6d89a57b82662bfd972b850115472b9a62d4b..2078a07f80e46ebd2e48c4928ab5f63b3625bc22 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/description/TransmissionEngineDistribution.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/description/TransmissionEngineDistribution.java
@@ -43,12 +43,10 @@ import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
 import eu.etaxonomy.cdm.common.monitor.NullProgressMonitor;
 import eu.etaxonomy.cdm.common.monitor.SubProgressMonitor;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.Extension;
 import eu.etaxonomy.cdm.model.common.ExtensionType;
 import eu.etaxonomy.cdm.model.common.Marker;
 import eu.etaxonomy.cdm.model.common.MarkerType;
-import eu.etaxonomy.cdm.model.common.OrderedTermBase;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.description.DescriptionElementSource;
 import eu.etaxonomy.cdm.model.description.Distribution;
@@ -59,6 +57,8 @@ import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.OrderedTermBase;
 import eu.etaxonomy.cdm.persistence.dto.ClassificationLookupDTO;
 
 /**

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/IdentifiedEntityDTO.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/IdentifiedEntityDTO.java
index 51ef78fe3ea207f1e54bf3d8beccd16a7cc7b29a..a597fe8810bc1df6bec561b47912533cf64f5806 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/IdentifiedEntityDTO.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/IdentifiedEntityDTO.java
@@ -11,8 +11,8 @@ package eu.etaxonomy.cdm.api.service.dto;
 import java.io.Serializable;
 import java.util.UUID;
 
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 
 /**
  * @author a.mueller

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/TaxonRelationshipsDTO.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/TaxonRelationshipsDTO.java
index 95517272c0f6e1754e6d2cdd72ad86c58914c504..7f26cd35636d96925c79260c4ed4d0c4d49ef8ad 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/TaxonRelationshipsDTO.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/TaxonRelationshipsDTO.java
@@ -19,10 +19,10 @@ import eu.etaxonomy.cdm.common.CdmUtils;
 import eu.etaxonomy.cdm.format.taxon.TaxonRelationshipFormatter;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.RelationshipBase.Direction;
-import eu.etaxonomy.cdm.model.common.Representation;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
+import eu.etaxonomy.cdm.model.term.Representation;
 import eu.etaxonomy.cdm.persistence.dto.TermDto;
 import eu.etaxonomy.cdm.strategy.cache.TagEnum;
 import eu.etaxonomy.cdm.strategy.cache.TaggedCacheHelper;

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/name/TypeDesignationSetManager.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/name/TypeDesignationSetManager.java
index b2e0cc03c40c0614cb197f435f6f0d07996303c5..d93545e6f7ba126191ae35f2922b51ece6a62681 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/name/TypeDesignationSetManager.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/name/TypeDesignationSetManager.java
@@ -30,7 +30,6 @@ import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.IdentifiableSource;
 import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.common.VersionableEntity;
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
 import eu.etaxonomy.cdm.model.name.NameTypeDesignation;
@@ -44,6 +43,7 @@ import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
 import eu.etaxonomy.cdm.model.occurrence.MediaSpecimen;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.model.reference.Reference;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.ref.EntityReference;
 import eu.etaxonomy.cdm.ref.TypedEntityReference;
 import eu.etaxonomy.cdm.strategy.cache.TagEnum;

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/util/AbstractRelationshipEdge.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/util/AbstractRelationshipEdge.java
index f87a6a83a3112ec4f507238196afc55390e3b7bd..46a8a048ebc4568f5654d66c66cc019cc61e47f9 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/util/AbstractRelationshipEdge.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/util/AbstractRelationshipEdge.java
@@ -5,8 +5,8 @@ import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.Set;
 
-import eu.etaxonomy.cdm.model.common.RelationshipBase.Direction;
 import eu.etaxonomy.cdm.model.common.RelationshipTermBase;
+import eu.etaxonomy.cdm.model.common.RelationshipBase.Direction;
 
 /**
  * Holds a RelationshipType ({@link RelationshipTermBase}) of type {@code <T>}

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/utility/DescriptionUtility.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/utility/DescriptionUtility.java
index a2eb16a0f91ec30a26969f90096da1a4e0377104..d886971a832ae267e441f1b74f03f37f63dc3741 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/utility/DescriptionUtility.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/utility/DescriptionUtility.java
@@ -20,11 +20,11 @@ import eu.etaxonomy.cdm.api.service.DistributionTree;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.Marker;
 import eu.etaxonomy.cdm.model.common.MarkerType;
-import eu.etaxonomy.cdm.model.common.OrderedTermBase;
 import eu.etaxonomy.cdm.model.description.Distribution;
 import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.location.NamedAreaLevel;
+import eu.etaxonomy.cdm.model.term.OrderedTermBase;
 import eu.etaxonomy.cdm.persistence.dao.common.IDefinedTermDao;
 
 /**

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/validation/batch/BatchValidationUtil.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/validation/batch/BatchValidationUtil.java
index 96e0bdaaa36052d62101f54843a0e359d1424bd3..1c1e88d10c3e56876560cbd4ce01b1306f844fe4 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/validation/batch/BatchValidationUtil.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/validation/batch/BatchValidationUtil.java
@@ -24,10 +24,8 @@ import eu.etaxonomy.cdm.api.service.IService;
 import eu.etaxonomy.cdm.api.service.ITaxonService;\r
 import eu.etaxonomy.cdm.model.agent.AgentBase;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.common.Group;\r
 import eu.etaxonomy.cdm.model.common.ICdmBase;\r
-import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
 import eu.etaxonomy.cdm.model.common.User;\r
 import eu.etaxonomy.cdm.model.description.DescriptionBase;\r
 import eu.etaxonomy.cdm.model.description.FeatureNode;\r
@@ -49,6 +47,8 @@ import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;\r
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;\r
+import eu.etaxonomy.cdm.model.term.TermVocabulary;\r
 \r
 /**\r
  * @author ayco_holleman\r

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeCacheStrategyInjectionTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeCacheStrategyInjectionTest.java
index ac1f00a0135d5f9e8a273d1aadb94c3d0066a3ec..c973bb71b830cd974b338b98257ee30874c45841 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeCacheStrategyInjectionTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeCacheStrategyInjectionTest.java
@@ -26,7 +26,6 @@ import eu.etaxonomy.cdm.api.service.ITaxonService;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.Team;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.TimePeriod;
@@ -49,6 +48,7 @@ import eu.etaxonomy.cdm.model.occurrence.GatheringEvent;
 import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.strategy.parser.TimePeriodParser;
 import eu.etaxonomy.cdm.test.integration.CdmTransactionalIntegrationTest;
 

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeCacheStrategyTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeCacheStrategyTest.java
index 7845b6f0996bda1113629ad1e276e0d884e0ef19..ec058d2a17a7b1c5ea6d3d8adfa8c07b700a9d31 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeCacheStrategyTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeCacheStrategyTest.java
@@ -15,7 +15,6 @@ import org.junit.Test;
 
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.Team;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.TimePeriod;
@@ -34,6 +33,7 @@ import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
 import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
 import eu.etaxonomy.cdm.model.occurrence.GatheringEvent;
 import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.strategy.parser.TimePeriodParser;
 import eu.etaxonomy.cdm.test.TermTestBase;
 

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeFieldUnitCacheStrategyTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeFieldUnitCacheStrategyTest.java
index 595e6bfc9109c8d14178c2ece556c4f19e2c732b..5a47d4c5d3a79d945bc36e0e457f994be31e760c 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeFieldUnitCacheStrategyTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeFieldUnitCacheStrategyTest.java
@@ -15,7 +15,6 @@ import org.junit.Test;
 \r
 import eu.etaxonomy.cdm.model.agent.Person;\r
 import eu.etaxonomy.cdm.model.agent.Team;\r
-import eu.etaxonomy.cdm.model.common.DefinedTerm;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
 import eu.etaxonomy.cdm.model.common.LanguageString;\r
 import eu.etaxonomy.cdm.model.common.TimePeriod;\r
@@ -34,6 +33,7 @@ import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
 import eu.etaxonomy.cdm.model.occurrence.FieldUnit;\r
 import eu.etaxonomy.cdm.model.occurrence.GatheringEvent;\r
 import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;\r
+import eu.etaxonomy.cdm.model.term.DefinedTerm;\r
 import eu.etaxonomy.cdm.strategy.parser.TimePeriodParser;\r
 import eu.etaxonomy.cdm.test.TermTestBase;\r
 \r

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeTest.java
index 5254e03df06e938a4c598a5711f03d44c20fac70..f1aac8995943ea854470af86c21b6bc8c4d21b8d 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeTest.java
@@ -42,7 +42,6 @@ import eu.etaxonomy.cdm.api.service.IUserService;
 import eu.etaxonomy.cdm.common.UTF8;
 import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.agent.Team;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.IdentifiableSource;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
@@ -71,6 +70,7 @@ import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.test.integration.CdmTransactionalIntegrationTest;
 import eu.etaxonomy.cdm.test.unitils.CleanSweepInsertLoadStrategy;
 

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBaseTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBaseTest.java
index d303f01b0b791769e1495bf9285f9d2efd6d7eb6..20e326973b7604753dc216159ea4fb7a8fe255df 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBaseTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBaseTest.java
@@ -26,11 +26,8 @@ import eu.etaxonomy.cdm.api.service.dto.IdentifiedEntityDTO;
 import eu.etaxonomy.cdm.api.service.dto.MarkedEntityDTO;
 import eu.etaxonomy.cdm.api.service.pager.Pager;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.Identifier;
 import eu.etaxonomy.cdm.model.common.MarkerType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
-import eu.etaxonomy.cdm.model.common.VocabularyEnum;
 import eu.etaxonomy.cdm.model.name.IBotanicalName;
 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.TaxonName;
@@ -42,6 +39,9 @@ import eu.etaxonomy.cdm.model.taxon.SynonymType;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
+import eu.etaxonomy.cdm.model.term.VocabularyEnum;
 import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
 import eu.etaxonomy.cdm.persistence.query.MatchMode;
 import eu.etaxonomy.cdm.persistence.query.TaxonTitleType;

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceTest.java
index e319618a31b503a55f73b4440a9d7b5a3a0d64c4..ff6d316d8839e8928d1c5500d0ae7af33b2b01be 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceTest.java
@@ -35,7 +35,6 @@ import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.agent.Institution;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.Identifier;
 import eu.etaxonomy.cdm.model.common.TimePeriod;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
@@ -65,6 +64,7 @@ import eu.etaxonomy.cdm.model.taxon.SynonymType;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.persistence.dto.SpecimenNodeWrapper;
 import eu.etaxonomy.cdm.persistence.query.AssignmentStatus;
 import eu.etaxonomy.cdm.test.integration.CdmTransactionalIntegrationTest;

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.java
index a90622c748a08c609ddfd68a28738c22d29915fe..183ced85cee99b3c166d4db4ea5710832cd5227d 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.java
@@ -44,7 +44,6 @@ import eu.etaxonomy.cdm.common.UTF8;
 import eu.etaxonomy.cdm.common.monitor.DefaultProgressMonitor;\r
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
 import eu.etaxonomy.cdm.model.description.CategoricalData;\r
@@ -74,6 +73,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;\r
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;\r
 import eu.etaxonomy.cdm.persistence.query.MatchMode;\r
 import eu.etaxonomy.cdm.persistence.query.OrderHint;\r
 import eu.etaxonomy.cdm.test.integration.CdmTransactionalIntegrationTest;\r

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TermServiceImplTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TermServiceImplTest.java
index 11bb19670c758559b8145fb32d9cd8b798febc5a..5004f7a14212539db208a53f2caaccf9a8203284 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TermServiceImplTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TermServiceImplTest.java
@@ -27,12 +27,7 @@ import org.unitils.dbunit.annotation.DataSets;
 import org.unitils.spring.annotation.SpringBeanByType;\r
 \r
 import eu.etaxonomy.cdm.api.service.pager.Pager;\r
-import eu.etaxonomy.cdm.model.common.DefinedTerm;\r
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
-import eu.etaxonomy.cdm.model.common.Representation;\r
-import eu.etaxonomy.cdm.model.common.TermType;\r
-import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
 import eu.etaxonomy.cdm.model.description.State;\r
 import eu.etaxonomy.cdm.model.location.NamedArea;\r
 import eu.etaxonomy.cdm.model.name.IBotanicalName;\r
@@ -40,6 +35,11 @@ import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameFactory;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
+import eu.etaxonomy.cdm.model.term.DefinedTerm;\r
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;\r
+import eu.etaxonomy.cdm.model.term.Representation;\r
+import eu.etaxonomy.cdm.model.term.TermType;\r
+import eu.etaxonomy.cdm.model.term.TermVocabulary;\r
 import eu.etaxonomy.cdm.test.integration.CdmTransactionalIntegrationTest;\r
 import eu.etaxonomy.cdm.test.unitils.CleanSweepInsertLoadStrategy;\r
 \r

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/VocabularyServiceImplTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/VocabularyServiceImplTest.java
index 3ddf344e3e3b8154e4d784aefd1f6c43f63585b0..a7cab9740c2ff412650fdf2000e7da44a5202a1b 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/VocabularyServiceImplTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/VocabularyServiceImplTest.java
@@ -20,11 +20,11 @@ import org.junit.Before;
 import org.junit.Test;
 import org.unitils.spring.annotation.SpringBeanByType;
 
-import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;
+import eu.etaxonomy.cdm.model.term.OrderedTermVocabulary;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.test.integration.CdmTransactionalIntegrationTest;
 
 /**

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/dto/TaxonRelationshipsDTOTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/dto/TaxonRelationshipsDTOTest.java
index bfa2c63a5670f303b8e7408157551cc01398fb8d..9ba14e3de73a01c4518a35c89499cc31a4179cd8 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/dto/TaxonRelationshipsDTOTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/dto/TaxonRelationshipsDTOTest.java
@@ -18,7 +18,6 @@ import org.junit.Test;
 import eu.etaxonomy.cdm.api.service.dto.TaxonRelationshipsDTO.TaxonRelationDTO;
 import eu.etaxonomy.cdm.format.taxon.TaxonRelationshipFormatter;
 import eu.etaxonomy.cdm.model.agent.Person;
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.RelationshipBase.Direction;
 import eu.etaxonomy.cdm.model.common.VerbatimTimePeriod;
@@ -30,6 +29,7 @@ import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
 import eu.etaxonomy.cdm.strategy.cache.TaggedText;
 import eu.etaxonomy.cdm.strategy.parser.TimePeriodParser;
 

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/scripts/FixMultipleTextDataInImageGalleries.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/scripts/FixMultipleTextDataInImageGalleries.java
index 5e8a401cde2e777d2a1f69cb0822999824e6d8ea..de54ae5e2220ebe4a302ffad3b2f11e90097981c 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/scripts/FixMultipleTextDataInImageGalleries.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/scripts/FixMultipleTextDataInImageGalleries.java
@@ -23,12 +23,12 @@ import eu.etaxonomy.cdm.database.CdmDataSource;
 import eu.etaxonomy.cdm.database.DataSourceNotFoundException;
 import eu.etaxonomy.cdm.database.DatabaseTypeEnum;
 import eu.etaxonomy.cdm.database.ICdmDataSource;
-import eu.etaxonomy.cdm.model.common.init.TermNotFoundException;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.description.TextData;
 import eu.etaxonomy.cdm.model.media.Media;
+import eu.etaxonomy.cdm.model.term.init.TermNotFoundException;
 
 /**
  * We decided by convention to have only ONE TextData element in an image gallery and that

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/ConcurrentSessionTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/ConcurrentSessionTest.java
index 56ee20daecfa2f23e165c60d2ec377e43e0c06ee..3b87d214f895267063695d8ce3a6f5a449c2be59 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/ConcurrentSessionTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/ConcurrentSessionTest.java
@@ -46,8 +46,6 @@ import eu.etaxonomy.cdm.api.service.IDescriptionService;
 import eu.etaxonomy.cdm.api.service.IReferenceService;
 import eu.etaxonomy.cdm.api.service.ITaxonService;
 import eu.etaxonomy.cdm.api.service.ITermService;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
@@ -55,6 +53,8 @@ import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
 import eu.etaxonomy.cdm.persistence.dao.taxon.ITaxonDao;
 import eu.etaxonomy.cdm.test.integration.CdmIntegrationTest;
 

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/Datasource.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/Datasource.java
index 35a6c9ca3d355fd2d4934203ef6bc59ca0818a00..c3320f5c88300c20274f49f645ea910a711cb506 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/Datasource.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/Datasource.java
@@ -36,8 +36,6 @@ import eu.etaxonomy.cdm.database.DatabaseTypeEnum;
 import eu.etaxonomy.cdm.database.DbSchemaValidation;
 import eu.etaxonomy.cdm.database.ICdmDataSource;
 import eu.etaxonomy.cdm.model.agent.Person;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
-import eu.etaxonomy.cdm.model.common.init.TermNotFoundException;
 import eu.etaxonomy.cdm.model.description.Distribution;
 import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.description.FeatureNode;
@@ -56,6 +54,8 @@ import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
 import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.init.TermNotFoundException;
 
 public class Datasource {
        private static final Logger logger = Logger.getLogger(Datasource.class);

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestService.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestService.java
index 9d9a1b67ae1d9ff73bf3255405f3e77f228bba84..60da948b4265dc9bbb334b994c9076557c8a3dac 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestService.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestService.java
@@ -25,9 +25,7 @@ import eu.etaxonomy.cdm.api.service.IDescriptionService;
 import eu.etaxonomy.cdm.api.service.ITaxonService;
 import eu.etaxonomy.cdm.database.DbSchemaValidation;
 import eu.etaxonomy.cdm.model.agent.Person;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.name.IBotanicalName;
 import eu.etaxonomy.cdm.model.name.INonViralName;
@@ -40,6 +38,8 @@ import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.SynonymType;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 
 

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/integration/TestTaxonServices.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/integration/TestTaxonServices.java
index 442fac0007ebd1e1548a2227005c1fc1c0077414..a46df3659afae03d13d8b4554fbf22d791dbc107 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/integration/TestTaxonServices.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/integration/TestTaxonServices.java
@@ -19,7 +19,6 @@ import eu.etaxonomy.cdm.database.DbSchemaValidation;
 import eu.etaxonomy.cdm.database.ICdmDataSource;\r
 import eu.etaxonomy.cdm.model.agent.AgentBase;\r
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;\r
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.location.Country;\r
 import eu.etaxonomy.cdm.model.location.NamedArea;\r
 import eu.etaxonomy.cdm.model.name.NameRelationship;\r
@@ -29,6 +28,7 @@ import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.name.TaxonNameFactory;\r
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;\r
 \r
 /**\r
  * @author a.babadshanjan\r

diff --git a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml
deleted file mode 100644 (file)
index 235aee2..0000000
Binary files a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml and /dev/null differ

diff --git a/cdmlib-test/src/main/java/eu/etaxonomy/cdm/database/TestingTermInitializer.java b/cdmlib-test/src/main/java/eu/etaxonomy/cdm/database/TestingTermInitializer.java
index a7319d35daa7d7ce2acb95b42570430f90c89013..1ff8a9da5d2b7d2fff95ee4a6b3c8d1d1bbed468 100644 (file)
--- a/cdmlib-test/src/main/java/eu/etaxonomy/cdm/database/TestingTermInitializer.java
+++ b/cdmlib-test/src/main/java/eu/etaxonomy/cdm/database/TestingTermInitializer.java
@@ -31,11 +31,11 @@ import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.DefaultTransactionDefinition;
 
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
-import eu.etaxonomy.cdm.model.common.Representation;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
-import eu.etaxonomy.cdm.model.common.VocabularyEnum;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.Representation;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
+import eu.etaxonomy.cdm.model.term.VocabularyEnum;
 
 public class TestingTermInitializer extends DefaultTermInitializer {
     private static final Logger logger = Logger.getLogger(TestingTermInitializer.class);

diff --git a/cdmlib-test/src/main/java/eu/etaxonomy/cdm/database/TestingTermVocabularyDao.java b/cdmlib-test/src/main/java/eu/etaxonomy/cdm/database/TestingTermVocabularyDao.java
index 091a16e12662c929fc1adebdfcb805307ba46961..40e8c2a29b56ba61f96ff200679c0a10f0e3f7c5 100644 (file)
--- a/cdmlib-test/src/main/java/eu/etaxonomy/cdm/database/TestingTermVocabularyDao.java
+++ b/cdmlib-test/src/main/java/eu/etaxonomy/cdm/database/TestingTermVocabularyDao.java
@@ -21,7 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Repository;
 
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 /**
  * @author a.mueller

diff --git a/cdmlib-test/src/main/java/eu/etaxonomy/cdm/test/TermTestBase.java b/cdmlib-test/src/main/java/eu/etaxonomy/cdm/test/TermTestBase.java
index b17bdc84658218c228dc594d0fb88c309e88f209..ab3364af01f27754381aa0b89f2e41df90300450 100644 (file)
--- a/cdmlib-test/src/main/java/eu/etaxonomy/cdm/test/TermTestBase.java
+++ b/cdmlib-test/src/main/java/eu/etaxonomy/cdm/test/TermTestBase.java
@@ -10,8 +10,8 @@ package eu.etaxonomy.cdm.test;
 
 import org.junit.BeforeClass;
 
-import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.common.Language;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
 
 /**
  * @author a.kohlbecker