add new erms validators

diff --git a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsDrImport.java b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsDrImport.java
index 1edbdf52cc552b32a3aa210b580b78c9d5ae076b..c5cfdab9e84b52b47c4b42ee6a7d617f83cb7215 100644 (file)
--- a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsDrImport.java
+++ b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsDrImport.java
@@ -22,12 +22,10 @@ import org.springframework.stereotype.Component;
 import eu.etaxonomy.cdm.io.common.IOValidator;\r
 import eu.etaxonomy.cdm.io.common.mapping.DbIgnoreMapper;\r
 import eu.etaxonomy.cdm.io.common.mapping.DbImportAnnotationMapper;\r
-import eu.etaxonomy.cdm.io.common.mapping.DbImportDescriptionElementSourceCreationMapper;\r
 import eu.etaxonomy.cdm.io.common.mapping.DbImportDistributionCreationMapper;\r
 import eu.etaxonomy.cdm.io.common.mapping.DbImportMapping;\r
 import eu.etaxonomy.cdm.io.common.mapping.DbImportObjectMapper;\r
-import eu.etaxonomy.cdm.io.common.mapping.DbNotYetImplementedMapper;\r
-import eu.etaxonomy.cdm.io.pesi.erms.validation.ErmsReferenceImportValidator;\r
+import eu.etaxonomy.cdm.io.pesi.erms.validation.ErmsDrImportValidator;\r
 import eu.etaxonomy.cdm.model.common.AnnotationType;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
 import eu.etaxonomy.cdm.model.description.Distribution;\r
@@ -184,7 +182,7 @@ public class ErmsDrImport  extends ErmsImportBase<Distribution> {
         */\r
        @Override\r
        protected boolean doCheck(ErmsImportState state){\r
-               IOValidator<ErmsImportState> validator = new ErmsReferenceImportValidator();\r
+               IOValidator<ErmsImportState> validator = new ErmsDrImportValidator();\r
                return validator.validate(state);\r
        }\r
        \r

diff --git a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsNotesSourcesImport.java b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsNotesSourcesImport.java
index f86fbe9d100254ec1aac5577c3bbe77024d74bbe..c563dae03137cdf48adf6ce3d6ee0e09fdad4346 100644 (file)
--- a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsNotesSourcesImport.java
+++ b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsNotesSourcesImport.java
@@ -23,6 +23,7 @@ import org.springframework.stereotype.Component;
 import eu.etaxonomy.cdm.io.common.IOValidator;\r
 import eu.etaxonomy.cdm.io.common.mapping.DbImportDescriptionElementSourceCreationMapper;\r
 import eu.etaxonomy.cdm.io.common.mapping.DbImportMapping;\r
+import eu.etaxonomy.cdm.io.pesi.erms.validation.ErmsNoteSourceImportValidator;\r
 import eu.etaxonomy.cdm.io.pesi.erms.validation.ErmsVernacularSourceImportValidator;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
 import eu.etaxonomy.cdm.model.common.DescriptionElementSource;\r
@@ -143,7 +144,7 @@ public class ErmsNotesSourcesImport extends ErmsImportBase<CommonTaxonName> {
         */\r
        @Override\r
        protected boolean doCheck(ErmsImportState state) {\r
-               IOValidator<ErmsImportState> validator = new ErmsVernacularSourceImportValidator();\r
+               IOValidator<ErmsImportState> validator = new ErmsNoteSourceImportValidator();\r
                return validator.validate(state);\r
        }\r
        \r

diff --git a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsVernacularImport.java b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsVernacularImport.java
index 0e64951b96ebf67d9493c5848ec18ad20cae9f03..2b83e9f701c6c79374a46c12fddb6dd07ef1d081 100644 (file)
--- a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsVernacularImport.java
+++ b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsVernacularImport.java
@@ -25,7 +25,7 @@ import eu.etaxonomy.cdm.io.common.mapping.DbImportCommonNameCreationMapper;
 import eu.etaxonomy.cdm.io.common.mapping.DbImportMapping;\r
 import eu.etaxonomy.cdm.io.common.mapping.DbImportObjectMapper;\r
 import eu.etaxonomy.cdm.io.common.mapping.DbImportStringMapper;\r
-import eu.etaxonomy.cdm.io.pesi.erms.validation.ErmsReferenceImportValidator;\r
+import eu.etaxonomy.cdm.io.pesi.erms.validation.ErmsVernacularImportValidator;\r
 import eu.etaxonomy.cdm.model.common.AnnotationType;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
@@ -134,7 +134,7 @@ public class ErmsVernacularImport  extends ErmsImportBase<CommonTaxonName> {
         */\r
        @Override\r
        protected boolean doCheck(ErmsImportState state){\r
-               IOValidator<ErmsImportState> validator = new ErmsReferenceImportValidator();\r
+               IOValidator<ErmsImportState> validator = new ErmsVernacularImportValidator();\r
                return validator.validate(state);\r
        }\r
        \r