add NomStatus vocabulary for ICZN #4085

[cdmlib-apps.git] / app-import / src / main / java / eu / etaxonomy / cdm / io / caryo / CaryoTaxonImport.java

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/caryo/CaryoTaxonImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/caryo/CaryoTaxonImport.java
index 11569ad8464d47690bf4442f02a34f904c866d9b..d384d66afa99d8c1dc7c0b5dfe0704ce2cfd7050 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/caryo/CaryoTaxonImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/caryo/CaryoTaxonImport.java
@@ -48,16 +48,12 @@ import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
-import eu.etaxonomy.cdm.strategy.cache.name.BotanicNameDefaultCacheStrategy;\r
 import eu.etaxonomy.cdm.strategy.exceptions.UnknownCdmTypeException;\r
-import eu.etaxonomy.cdm.strategy.parser.INonViralNameParser;\r
-import eu.etaxonomy.cdm.strategy.parser.NonViralNameParserImpl;\r
 \r
 \r
 /**\r
  * @author a.mueller\r
  * @created 20.02.2010\r
- * @version 1.0\r
  */\r
 @Component\r
 public class CaryoTaxonImport  extends DbImportBase<CaryoImportState, CaryoImportConfigurator> {\r
@@ -290,7 +286,7 @@ public class CaryoTaxonImport  extends DbImportBase<CaryoImportState, CaryoImpor
                if (StringUtils.isNotBlank(nomStatusStr)){\r
                        NomenclaturalStatusType nomStatusType;\r
                        try {\r
-                               nomStatusType = NomenclaturalStatusType.getNomenclaturalStatusTypeByAbbreviation(nomStatusStr);\r
+                               nomStatusType = NomenclaturalStatusType.getNomenclaturalStatusTypeByAbbreviation(nomStatusStr, name);\r
                        } catch (UnknownCdmTypeException e) {\r
                                if (nomStatusStr.startsWith("nom. rej. prop.")){\r
                                        nomStatusType = NomenclaturalStatusType.REJECTED_PROP();\r
@@ -782,10 +778,8 @@ public class CaryoTaxonImport  extends DbImportBase<CaryoImportState, CaryoImpor
 \r
 \r
 \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.berlinModel.in.IPartitionedIO#getRelatedObjectsForPartition(java.sql.ResultSet)\r
-        */\r
-       public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs) {\r
+       @Override\r
+       public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs, CaryoImportState state) {\r
 //             String nameSpace;\r
 //             Class cdmClass;\r
 //             Set<String> idSet;\r