further refactoring to make Excel imports more generic (in cdm-app)

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/cyprus/CyprusImportState.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/cyprus/CyprusImportState.java
index 8242af286419dd4f9989c8b63ba3354c5a382c30..09d9197d27ea7202587465b238f870af5b8471fb 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/cyprus/CyprusImportState.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/cyprus/CyprusImportState.java
@@ -16,6 +16,7 @@ import java.util.Map;
 import org.apache.log4j.Logger;\r
 \r
 import eu.etaxonomy.cdm.io.excel.common.ExcelImportState;\r
+import eu.etaxonomy.cdm.io.excel.common.ExcelRowBase;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 \r
 /**\r
@@ -23,7 +24,7 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
  * @created 11.05.2009\r
  * @version 1.0\r
  */\r
-public class CyprusImportState extends ExcelImportState<CyprusImportConfigurator>{\r
+public class CyprusImportState extends ExcelImportState<CyprusImportConfigurator, ExcelRowBase>{\r
        @SuppressWarnings("unused")\r
        private static final Logger logger = Logger.getLogger(CyprusImportState.class);\r
 \r

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/wp6/CichorieaeCommonNameImportState.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/wp6/CichorieaeCommonNameImportState.java
index 094c1c5c3d4cd7d42b9c878e3c2182fd50c65a61..2aa55098a21ac5909158a0cfb543c01602e57feb 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/wp6/CichorieaeCommonNameImportState.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/wp6/CichorieaeCommonNameImportState.java
@@ -1,8 +1,9 @@
 package eu.etaxonomy.cdm.io.wp6;\r
 \r
 import eu.etaxonomy.cdm.io.excel.common.ExcelImportState;\r
+import eu.etaxonomy.cdm.io.excel.common.ExcelRowBase;\r
 \r
-public class CichorieaeCommonNameImportState extends ExcelImportState<CommonNameImportConfigurator> {\r
+public class CichorieaeCommonNameImportState extends ExcelImportState<CommonNameImportConfigurator, ExcelRowBase> {\r
        CommonNameRow row;\r
        \r
        public CichorieaeCommonNameImportState(CommonNameImportConfigurator config) {\r