ref #8162 move FeatureTree and FeatureNode to term package

diff --git a/cdmlib-cache/src/main/resources/eu/etaxonomy/cdm/mappings/hibernate.cfg.xml b/cdmlib-cache/src/main/resources/eu/etaxonomy/cdm/mappings/hibernate.cfg.xml
index 074b5ac565ab8da1efa565e18e76d506675d8add..d75e78eaf02d14177b1ad53d7f8c4ca482d192bc 100644 (file)
--- a/cdmlib-cache/src/main/resources/eu/etaxonomy/cdm/mappings/hibernate.cfg.xml
+++ b/cdmlib-cache/src/main/resources/eu/etaxonomy/cdm/mappings/hibernate.cfg.xml
@@ -103,8 +103,8 @@ Difference are to be found in
       <mapping class="eu.etaxonomy.cdm.model.description.Distribution"/>
       <mapping class="eu.etaxonomy.cdm.model.description.Feature"/>
       <mapping class="eu.etaxonomy.cdm.model.description.Character"/>
-      <mapping class="eu.etaxonomy.cdm.model.description.FeatureNode"/>
-      <mapping class="eu.etaxonomy.cdm.model.description.FeatureTree"/>
+      <mapping class="eu.etaxonomy.cdm.model.term.FeatureNode"/>
+      <mapping class="eu.etaxonomy.cdm.model.term.FeatureTree"/>
       <mapping class="eu.etaxonomy.cdm.model.description.KeyStatement"/>
       <mapping class="eu.etaxonomy.cdm.model.description.MediaKey"/>
       <mapping class="eu.etaxonomy.cdm.model.description.IndividualsAssociation"/>

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 7b3b5c1f83298a5f12282b613cfa2f2dd41f690c..4bbeb527991a15179fe7e2a17d2db21a4bab0436 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.description.FeatureNode;
-import eu.etaxonomy.cdm.model.description.FeatureTree;
 import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.FeatureNode;
+import eu.etaxonomy.cdm.model.term.FeatureTree;
 
 /**
  * @author pplitzner

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/descriptive/owl/out/OwlExportConfigurator.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/descriptive/owl/out/OwlExportConfigurator.java
index d4979d43309cf290da648ba5d8248ebf4abafeca..3e534f7fa485838f0d53dc52d91dddc3736f5469 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/descriptive/owl/out/OwlExportConfigurator.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/descriptive/owl/out/OwlExportConfigurator.java
@@ -15,7 +15,7 @@ import org.apache.log4j.Logger;
 
 import eu.etaxonomy.cdm.database.ICdmDataSource;
 import eu.etaxonomy.cdm.io.common.XmlExportConfiguratorBase;
-import eu.etaxonomy.cdm.model.description.FeatureTree;
+import eu.etaxonomy.cdm.model.term.FeatureTree;
 
 
 /**

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 fa45af8dd1d02c1148511084863c4599ebbb8172..9b8c0290ae2eb626e30acf8aad54d469553a81a7 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.description.FeatureNode;
-import eu.etaxonomy.cdm.model.description.FeatureTree;
 import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.FeatureNode;
+import eu.etaxonomy.cdm.model.term.FeatureTree;
 
 /**
  *

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/descriptive/word/out/WordExportConfigurator.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/descriptive/word/out/WordExportConfigurator.java
index 223ccfc52138f2014e6441a1471d870fcbb5e72a..2f64c3b80f2e99334a4f142276190cd60838e184 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/descriptive/word/out/WordExportConfigurator.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/descriptive/word/out/WordExportConfigurator.java
@@ -15,7 +15,7 @@ import org.apache.log4j.Logger;
 
 import eu.etaxonomy.cdm.database.ICdmDataSource;
 import eu.etaxonomy.cdm.io.common.XmlExportConfiguratorBase;
-import eu.etaxonomy.cdm.model.description.FeatureTree;
+import eu.etaxonomy.cdm.model.term.FeatureTree;
 
 
 /**

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 d9b9d41efbde106c95ea5fbe581d029cdc131f79..20e59468be9bfc0a00f0105b8ab9029e5a38f6ff 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
@@ -30,7 +30,6 @@ import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.agent.INomenclaturalAuthor;\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
 import eu.etaxonomy.cdm.model.media.Media;\r
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;\r
 import eu.etaxonomy.cdm.model.name.TaxonName;\r
@@ -39,6 +38,7 @@ import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 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.FeatureTree;\r
 import eu.etaxonomy.cdm.model.term.TermVocabulary;\r
 \r
 public class CdmIDResolver extends IDResolver {\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 86bbdbe941164bb7229902030dfdfda6097a4568..53b9f067e004595ee0688f80d116872807e29c02 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
@@ -38,7 +38,6 @@ import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.MarkerType;\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
 import eu.etaxonomy.cdm.model.description.MeasurementUnit;\r
 import eu.etaxonomy.cdm.model.description.MediaKey;\r
 import eu.etaxonomy.cdm.model.description.PolytomousKey;\r
@@ -84,6 +83,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 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.FeatureTree;\r
 import eu.etaxonomy.cdm.model.term.OrderedTermVocabulary;\r
 import eu.etaxonomy.cdm.model.term.TermVocabulary;\r
 \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 0bfb564f259b75b35ec310df62d5df64a670b753..51d53e6f0c7a659f59478962664bb6d0fddad0f3 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
@@ -32,7 +32,6 @@ 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.User;
-import eu.etaxonomy.cdm.model.description.FeatureTree;
 import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.model.reference.Reference;
@@ -40,6 +39,7 @@ 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;
+import eu.etaxonomy.cdm.model.term.FeatureTree;
 
 /**
  * @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 ad54090507394477a8ef3eee0a138213325f4338..8683bf1608e9296e7b75b42e4ce07d2d45fe1f69 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
@@ -27,8 +27,6 @@ import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.common.LanguageStringBase;\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
-import eu.etaxonomy.cdm.model.description.FeatureTree;\r
 import eu.etaxonomy.cdm.model.media.Media;\r
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;\r
 import eu.etaxonomy.cdm.model.name.TaxonName;\r
@@ -39,6 +37,8 @@ import eu.etaxonomy.cdm.model.taxon.Classification;
 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.FeatureNode;\r
+import eu.etaxonomy.cdm.model.term.FeatureTree;\r
 import eu.etaxonomy.cdm.model.term.TermVocabulary;\r
 \r
 /**\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupImportState.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupImportState.java
index 2fbb74e163fa792c386671a67c813102218dcc9e..a8935252c402e0eb8286c3f4c142e68bbca473ea 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupImportState.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupImportState.java
@@ -28,7 +28,6 @@ import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
 import eu.etaxonomy.cdm.model.common.AnnotatableEntity;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
 import eu.etaxonomy.cdm.model.description.Feature;\r
-import eu.etaxonomy.cdm.model.description.FeatureNode;\r
 import eu.etaxonomy.cdm.model.description.PolytomousKey;\r
 import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;\r
 import eu.etaxonomy.cdm.model.location.NamedArea;\r
@@ -36,6 +35,7 @@ import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.cdm.model.occurrence.Collection;\r
 import eu.etaxonomy.cdm.model.reference.Reference;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
+import eu.etaxonomy.cdm.model.term.FeatureNode;\r
 \r
 /**\r
  * @author a.mueller\r

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 97cb90f187794af5837d23551c04e5901aa5d555..be1eccf5af9d434c36bee146eb6a0c26def70be7 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
@@ -54,8 +54,6 @@ import eu.etaxonomy.cdm.model.common.VersionableEntity;
 import eu.etaxonomy.cdm.model.description.CategoricalData;\r
 import eu.etaxonomy.cdm.model.description.DescriptiveDataSet;\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.description.MeasurementUnit;\r
 import eu.etaxonomy.cdm.model.description.QuantitativeData;\r
 import eu.etaxonomy.cdm.model.description.State;\r
@@ -85,6 +83,8 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
 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.FeatureNode;\r
+import eu.etaxonomy.cdm.model.term.FeatureTree;\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

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 a179ef0a8752bc439f2371414cb6f15f2d2e41d9..36091340a0c8baf54927fea5a232ad2f6f659c70 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
@@ -41,8 +41,6 @@ import eu.etaxonomy.cdm.model.common.RelationshipBase;
 import eu.etaxonomy.cdm.model.common.SourcedEntityBase;\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
-import eu.etaxonomy.cdm.model.description.FeatureTree;\r
 import eu.etaxonomy.cdm.model.description.MeasurementUnit;\r
 import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;\r
 import eu.etaxonomy.cdm.model.description.State;\r
@@ -81,6 +79,8 @@ import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
 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.FeatureNode;\r
+import eu.etaxonomy.cdm.model.term.FeatureTree;\r
 import eu.etaxonomy.cdm.model.term.Representation;\r
 import eu.etaxonomy.cdm.model.term.TermVocabulary;\r
 \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 398272562c3a04a7b95d688a2dfb95d6828045a1..1328de357fbf407815c5a00eda0d477dc901efc5 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
@@ -53,8 +53,6 @@ import eu.etaxonomy.cdm.model.common.VersionableEntity;
 import eu.etaxonomy.cdm.model.description.CategoricalData;\r
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;\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.description.QuantitativeData;\r
 import eu.etaxonomy.cdm.model.description.State;\r
 import eu.etaxonomy.cdm.model.description.StateData;\r
@@ -80,6 +78,8 @@ import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 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.FeatureNode;\r
+import eu.etaxonomy.cdm.model.term.FeatureTree;\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

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx2013/TaxonXTreatmentExtractor.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx2013/TaxonXTreatmentExtractor.java
index 6f16d51a85a2aa2c1654ea121aca35f783f37488..450e98ab36bd5e1b00776c0afce352a1b1dc1cc6 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx2013/TaxonXTreatmentExtractor.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx2013/TaxonXTreatmentExtractor.java
@@ -42,8 +42,6 @@ import eu.etaxonomy.cdm.model.common.IdentifiableSource;
 import eu.etaxonomy.cdm.model.common.LSID;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.description.Feature;
-import eu.etaxonomy.cdm.model.description.FeatureNode;
-import eu.etaxonomy.cdm.model.description.FeatureTree;
 import eu.etaxonomy.cdm.model.description.IndividualsAssociation;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.description.TaxonNameDescription;
@@ -65,6 +63,8 @@ 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.FeatureNode;
+import eu.etaxonomy.cdm.model.term.FeatureTree;
 import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
 import eu.etaxonomy.cdm.persistence.query.MatchMode;
 import eu.etaxonomy.cdm.strategy.exceptions.UnknownCdmTypeException;

diff --git a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/jaxb/FeatureTest.java b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/jaxb/FeatureTest.java
index 364a9909811df0a6f62938edecc2ca70bac04b43..712cad98772973a5b22de53741147ac3d465c3bf 100644 (file)
--- a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/jaxb/FeatureTest.java
+++ b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/jaxb/FeatureTest.java
@@ -18,8 +18,8 @@ import java.net.URI;
 import org.junit.Test;\r
 \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.FeatureNode;\r
+import eu.etaxonomy.cdm.model.term.FeatureTree;\r
 \r
 public class FeatureTest {\r
 \r

diff --git a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/owl/out/OwlExportTest.java b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/owl/out/OwlExportTest.java
index 3015ee0665cfe04e8feaa5ae303ec99c4499839d..3905d98b9f0157058bf9eabb64f97fdd50e46269 100644 (file)
--- a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/owl/out/OwlExportTest.java
+++ b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/owl/out/OwlExportTest.java
@@ -27,8 +27,8 @@ import eu.etaxonomy.cdm.io.common.IExportConfigurator.TARGET;
 import eu.etaxonomy.cdm.io.descriptive.owl.out.OwlExportConfigurator;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.description.Feature;
-import eu.etaxonomy.cdm.model.description.FeatureNode;
-import eu.etaxonomy.cdm.model.description.FeatureTree;
+import eu.etaxonomy.cdm.model.term.FeatureNode;
+import eu.etaxonomy.cdm.model.term.FeatureTree;
 import eu.etaxonomy.cdm.test.integration.CdmTransactionalIntegrationTest;
 import eu.etaxonomy.cdm.test.unitils.CleanSweepInsertLoadStrategy;
 

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TreeIndex.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TreeIndex.java
index 6ca6a15840ec117ca25a49da3366716dd6d5ce21..16341016a8d73078d5c3a8252e6c17a5845a6b89 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TreeIndex.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TreeIndex.java
@@ -16,8 +16,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
 
-import eu.etaxonomy.cdm.model.description.FeatureNode;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+import eu.etaxonomy.cdm.model.term.FeatureNode;
 
 /**
  * A class to handle tree indexes as used in {@link TaxonNode}, {@link FeatureNode}

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 910127b9359fa994e6d650dd0b3ae67ea5c99e46..5cbbf415e8757c05c60a75460fe53c9b3b991ef6 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
@@ -232,7 +232,6 @@ import eu.etaxonomy.cdm.model.description.DescriptionElementSource;
 import eu.etaxonomy.cdm.model.description.DescriptiveDataSet;
 import eu.etaxonomy.cdm.model.description.Distribution;
 import eu.etaxonomy.cdm.model.description.Feature;
-import eu.etaxonomy.cdm.model.description.FeatureTree;
 import eu.etaxonomy.cdm.model.description.IndividualsAssociation;
 import eu.etaxonomy.cdm.model.description.MeasurementUnit;
 import eu.etaxonomy.cdm.model.description.MediaKey;
@@ -298,6 +297,7 @@ 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.FeatureTree;
 import eu.etaxonomy.cdm.model.term.OrderedTerm;
 import eu.etaxonomy.cdm.model.term.OrderedTermVocabulary;
 import eu.etaxonomy.cdm.model.term.Representation;

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 b062b5ae451c0b161a148dd67714d42708606cb7..8a56e20330d31eb2c4747b41fb4a694e620d96d8 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
@@ -25,6 +25,7 @@ import org.hibernate.search.annotations.IndexedEmbedded;
 
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.term.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.FeatureNode;
 import eu.etaxonomy.cdm.model.term.TermType;
 
 /**

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 fa18096ad674a8f84845ef6c5f2b6cac1b611b86..5c9240ee78fb8a17e19f2a908fbd69b620ee9a62 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
@@ -41,6 +41,7 @@ import eu.etaxonomy.cdm.model.common.Language;
 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.FeatureTree;
 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/DescriptiveSystemRole.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptiveSystemRole.java
index 06079795c171d5c1432a0c95200c103d53135ae4..c7733d8d39874e883baac3a23162111e6cb62130 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptiveSystemRole.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptiveSystemRole.java
@@ -14,6 +14,7 @@ import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;\r
 \r
 import eu.etaxonomy.cdm.model.common.Language;\r
+import eu.etaxonomy.cdm.model.term.FeatureTree;\r
 \r
 /**\r
  * The role of the descriptive system of type {@link FeatureTree}.<BR>\r

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 1fa51609330722f8a91ce903e7fc97459a37c2db..e623007c9512f3b617c09b1ad94b938cb4abd8cb 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
@@ -45,6 +45,7 @@ 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.FeatureTree;
 import eu.etaxonomy.cdm.model.term.Representation;
 import eu.etaxonomy.cdm.model.term.TermType;
 import eu.etaxonomy.cdm.model.term.TermVocabulary;

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/term/FeatureNode.java
similarity index 99%
rename from cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/FeatureNode.java
rename to cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/FeatureNode.java
index d2a759f0477d28544949e8d8856981b1ee780d34..cad92e23f58dc7a5e1649505cdd380efd30337cd 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/term/FeatureNode.java
@@ -7,7 +7,7 @@
  * See LICENSE.TXT at the top of this package for the full license terms.
  */
 
-package eu.etaxonomy.cdm.model.description;
+package eu.etaxonomy.cdm.model.term;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -48,9 +48,9 @@ import eu.etaxonomy.cdm.hibernate.HHH_9751_Util;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.ITreeNode;
 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;
+import eu.etaxonomy.cdm.model.description.CategoricalData;
+import eu.etaxonomy.cdm.model.description.Feature;
+import eu.etaxonomy.cdm.model.description.State;
 
 /**
  * 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/term/FeatureTree.java
similarity index 97%
rename from cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/FeatureTree.java
rename to cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/FeatureTree.java
index e672aa368f025042710847ed6ff2cef9540ff12a..8f8c7a40e6e6c9487cf6f283bf820c5a4c23368f 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/term/FeatureTree.java
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.cdm.model.description;
+package eu.etaxonomy.cdm.model.term;
 
 import java.rmi.UnexpectedException;
 import java.util.ArrayList;
@@ -38,10 +38,9 @@ import org.hibernate.annotations.Type;
 import org.hibernate.envers.Audited;
 
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
-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.model.description.DescriptionElementBase;
+import eu.etaxonomy.cdm.model.description.Feature;
+import eu.etaxonomy.cdm.model.description.MediaKey;
 import eu.etaxonomy.cdm.strategy.cache.common.IIdentifiableEntityCacheStrategy;
 
 /**
@@ -75,7 +74,7 @@ import eu.etaxonomy.cdm.strategy.cache.common.IIdentifiableEntityCacheStrategy;
 @XmlRootElement(name = "FeatureTree")
 @Entity
 //@Indexed disabled to reduce clutter in indexes, since this type is not used by any search
-//@Indexed(index = "eu.etaxonomy.cdm.model.description.FeatureTree")
+//@Indexed(index = "eu.etaxonomy.cdm.model.term.FeatureTree")
 @Audited
 public class FeatureTree <T extends DefinedTermBase>
             extends IdentifiableEntity<IIdentifiableEntityCacheStrategy>

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/generate/PolytomousKeyGenerator.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/generate/PolytomousKeyGenerator.java
index d5ede9257e8c725b9df9088cb9c3be9c099b1590..1a93a5eb1b4ba6e413414068fe6eb5d6da52fc71 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/generate/PolytomousKeyGenerator.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/generate/PolytomousKeyGenerator.java
@@ -12,8 +12,6 @@ import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.description.CategoricalData;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.description.Feature;
-import eu.etaxonomy.cdm.model.description.FeatureNode;
-import eu.etaxonomy.cdm.model.description.FeatureTree;
 import eu.etaxonomy.cdm.model.description.KeyStatement;
 import eu.etaxonomy.cdm.model.description.PolytomousKey;
 import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
@@ -23,6 +21,8 @@ import eu.etaxonomy.cdm.model.description.StateData;
 import eu.etaxonomy.cdm.model.description.StatisticalMeasure;
 import eu.etaxonomy.cdm.model.description.StatisticalMeasurementValue;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
+import eu.etaxonomy.cdm.model.term.FeatureNode;
+import eu.etaxonomy.cdm.model.term.FeatureTree;
 
 /**
  * @author m.venin

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/term/FeatureTreeTest.java
similarity index 93%
rename from cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/FeatureTreeTest.java
rename to cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/term/FeatureTreeTest.java
index f7fa3d34cb1955645446885b61622cd00d1ccb29..64c9d027dd4ce05e2526bd92120fff438a2261ff 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/term/FeatureTreeTest.java
@@ -1,97 +1,100 @@
-package eu.etaxonomy.cdm.model.description;\r
-\r
-\r
-\r
-import static org.junit.Assert.assertEquals;\r
-import static org.junit.Assert.assertNotSame;\r
-\r
-import java.util.List;\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.term.DefaultTermInitializer;\r
-\r
-public class FeatureTreeTest {\r
-       @SuppressWarnings("unused")\r
-       private static final Logger logger = Logger.getLogger(FeatureTreeTest.class);\r
-\r
-       private FeatureTree testTree;\r
-       private FeatureNode node1;\r
-       private FeatureNode node2;\r
-       private FeatureNode node3;\r
-       private FeatureNode node4;\r
-\r
-       @BeforeClass\r
-       public static void setUpBeforeClass() {\r
-               DefaultTermInitializer vocabularyStore = new DefaultTermInitializer();\r
-               vocabularyStore.initialize();\r
-       }\r
-\r
-       /**\r
-        * @throws java.lang.Exception\r
-        */\r
-       @Before\r
-       public void setUp() throws Exception {\r
-               testTree = FeatureTree.NewInstance();\r
-\r
-               node1 = FeatureNode.NewInstance(Feature.ANATOMY());\r
-               node2 = FeatureNode.NewInstance(Feature.BIOLOGY_ECOLOGY());\r
-               node3 = FeatureNode.NewInstance(Feature.DESCRIPTION());\r
-               node4 = FeatureNode.NewInstance(Feature.DISCUSSION());\r
-\r
-               testTree.getRoot().addChild(node1);\r
-               node1.addChild(node2);\r
-               node2.addChild(node3);\r
-               node3.addChild(node4);\r
-\r
-\r
-\r
-       }\r
-//     @Test\r
-//     public void testSetRoot(){\r
-//             testTree.setRoot(node2);\r
-//             assertNotNull(testTree.getRoot());\r
-//             assertEquals(testTree.getRoot(), node2);\r
-//     }\r
-       @Test\r
-       public void testAddChild(){\r
-               FeatureNode node21 = FeatureNode.NewInstance();\r
-               node21.setTerm(Feature.ANATOMY());\r
-               node1.addChild(node21, 1);\r
-\r
-               assertEquals(node1.getChildNodes().size(), 2);\r
-               assertEquals(node1.getChildNodes().get(1), node21);\r
-\r
-\r
-               assertEquals(node21.getParent(), node1);\r
-\r
-\r
-       }\r
-       @Test\r
-       public void testClone(){\r
-               FeatureNode node21 = FeatureNode.NewInstance();\r
-               node21.setTerm(Feature.ADDITIONAL_PUBLICATION());\r
-               node1.addChild(node21, 1);\r
-               FeatureTree clone = (FeatureTree) testTree.clone();\r
-               assertEquals (clone.getRoot().getTerm(), testTree.getRoot().getTerm());\r
-               assertNotSame(clone.getRoot(), testTree.getRoot());\r
-               List<FeatureNode> children = clone.getRootChildren();\r
-\r
-\r
-               assertEquals(children.get(0).getTerm(), node1.getTerm());\r
-           assertNotSame(children.get(0), node1);\r
-           children = children.get(0).getChildNodes();\r
-\r
-               assertEquals(children.get(0).getTerm(), node2.getTerm());\r
-               assertNotSame(children.get(0), node2);\r
-               assertEquals(children.get(1).getTerm(), node21.getTerm());\r
-               assertNotSame(children.get(1), node21);\r
-               assertEquals(children.get(0).getChildAt(0).getTerm(), node3.getTerm());\r
-               assertNotSame(children.get(0).getChildAt(0), node3);\r
-       }\r
-\r
-\r
-}\r
+package eu.etaxonomy.cdm.model.term;
+
+
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import eu.etaxonomy.cdm.model.description.Feature;
+import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
+import eu.etaxonomy.cdm.model.term.FeatureNode;
+import eu.etaxonomy.cdm.model.term.FeatureTree;
+
+public class FeatureTreeTest {
+       @SuppressWarnings("unused")
+       private static final Logger logger = Logger.getLogger(FeatureTreeTest.class);
+
+       private FeatureTree testTree;
+       private FeatureNode node1;
+       private FeatureNode node2;
+       private FeatureNode node3;
+       private FeatureNode node4;
+
+       @BeforeClass
+       public static void setUpBeforeClass() {
+               DefaultTermInitializer vocabularyStore = new DefaultTermInitializer();
+               vocabularyStore.initialize();
+       }
+
+       /**
+        * @throws java.lang.Exception
+        */
+       @Before
+       public void setUp() throws Exception {
+               testTree = FeatureTree.NewInstance();
+
+               node1 = FeatureNode.NewInstance(Feature.ANATOMY());
+               node2 = FeatureNode.NewInstance(Feature.BIOLOGY_ECOLOGY());
+               node3 = FeatureNode.NewInstance(Feature.DESCRIPTION());
+               node4 = FeatureNode.NewInstance(Feature.DISCUSSION());
+
+               testTree.getRoot().addChild(node1);
+               node1.addChild(node2);
+               node2.addChild(node3);
+               node3.addChild(node4);
+
+
+
+       }
+//     @Test
+//     public void testSetRoot(){
+//             testTree.setRoot(node2);
+//             assertNotNull(testTree.getRoot());
+//             assertEquals(testTree.getRoot(), node2);
+//     }
+       @Test
+       public void testAddChild(){
+               FeatureNode node21 = FeatureNode.NewInstance();
+               node21.setTerm(Feature.ANATOMY());
+               node1.addChild(node21, 1);
+
+               assertEquals(node1.getChildNodes().size(), 2);
+               assertEquals(node1.getChildNodes().get(1), node21);
+
+
+               assertEquals(node21.getParent(), node1);
+
+
+       }
+       @Test
+       public void testClone(){
+               FeatureNode node21 = FeatureNode.NewInstance();
+               node21.setTerm(Feature.ADDITIONAL_PUBLICATION());
+               node1.addChild(node21, 1);
+               FeatureTree clone = (FeatureTree) testTree.clone();
+               assertEquals (clone.getRoot().getTerm(), testTree.getRoot().getTerm());
+               assertNotSame(clone.getRoot(), testTree.getRoot());
+               List<FeatureNode> children = clone.getRootChildren();
+
+
+               assertEquals(children.get(0).getTerm(), node1.getTerm());
+           assertNotSame(children.get(0), node1);
+           children = children.get(0).getChildNodes();
+
+               assertEquals(children.get(0).getTerm(), node2.getTerm());
+               assertNotSame(children.get(0), node2);
+               assertEquals(children.get(1).getTerm(), node21.getTerm());
+               assertNotSame(children.get(1), node21);
+               assertEquals(children.get(0).getChildAt(0).getTerm(), node3.getTerm());
+               assertNotSame(children.get(0).getChildAt(0), node3);
+       }
+
+
+}

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 a5325c374f4e97ec7429b9fbefc5ed8589776a91..4986cd23ca93eadfb4b0d72cd629776e4aba02da 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
@@ -44,8 +44,6 @@ import eu.etaxonomy.cdm.model.description.DescriptionElementSource;
 import eu.etaxonomy.cdm.model.description.DescriptiveDataSet;
 import eu.etaxonomy.cdm.model.description.Distribution;
 import eu.etaxonomy.cdm.model.description.Feature;
-import eu.etaxonomy.cdm.model.description.FeatureNode;
-import eu.etaxonomy.cdm.model.description.FeatureTree;
 import eu.etaxonomy.cdm.model.description.IIdentificationKey;
 import eu.etaxonomy.cdm.model.description.IndividualsAssociation;
 import eu.etaxonomy.cdm.model.description.MeasurementUnit;
@@ -130,6 +128,8 @@ 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.FeatureNode;
+import eu.etaxonomy.cdm.model.term.FeatureTree;
 import eu.etaxonomy.cdm.model.term.Representation;
 import eu.etaxonomy.cdm.model.term.TermType;
 import eu.etaxonomy.cdm.model.term.TermVocabulary;

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 dc75d9f1c137a077734f7c5e86c0f7119d9eccd2..df125bce0b12e7df6f4d9d6566ba49f3a5c876d5 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
@@ -46,7 +46,6 @@ import eu.etaxonomy.cdm.model.description.CommonTaxonName;
 import eu.etaxonomy.cdm.model.description.DescriptionElementSource;
 import eu.etaxonomy.cdm.model.description.Distribution;
 import eu.etaxonomy.cdm.model.description.Feature;
-import eu.etaxonomy.cdm.model.description.FeatureTree;
 import eu.etaxonomy.cdm.model.description.IndividualsAssociation;
 import eu.etaxonomy.cdm.model.description.MeasurementUnit;
 import eu.etaxonomy.cdm.model.description.MediaKey;
@@ -115,6 +114,7 @@ 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.FeatureTree;
 import eu.etaxonomy.cdm.model.term.OrderedTerm;
 import eu.etaxonomy.cdm.model.term.OrderedTermBase;
 import eu.etaxonomy.cdm.model.term.OrderedTermVocabulary;

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/description/IFeatureNodeDao.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/description/IFeatureNodeDao.java
index 2405f984f3a5bcb5d60dc26e600f2f9437828c1f..8940f9727f8e3e070a6276a908b5b47c452c876e 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/description/IFeatureNodeDao.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/description/IFeatureNodeDao.java
@@ -8,7 +8,7 @@ package eu.etaxonomy.cdm.persistence.dao.description;
 \r
 import java.util.List;\r
 \r
-import eu.etaxonomy.cdm.model.description.FeatureNode;\r
+import eu.etaxonomy.cdm.model.term.FeatureNode;\r
 import eu.etaxonomy.cdm.persistence.dao.common.IVersionableDao;\r
 \r
 /**\r

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 4206a3cb458ab624c9968c905474f0a113f18614..db38b5a84a53ab387b75c35f1b61374db37de0e9 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,8 +12,8 @@ package eu.etaxonomy.cdm.persistence.dao.description;
 import java.util.List;\r
 import java.util.UUID;\r
 \r
-import eu.etaxonomy.cdm.model.description.FeatureNode;\r
-import eu.etaxonomy.cdm.model.description.FeatureTree;\r
+import eu.etaxonomy.cdm.model.term.FeatureNode;\r
+import eu.etaxonomy.cdm.model.term.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

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/FeatureNodeDaoImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/FeatureNodeDaoImpl.java
index 28e1e5ea8d694cb714ae756e9ab93a1604cb8c00..3d1ff189649c10f7017376c8d097d0dd874007c6 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/FeatureNodeDaoImpl.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/FeatureNodeDaoImpl.java
@@ -11,7 +11,7 @@ import java.util.List;
 import org.hibernate.Criteria;\r
 import org.springframework.stereotype.Repository;\r
 \r
-import eu.etaxonomy.cdm.model.description.FeatureNode;\r
+import eu.etaxonomy.cdm.model.term.FeatureNode;\r
 import eu.etaxonomy.cdm.persistence.dao.description.IFeatureNodeDao;\r
 import eu.etaxonomy.cdm.persistence.dao.hibernate.common.VersionableDaoBase;\r
 \r

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 eb88414f17d379827d7d645966d3266a62093091..9e0f5cf6b160b60220adf7ed68a7b96efccad01c 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
@@ -21,8 +21,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;\r
 \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.FeatureNode;\r
+import eu.etaxonomy.cdm.model.term.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

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/PostMergeEntityListener.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/PostMergeEntityListener.java
index 6db14c1d268c7d5d0ca55383629cabf0dfe3bb8f..c70fdcb21449e9fc195757e981bd316c1a37ebb8 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/PostMergeEntityListener.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/PostMergeEntityListener.java
@@ -20,10 +20,10 @@ import org.hibernate.event.spi.MergeEvent;
 import org.hibernate.event.spi.MergeEventListener;
 
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.description.FeatureNode;
-import eu.etaxonomy.cdm.model.description.FeatureTree;
 import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+import eu.etaxonomy.cdm.model.term.FeatureNode;
+import eu.etaxonomy.cdm.model.term.FeatureTree;
 
 /**
  * @author cmathew

diff --git a/cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/hibernate.cfg.xml b/cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/hibernate.cfg.xml
index 73b5fd8523ca18914659debca70831bdc87d1cf3..30910edf3bd67603a9e5f8cf7ae95598729fc4c9 100644 (file)
--- a/cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/hibernate.cfg.xml
+++ b/cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/hibernate.cfg.xml
@@ -92,8 +92,8 @@
       <mapping class="eu.etaxonomy.cdm.model.description.Distribution"/>
       <mapping class="eu.etaxonomy.cdm.model.description.Feature"/>
       <mapping class="eu.etaxonomy.cdm.model.description.Character"/>
-      <mapping class="eu.etaxonomy.cdm.model.description.FeatureNode"/>
-      <mapping class="eu.etaxonomy.cdm.model.description.FeatureTree"/>
+      <mapping class="eu.etaxonomy.cdm.model.term.FeatureNode"/>
+      <mapping class="eu.etaxonomy.cdm.model.term.FeatureTree"/>
       <mapping class="eu.etaxonomy.cdm.model.description.KeyStatement"/>
       <mapping class="eu.etaxonomy.cdm.model.description.MediaKey"/>
       <mapping class="eu.etaxonomy.cdm.model.description.IndividualsAssociation"/>

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 40fe743409f1fb21dac33243c9a1b994e0d99df0..340382842e164457338689525dba4c01a1781b48 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
@@ -68,8 +68,6 @@ 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.Feature;
-import eu.etaxonomy.cdm.model.description.FeatureNode;
-import eu.etaxonomy.cdm.model.description.FeatureTree;
 import eu.etaxonomy.cdm.model.description.IndividualsAssociation;
 import eu.etaxonomy.cdm.model.description.MeasurementUnit;
 import eu.etaxonomy.cdm.model.description.MediaKey;
@@ -148,6 +146,8 @@ 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.FeatureNode;
+import eu.etaxonomy.cdm.model.term.FeatureTree;
 import eu.etaxonomy.cdm.model.term.OrderedTermBase;
 import eu.etaxonomy.cdm.model.term.OrderedTermVocabulary;
 import eu.etaxonomy.cdm.model.term.Representation;

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionController.java
index e39f6732e608e26aa996deb1b52700f48d32219d..93bf8f8443fe70a81e22e369c2cacbc9f9e0fa3d 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionController.java
@@ -34,10 +34,10 @@ import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.MarkerType;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.Feature;
-import eu.etaxonomy.cdm.model.description.FeatureTree;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.description.TextData;
 import eu.etaxonomy.cdm.model.location.NamedAreaLevel;
+import eu.etaxonomy.cdm.model.term.FeatureTree;
 import eu.etaxonomy.cdm.remote.editor.DefinedTermBaseList;
 import eu.etaxonomy.cdm.remote.editor.NamedAreaLevelPropertyEditor;
 import eu.etaxonomy.cdm.remote.editor.TermBaseListPropertyEditor;

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureNodeController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureNodeController.java
index ed503df724d6f5c0a9a914828b7fd3f31f66ef81..51cef3adf3ac2e917c10b200880f6a86e686d14d 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureNodeController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureNodeController.java
@@ -17,7 +17,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import eu.etaxonomy.cdm.api.service.IFeatureNodeService;
-import eu.etaxonomy.cdm.model.description.FeatureNode;
+import eu.etaxonomy.cdm.model.term.FeatureNode;
 
 /**
  * @author n.hoffmann

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureTreeController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureTreeController.java
index af193e36437a09a5af55cfa6abc8f28c633fef15..679917713b467fa391546a1ac318d9bed9715980 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureTreeController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureTreeController.java
@@ -15,7 +15,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import eu.etaxonomy.cdm.api.service.IFeatureTreeService;
-import eu.etaxonomy.cdm.model.description.FeatureTree;
+import eu.etaxonomy.cdm.model.term.FeatureTree;
 import io.swagger.annotations.Api;
 
 /**

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureTreeListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureTreeListController.java
index f047162850f869f7ffe0d379dc7ff176ec92eb7d..276ea2c0e2539f68faf28648c52223ddf26bb86d 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureTreeListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureTreeListController.java
@@ -16,7 +16,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import eu.etaxonomy.cdm.api.service.IFeatureTreeService;
-import eu.etaxonomy.cdm.model.description.FeatureTree;
+import eu.etaxonomy.cdm.model.term.FeatureTree;
 
 /**
  * @author n.hoffmann

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureTreePortalController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureTreePortalController.java
index 4d9b11f64a19d4fb813ff985542a12cb265f95fa..edbe0b00a8dca5ecdad5a2999c043ff4f4cf8cab 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureTreePortalController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureTreePortalController.java
@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import eu.etaxonomy.cdm.model.description.FeatureTree;
+import eu.etaxonomy.cdm.model.term.FeatureTree;
 import io.swagger.annotations.Api;
 
 /**

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 acca366ab73114379c55e810b1dbfdebba295afe..ec3a2b6355ab0814f18b6e6333c827f66f6dd6a2 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
@@ -43,7 +43,6 @@ import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.description.DescriptiveDataSet;
 import eu.etaxonomy.cdm.model.description.Distribution;
 import eu.etaxonomy.cdm.model.description.Feature;
-import eu.etaxonomy.cdm.model.description.FeatureTree;
 import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;
 import eu.etaxonomy.cdm.model.description.SpecimenDescription;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
@@ -56,6 +55,7 @@ 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.FeatureTree;
 import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.persistence.dao.description.IDescriptionDao;
 import eu.etaxonomy.cdm.persistence.dao.description.IDescriptionElementDao;
@@ -584,10 +584,6 @@ public class DescriptionServiceImpl
         return new DefaultPagerImpl<T>(pageNumber, count, pageSize, descriptionElements);
     }
 
-
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.api.service.IDescriptionService#generateNaturalLanguageDescription(eu.etaxonomy.cdm.model.description.FeatureTree, eu.etaxonomy.cdm.model.description.TaxonDescription, eu.etaxonomy.cdm.model.common.Language, java.util.List)
-     */
     @Override
     public String generateNaturalLanguageDescription(FeatureTree featureTree,
             TaxonDescription description, List<Language> preferredLanguages, String separator) {

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 42baa4ed658da266adadb52266328a2b6251945d..42cf52659b1d877948ed30a5b56b521783d35bac 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.description.FeatureNode;
-import eu.etaxonomy.cdm.model.description.FeatureTree;
 import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.FeatureNode;
+import eu.etaxonomy.cdm.model.term.FeatureTree;
 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 606d967be0688a90160bef5b9feb069d3c0351f9..0ce7bfaf8ab1d8b05389f624e2dc612fe23c422d 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,8 +25,8 @@ 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.description.FeatureNode;\r
-import eu.etaxonomy.cdm.model.description.FeatureTree;\r
+import eu.etaxonomy.cdm.model.term.FeatureNode;\r
+import eu.etaxonomy.cdm.model.term.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

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 7aaf4420eb6a2b42a87f1ecbf1562f4ff9b69022..e9ef47cae88abb4009ca0861773436178046a49a 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
@@ -26,7 +26,6 @@ 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.Feature;
-import eu.etaxonomy.cdm.model.description.FeatureTree;
 import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.description.TaxonNameDescription;
@@ -36,6 +35,7 @@ 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.FeatureTree;
 import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.persistence.dao.initializer.IBeanInitializer;
 import eu.etaxonomy.cdm.persistence.dto.MergeResult;

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 a8d83227e1804f4fc43e5a4a40e2ea043463f349..253eaa3723c7df106812ba7085146c2595a403fa 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.description.FeatureNode;\r
 import eu.etaxonomy.cdm.model.term.DefinedTermBase;\r
+import eu.etaxonomy.cdm.model.term.FeatureNode;\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 b2b0a650ef53de9ef95d449aa85c0943432ce384..5e078dcf997d8e049b80ece3c53d0bfb3a2e8ecc 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,8 +14,8 @@ import java.util.List;
 import java.util.Map;\r
 import java.util.UUID;\r
 \r
-import eu.etaxonomy.cdm.model.description.FeatureNode;\r
-import eu.etaxonomy.cdm.model.description.FeatureTree;\r
+import eu.etaxonomy.cdm.model.term.FeatureNode;\r
+import eu.etaxonomy.cdm.model.term.FeatureTree;\r
 import eu.etaxonomy.cdm.model.term.TermType;\r
 import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;\r
 \r

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/INaturalLanguageGenerator.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/INaturalLanguageGenerator.java
index 6b617bd46a838ce72a30e900abf53e43a5836307..dda88878d1f153fe11a2ce7be776b94b40fc6a6e 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/INaturalLanguageGenerator.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/INaturalLanguageGenerator.java
@@ -5,7 +5,7 @@ import java.util.List;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.description.TextData;
-import eu.etaxonomy.cdm.model.description.FeatureTree;
+import eu.etaxonomy.cdm.model.term.FeatureTree;
 
 
 

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NaturalLanguageGenerator.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NaturalLanguageGenerator.java
index 98e64908081e6d0e73ca9a952f1660dab1335291..6760d56adf89b92a3a07c6b10a421de35213fc9b 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NaturalLanguageGenerator.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NaturalLanguageGenerator.java
@@ -17,12 +17,12 @@ import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.description.CategoricalData;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.description.Feature;
-import eu.etaxonomy.cdm.model.description.FeatureNode;
-import eu.etaxonomy.cdm.model.description.FeatureTree;
 import eu.etaxonomy.cdm.model.description.QuantitativeData;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.description.TextData;
 import eu.etaxonomy.cdm.model.description.TextFormat;
+import eu.etaxonomy.cdm.model.term.FeatureNode;
+import eu.etaxonomy.cdm.model.term.FeatureTree;
 
 
 /**

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/util/CacheUpdater.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/util/CacheUpdater.java
index 4c321c19150f5465a0d36c5929b09a4d36a5ffc5..c774ed34d3711772183080476af814191804ee18 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/util/CacheUpdater.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/util/CacheUpdater.java
@@ -28,7 +28,6 @@ import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
 import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
-import eu.etaxonomy.cdm.model.description.FeatureTree;
 import eu.etaxonomy.cdm.model.description.PolytomousKey;
 import eu.etaxonomy.cdm.model.media.IdentifiableMediaEntity;
 import eu.etaxonomy.cdm.model.media.Media;
@@ -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.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.FeatureTree;
 import eu.etaxonomy.cdm.model.term.TermBase;
 import eu.etaxonomy.cdm.model.term.TermVocabulary;
 

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/util/CacheUpdaterWithNewCacheStrategy.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/util/CacheUpdaterWithNewCacheStrategy.java
index 5290390210c8e4f80c90c3bf9f914600e58326a2..fa2c75751cedac6340900232e45471b847abedcf 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/util/CacheUpdaterWithNewCacheStrategy.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/util/CacheUpdaterWithNewCacheStrategy.java
@@ -5,7 +5,6 @@ import org.apache.log4j.Logger;
 import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
-import eu.etaxonomy.cdm.model.description.FeatureTree;
 import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.cdm.model.molecular.Sequence;
 import eu.etaxonomy.cdm.model.name.TaxonName;
@@ -15,6 +14,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.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.FeatureTree;
 import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.strategy.cache.taxon.TaxonBaseShortSecCacheStrategy;
 

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 1c1e88d10c3e56876560cbd4ce01b1306f844fe4..086f160a191dc8895e89ec45fe15d6a69cdf4b01 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
@@ -28,8 +28,6 @@ import eu.etaxonomy.cdm.model.common.Group;
 import eu.etaxonomy.cdm.model.common.ICdmBase;\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
-import eu.etaxonomy.cdm.model.description.FeatureTree;\r
 import eu.etaxonomy.cdm.model.description.PolytomousKey;\r
 import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;\r
 import eu.etaxonomy.cdm.model.description.DescriptiveDataSet;\r
@@ -48,6 +46,8 @@ import eu.etaxonomy.cdm.model.taxon.Synonym;
 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.FeatureNode;\r
+import eu.etaxonomy.cdm.model.term.FeatureTree;\r
 import eu.etaxonomy.cdm.model.term.TermVocabulary;\r
 \r
 /**\r

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/FeatureNodeServiceImplTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/FeatureNodeServiceImplTest.java
index 936e1ceb69dc0313c5ed869be06198723092b4c5..5ddef9921b583b5e1d61f35764fc689c856f38e9 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/FeatureNodeServiceImplTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/FeatureNodeServiceImplTest.java
@@ -26,8 +26,8 @@ import eu.etaxonomy.cdm.api.service.config.NodeDeletionConfigurator.ChildHandlin
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.common.ITreeNode;
 import eu.etaxonomy.cdm.model.description.Feature;
-import eu.etaxonomy.cdm.model.description.FeatureNode;
-import eu.etaxonomy.cdm.model.description.FeatureTree;
+import eu.etaxonomy.cdm.model.term.FeatureNode;
+import eu.etaxonomy.cdm.model.term.FeatureTree;
 import eu.etaxonomy.cdm.test.integration.CdmTransactionalIntegrationTest;
 
 /**

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/NaturalLanguageGeneratorTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/NaturalLanguageGeneratorTest.java
index fd4366e3038dd4fc5141c5dca4cb2a2dcfc0cc96..419a56d9a671619cc043166f88d7d4234af8dcc5 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/NaturalLanguageGeneratorTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/NaturalLanguageGeneratorTest.java
@@ -18,8 +18,6 @@ import org.unitils.spring.annotation.SpringBeanByType;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.description.CategoricalData;
 import eu.etaxonomy.cdm.model.description.Feature;
-import eu.etaxonomy.cdm.model.description.FeatureNode;
-import eu.etaxonomy.cdm.model.description.FeatureTree;
 import eu.etaxonomy.cdm.model.description.MeasurementUnit;
 import eu.etaxonomy.cdm.model.description.QuantitativeData;
 import eu.etaxonomy.cdm.model.description.State;
@@ -31,6 +29,8 @@ import eu.etaxonomy.cdm.model.description.TextData;
 import eu.etaxonomy.cdm.model.name.INonViralName;
 import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
+import eu.etaxonomy.cdm.model.term.FeatureNode;
+import eu.etaxonomy.cdm.model.term.FeatureTree;
 import eu.etaxonomy.cdm.test.integration.CdmIntegrationTest;
 
 @Ignore //FIXME Remove @Ignore once maximes code is completely comitted

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 c3320f5c88300c20274f49f645ea910a711cb506..6097cdf9669fdc90da03bb75170b429d0a85f9d8 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
@@ -38,8 +38,6 @@ import eu.etaxonomy.cdm.database.ICdmDataSource;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.description.Distribution;
 import eu.etaxonomy.cdm.model.description.Feature;
-import eu.etaxonomy.cdm.model.description.FeatureNode;
-import eu.etaxonomy.cdm.model.description.FeatureTree;
 import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.location.NamedArea;
@@ -55,6 +53,8 @@ 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.FeatureNode;
+import eu.etaxonomy.cdm.model.term.FeatureTree;
 import eu.etaxonomy.cdm.model.term.init.TermNotFoundException;
 
 public class Datasource {

diff --git a/cdmlib-test/src/test/resources/eu/etaxonomy/cdm/hibernate.cfg.xml b/cdmlib-test/src/test/resources/eu/etaxonomy/cdm/hibernate.cfg.xml
index 73b5fd8523ca18914659debca70831bdc87d1cf3..30910edf3bd67603a9e5f8cf7ae95598729fc4c9 100644 (file)
--- a/cdmlib-test/src/test/resources/eu/etaxonomy/cdm/hibernate.cfg.xml
+++ b/cdmlib-test/src/test/resources/eu/etaxonomy/cdm/hibernate.cfg.xml
@@ -92,8 +92,8 @@
       <mapping class="eu.etaxonomy.cdm.model.description.Distribution"/>
       <mapping class="eu.etaxonomy.cdm.model.description.Feature"/>
       <mapping class="eu.etaxonomy.cdm.model.description.Character"/>
-      <mapping class="eu.etaxonomy.cdm.model.description.FeatureNode"/>
-      <mapping class="eu.etaxonomy.cdm.model.description.FeatureTree"/>
+      <mapping class="eu.etaxonomy.cdm.model.term.FeatureNode"/>
+      <mapping class="eu.etaxonomy.cdm.model.term.FeatureTree"/>
       <mapping class="eu.etaxonomy.cdm.model.description.KeyStatement"/>
       <mapping class="eu.etaxonomy.cdm.model.description.MediaKey"/>
       <mapping class="eu.etaxonomy.cdm.model.description.IndividualsAssociation"/>