latest Emrs import updates

[cdmlib-apps.git] / cdm-pesi / src / main / java / eu / etaxonomy / cdm / io / pesi / erms / ErmsTaxonRelationImport.java

diff --git a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsTaxonRelationImport.java b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsTaxonRelationImport.java
index b477050bf3a4be70fad781e8e34e2a65a5f7500b..2da58d53038de2f4d20638978a98aea6014e634f 100644 (file)
--- a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsTaxonRelationImport.java
+++ b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsTaxonRelationImport.java
@@ -36,7 +36,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonBase;
  * @version 1.0\r
  */\r
 @Component\r
-public class ErmsTaxonRelationImport extends ErmsImportBase<TaxonBase> implements ICheckIgnoreMapper{\r
+public class ErmsTaxonRelationImport extends ErmsImportBase<TaxonBase<?>> implements ICheckIgnoreMapper{\r
        @SuppressWarnings("unused")\r
        private static final Logger logger = Logger.getLogger(ErmsTaxonRelationImport.class);\r
        \r
@@ -119,7 +119,7 @@ public class ErmsTaxonRelationImport extends ErmsImportBase<TaxonBase> implement
                        nameSpace = ErmsTaxonImport.NAME_NAMESPACE;\r
                        cdmClass = TaxonNameBase.class;\r
                        idSet = nameIdSet;\r
-                       Map<String, TaxonNameBase> nameMap = (Map<String, TaxonNameBase>)getCommonService().getSourcedObjectsByIdInSource(cdmClass, idSet, nameSpace);\r
+                       Map<String, TaxonNameBase<?,?>> nameMap = (Map<String, TaxonNameBase<?,?>>)getCommonService().getSourcedObjectsByIdInSource(cdmClass, idSet, nameSpace);\r
                        result.put(nameSpace, nameMap);\r
                        \r
                        \r
@@ -127,7 +127,7 @@ public class ErmsTaxonRelationImport extends ErmsImportBase<TaxonBase> implement
                        nameSpace = ErmsTaxonImport.TAXON_NAMESPACE;\r
                        cdmClass = TaxonBase.class;\r
                        idSet = taxonIdSet;\r
-                       Map<String, TaxonBase> taxonMap = (Map<String, TaxonBase>)getCommonService().getSourcedObjectsByIdInSource(cdmClass, idSet, nameSpace);\r
+                       Map<String, TaxonBase<?>> taxonMap = (Map<String, TaxonBase<?>>)getCommonService().getSourcedObjectsByIdInSource(cdmClass, idSet, nameSpace);\r
                        result.put(nameSpace, taxonMap);\r
 \r
                } catch (SQLException e) {\r
@@ -184,7 +184,7 @@ public class ErmsTaxonRelationImport extends ErmsImportBase<TaxonBase> implement
        /* (non-Javadoc)\r
         * @see eu.etaxonomy.cdm.io.common.mapping.IMappingImport#createObject(java.sql.ResultSet, eu.etaxonomy.cdm.io.common.ImportStateBase)\r
         */\r
-       public TaxonBase createObject(ResultSet rs, ErmsImportState state) throws SQLException {\r
+       public TaxonBase<?> createObject(ResultSet rs, ErmsImportState state) throws SQLException {\r
                // not needed\r
                return null;\r
        }\r