ref #7099 rename model.rights to model.permission

[cdmlib.git] / cdmlib-services / src / main / java / eu / etaxonomy / cdm / api / validation / batch / BatchValidationUtil.java

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 fcaf2645958ea61c99bb269e36d5db9640a0e707..3a34346ab300939c63a3384c369d2b9f268211f9 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,17 +24,11 @@ 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
-import eu.etaxonomy.cdm.model.description.FeatureTree;\r
+import eu.etaxonomy.cdm.model.description.DescriptiveDataSet;\r
 import eu.etaxonomy.cdm.model.description.PolytomousKey;\r
 import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;\r
-import eu.etaxonomy.cdm.model.description.WorkingSet;\r
 import eu.etaxonomy.cdm.model.molecular.Amplification;\r
 import eu.etaxonomy.cdm.model.molecular.Primer;\r
 import eu.etaxonomy.cdm.model.molecular.Sequence;\r
@@ -44,15 +38,21 @@ import eu.etaxonomy.cdm.model.name.TypeDesignationBase;
 import eu.etaxonomy.cdm.model.occurrence.Collection;\r
 import eu.etaxonomy.cdm.model.occurrence.GatheringEvent;\r
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;\r
+import eu.etaxonomy.cdm.model.permission.Group;\r
+import eu.etaxonomy.cdm.model.permission.User;\r
 import eu.etaxonomy.cdm.model.reference.Reference;\r
 import eu.etaxonomy.cdm.model.taxon.Classification;\r
 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.TermNode;\r
+import eu.etaxonomy.cdm.model.term.TermTree;\r
+import eu.etaxonomy.cdm.model.term.TermVocabulary;\r
 \r
 /**\r
  * @author ayco_holleman\r
- * @date 28 jan. 2015\r
+ * @since 28 jan. 2015\r
  *\r
  */\r
 class BatchValidationUtil {\r
@@ -77,9 +77,10 @@ class BatchValidationUtil {
         services.add(new EntityValidationUnit(Classification.class, appConfig.getClassificationService()));\r
         services.add(new EntityValidationUnit(Collection.class, appConfig.getCollectionService()));\r
 //        services.add(new EntityValidationUnit(OriginalSourceBase.class, appConfig.getCommonService()));\r
-        services.add(new EntityValidationUnit(DescriptionBase.class, appConfig.getDescriptionService()));\r
-        services.add(new EntityValidationUnit(FeatureNode.class, appConfig.getFeatureNodeService()));\r
-        services.add(new EntityValidationUnit(FeatureTree.class, appConfig.getFeatureTreeService()));\r
+        services.add(new EntityValidationUnit(DescriptionBase.class, appConfig.getDescriptionService()));
+        services.add(new EntityValidationUnit(TermNode.class, appConfig.getTermNodeService()));
+        services.add(new EntityValidationUnit(TermTree.class, appConfig.getTermTreeService()));
+
         services.add(new EntityValidationUnit(Group.class, appConfig.getGroupService()));\r
         // Causes some AOP-related error when calling list() method on it\r
         //services.add(new EntityValidationUnit(DefinedTermBase.class, appConfig.getLocationService()));\r
@@ -96,7 +97,7 @@ class BatchValidationUtil {
         services.add(new EntityValidationUnit(DefinedTermBase.class, appConfig.getTermService()));\r
         services.add(new EntityValidationUnit(User.class, appConfig.getUserService()));\r
         services.add(new EntityValidationUnit(TermVocabulary.class, appConfig.getVocabularyService()));\r
-        services.add(new EntityValidationUnit(WorkingSet.class, appConfig.getWorkingSetService()));\r
+        services.add(new EntityValidationUnit(DescriptiveDataSet.class, appConfig.getDescriptiveDataSetService()));\r
         return services;\r
     }\r
 \r