fix #6360 use TaxonNameFactory for NonViralNames

[cdmlib.git] / cdmlib-io / src / main / java / eu / etaxonomy / cdm / io / specimen / SpecimenImportBase.java

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 2182c4eaccd9c0a21437579df0716b880e66fbc1..f3aea99d3d36dda81dba7e7e982ecf8298b6dbf6 100644 (file)
--- 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
@@ -53,6 +53,7 @@ import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
 import eu.etaxonomy.cdm.model.occurrence.Collection;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
 import eu.etaxonomy.cdm.model.occurrence.DeterminationEvent;
@@ -163,7 +164,7 @@ public abstract class SpecimenImportBase<CONFIG extends IImportConfigurator, STA
             }else if (state.getDataHolder().getNomenclatureCode().equals(NomenclaturalCode.ICZN)){
                 taxonName = TaxonNameBase.NewZoologicalInstance(rank);
             }else{
-                taxonName = TaxonNameBase.NewNonViralInstance(rank);
+                taxonName = TaxonNameFactory.NewNonViralInstance(rank);
             }
             taxonName.setFullTitleCache(scientificName,true);
             taxonName.setTitleCache(scientificName, true);
@@ -401,7 +402,7 @@ public abstract class SpecimenImportBase<CONFIG extends IImportConfigurator, STA
                    }
                }
                else if (state.getDataHolder().getNomenclatureCode().equals("Bacterial") || state.getDataHolder().getNomenclatureCode().equals(NomenclaturalCode.ICNB.getUuid())) {
-                   NonViralName<BacterialName> taxonName = TaxonNameBase.NewBacterialInstance(null);
+                   NonViralName<BacterialName> taxonName = TaxonNameFactory.NewBacterialInstance(null);
                    taxonName.setFullTitleCache(fullName, true);
                    taxonName.setGenusOrUninomial(getFromMap(atomisedMap, "Genus"));
                    taxonName.setInfraGenericEpithet(NB(getFromMap(atomisedMap, "SubGenus")));
@@ -440,7 +441,7 @@ public abstract class SpecimenImportBase<CONFIG extends IImportConfigurator, STA
                    }
                }
                else if (state.getDataHolder().getNomenclatureCode().equals("Cultivar")) {
-                   CultivarPlantName taxonName = TaxonNameBase.NewCultivarInstance(null);
+                   CultivarPlantName taxonName = TaxonNameFactory.NewCultivarInstance(null);
 
                    if (taxonName.hasProblem()) {
                        logger.info("pb ICNCP");
@@ -454,11 +455,11 @@ public abstract class SpecimenImportBase<CONFIG extends IImportConfigurator, STA
 
                if (problem) {
                    logger.info("Problem im setTaxonNameByType ");
-                   TaxonNameBase<?,?> taxonName = TaxonNameBase.NewNonViralInstance(null);
+                   TaxonNameBase<?,?> taxonName = TaxonNameFactory.NewNonViralInstance(null);
                    taxonName.setFullTitleCache(fullName, true);
                    return taxonName;
                }
-               TaxonNameBase<?,?> tn = TaxonNameBase.NewNonViralInstance(null);
+               TaxonNameBase<?,?> tn = TaxonNameFactory.NewNonViralInstance(null);
                return tn;
            }