Merge branch 'release/4.6.0'

[cdmlib.git] / cdmlib-io / src / main / java / eu / etaxonomy / cdm / io / tcsxml / in / TcsXmlTaxonRelationsImport.java

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlTaxonRelationsImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlTaxonRelationsImport.java
index ab1d46b4130e1985e67d2b3973b3f47543a4d169..963c3e3baf0f99bea6965ef29f84356796e713dd 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlTaxonRelationsImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlTaxonRelationsImport.java
@@ -36,8 +36,8 @@ import eu.etaxonomy.cdm.model.common.OriginalSourceType;
 import eu.etaxonomy.cdm.model.common.RelationshipTermBase;\r
 import eu.etaxonomy.cdm.model.description.CommonTaxonName;\r
 import eu.etaxonomy.cdm.model.description.TaxonDescription;\r
 import eu.etaxonomy.cdm.model.common.RelationshipTermBase;\r
 import eu.etaxonomy.cdm.model.description.CommonTaxonName;\r
 import eu.etaxonomy.cdm.model.description.TaxonDescription;\r

-import eu.etaxonomy.cdm.model.name.NonViralName;\r

 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r

+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;\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.reference.Reference;\r
 import eu.etaxonomy.cdm.model.taxon.Classification;\r
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r


@@ -214,7 +214,7 @@ public class TcsXmlTaxonRelationsImport extends TcsXmlImportBase implements ICdm
 \r
 \r
                        } else{\r
 \r
 \r
                        } else{\r

-                               basionymName = NonViralName.NewInstance(name.getRank());\r
+                               basionymName = TaxonNameFactory.NewNonViralInstance(name.getRank());\r

                                childName = "RelatedName";\r
                                obligatory = true;\r
                                Element elName = XmlHelp.getSingleChildElement(success, elBasionym, childName, tcsNamespace, obligatory);\r
                                childName = "RelatedName";\r
                                obligatory = true;\r
                                Element elName = XmlHelp.getSingleChildElement(success, elBasionym, childName, tcsNamespace, obligatory);\r


@@ -544,7 +544,7 @@ public class TcsXmlTaxonRelationsImport extends TcsXmlImportBase implements ICdm
                                }else{\r
                                        String title = elToTaxonConcept.getTextNormalize();\r
                                        //TODO synonym?\r
                                }else{\r
                                        String title = elToTaxonConcept.getTextNormalize();\r
                                        //TODO synonym?\r

-                                       TaxonNameBase<?,?> taxonName = NonViralName.NewInstance(null);\r
+                                       TaxonNameBase<?,?> taxonName = TaxonNameFactory.NewNonViralInstance(null);\r

                                        taxonName.setTitleCache(title, true);\r
                                        logger.warn("Free text related taxon seems to be bug in TCS");\r
                                        if (isSynonym){\r
                                        taxonName.setTitleCache(title, true);\r
                                        logger.warn("Free text related taxon seems to be bug in TCS");\r
                                        if (isSynonym){\r