From 2026b659dc7a3d8c6fdf0c5c42b5899ec3e59d67 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andreas=20M=C3=BCller?= <a.mueller@bgbm.org>
Date: Thu, 17 Feb 2011 18:59:06 +0000
Subject: [PATCH] add generic config to ExcelImportState

---
 .../cdm/io/excel/common/ExcelImportConfiguratorBase.java     | 3 +++
 .../eu/etaxonomy/cdm/io/excel/common/ExcelImportState.java   | 4 ++--
 .../eu/etaxonomy/cdm/io/excel/common/ExcelImporterBase.java  | 2 +-
 .../cdm/io/excel/distribution/DistributionImport.java        | 5 +++--
 .../etaxonomy/cdm/io/excel/taxa/TaxonExcelImportState.java   | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/common/ExcelImportConfiguratorBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/common/ExcelImportConfiguratorBase.java
index 4d454d0aad..8b149c4c19 100644
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/common/ExcelImportConfiguratorBase.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/common/ExcelImportConfiguratorBase.java
@@ -27,6 +27,7 @@ public abstract class ExcelImportConfiguratorBase extends ImportConfiguratorBase
 	//TODO
 	private static IInputTransformer defaultTransformer = null;
 
+
 	/**
 	 * @param url
 	 * @param destination
@@ -62,5 +63,7 @@ public abstract class ExcelImportConfiguratorBase extends ImportConfiguratorBase
 	public boolean isDoMatchTaxa() {
 		return false;
 	}
+
+
 	
 }
diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/common/ExcelImportState.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/common/ExcelImportState.java
index 85000acc9b..e32a1fefec 100644
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/common/ExcelImportState.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/common/ExcelImportState.java
@@ -19,12 +19,12 @@ import eu.etaxonomy.cdm.io.common.ImportStateBase;
  * @created 11.05.2009
  * @version 1.0
  */
-public class ExcelImportState extends ImportStateBase<ExcelImportConfiguratorBase, ExcelImporterBase>{
+public class ExcelImportState<CONFIG extends ExcelImportConfiguratorBase> extends ImportStateBase<CONFIG, ExcelImporterBase>{
 	@SuppressWarnings("unused")
 	private static final Logger logger = Logger.getLogger(ExcelImportState.class);
 
 	
-	public ExcelImportState(ExcelImportConfiguratorBase config) {
+	public ExcelImportState(CONFIG config) {
 		super(config);
 	}
 	
diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/common/ExcelImporterBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/common/ExcelImporterBase.java
index 2dc95448fe..d83b353820 100644
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/common/ExcelImporterBase.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/common/ExcelImporterBase.java
@@ -27,7 +27,7 @@ import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
  * @created 17.12.2008
  * @version 1.0
  */
-public abstract class ExcelImporterBase<STATE extends ExcelImportState> extends CdmImportBase<ExcelImportConfiguratorBase, STATE> {
+public abstract class ExcelImporterBase<STATE extends ExcelImportState<ExcelImportConfiguratorBase>> extends CdmImportBase<ExcelImportConfiguratorBase, STATE> {
 	private static final Logger logger = Logger.getLogger(ExcelImporterBase.class);
 
 	protected static final String SCIENTIFIC_NAME_COLUMN = "ScientificName";
diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/distribution/DistributionImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/distribution/DistributionImport.java
index 4e14808ae8..eec2fa1bbd 100644
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/distribution/DistributionImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/distribution/DistributionImport.java
@@ -28,6 +28,7 @@ import eu.etaxonomy.cdm.io.common.CdmIoBase;
 import eu.etaxonomy.cdm.io.common.ICdmIO;
 import eu.etaxonomy.cdm.io.common.IImportConfigurator;
 import eu.etaxonomy.cdm.io.common.MapWrapper;
+import eu.etaxonomy.cdm.io.excel.common.ExcelImportConfiguratorBase;
 import eu.etaxonomy.cdm.io.excel.common.ExcelImportState;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
@@ -47,7 +48,7 @@ import eu.etaxonomy.cdm.persistence.query.MatchMode;
  * @version 1.0
  */
 @Component
-public class DistributionImport extends CdmIoBase<ExcelImportState> implements ICdmIO<ExcelImportState> {
+public class DistributionImport extends CdmIoBase<ExcelImportState<ExcelImportConfiguratorBase>> implements ICdmIO<ExcelImportState<ExcelImportConfiguratorBase>> {
 
     /* used */
     private static final String EDIT_NAME_COLUMN = "EDIT";
@@ -71,7 +72,7 @@ public class DistributionImport extends CdmIoBase<ExcelImportState> implements I
 	Map<Taxon, TaxonDescription> myDescriptions = new HashMap<Taxon, TaxonDescription>();
 
 	@Override
-	protected boolean doInvoke(ExcelImportState state) {
+	protected boolean doInvoke(ExcelImportState<ExcelImportConfiguratorBase> state) {
 		
 		if (logger.isDebugEnabled()) { logger.debug("Importing distribution data"); }
     	
diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/taxa/TaxonExcelImportState.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/taxa/TaxonExcelImportState.java
index 6117975a4c..06e1817608 100644
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/taxa/TaxonExcelImportState.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/taxa/TaxonExcelImportState.java
@@ -29,7 +29,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonBase;
  * @created 11.05.2009
  * @version 1.0
  */
-public class TaxonExcelImportState extends ExcelImportState{
+public class TaxonExcelImportState extends ExcelImportState<ExcelImportConfiguratorBase>{
 	@SuppressWarnings("unused")
 	private static final Logger logger = Logger.getLogger(TaxonExcelImportState.class);
 	
-- 
2.34.1