BGBM BDI Projects
/
cdmlib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5499a7f
)
add generic config to ExcelImportState
author
Andreas Müller
<a.mueller@bgbm.org>
Thu, 17 Feb 2011 18:59:06 +0000
(18:59 +0000)
committer
Andreas Müller
<a.mueller@bgbm.org>
Thu, 17 Feb 2011 18:59:06 +0000
(18:59 +0000)
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/common/ExcelImportConfiguratorBase.java
patch
|
blob
|
history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/common/ExcelImportState.java
patch
|
blob
|
history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/common/ExcelImporterBase.java
patch
|
blob
|
history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/distribution/DistributionImport.java
patch
|
blob
|
history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/taxa/TaxonExcelImportState.java
patch
|
blob
|
history
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 4d454d0aadfa2892566a9694ba1b7cb29524b9d0..8b149c4c1980e006996d3205df50a7fa1e87c335 100644
(file)
--- 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
\r
private static IInputTransformer defaultTransformer = null;
\r
\r
//TODO
\r
private static IInputTransformer defaultTransformer = null;
\r
\r
+
\r
/**
\r
* @param url
\r
* @param destination
\r
/**
\r
* @param url
\r
* @param destination
\r
@@
-62,5
+63,7
@@
public abstract class ExcelImportConfiguratorBase extends ImportConfiguratorBase
public boolean isDoMatchTaxa() {
\r
return false;
\r
}
\r
public boolean isDoMatchTaxa() {
\r
return false;
\r
}
\r
+
\r
+
\r
\r
}
\r
\r
}
\r
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 85000acc9be7a093548846120780d51ad3b5b071..e32a1fefecf18c84ccd9e8900329a83e08f4560a 100644
(file)
--- 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
\r
* @version 1.0
\r
*/
\r
* @created 11.05.2009
\r
* @version 1.0
\r
*/
\r
-public class ExcelImportState
extends ImportStateBase<ExcelImportConfiguratorBase
, ExcelImporterBase>{
\r
+public class ExcelImportState
<CONFIG extends ExcelImportConfiguratorBase> extends ImportStateBase<CONFIG
, ExcelImporterBase>{
\r
@SuppressWarnings("unused")
\r
private static final Logger logger = Logger.getLogger(ExcelImportState.class);
\r
\r
\r
@SuppressWarnings("unused")
\r
private static final Logger logger = Logger.getLogger(ExcelImportState.class);
\r
\r
\r
- public ExcelImportState(
ExcelImportConfiguratorBase
config) {
\r
+ public ExcelImportState(
CONFIG
config) {
\r
super(config);
\r
}
\r
\r
super(config);
\r
}
\r
\r
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 2dc95448fed7933a879b1597cc3ab53fd02e8f16..d83b353820ac8bc07eb9e77cb70d7781bc7cd96c 100644
(file)
--- 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
\r
* @version 1.0
\r
*/
\r
* @created 17.12.2008
\r
* @version 1.0
\r
*/
\r
-public abstract class ExcelImporterBase<STATE extends ExcelImportState> extends CdmImportBase<ExcelImportConfiguratorBase, STATE> {
\r
+public abstract class ExcelImporterBase<STATE extends ExcelImportState
<ExcelImportConfiguratorBase>
> extends CdmImportBase<ExcelImportConfiguratorBase, STATE> {
\r
private static final Logger logger = Logger.getLogger(ExcelImporterBase.class);
\r
\r
protected static final String SCIENTIFIC_NAME_COLUMN = "ScientificName";
\r
private static final Logger logger = Logger.getLogger(ExcelImporterBase.class);
\r
\r
protected static final String SCIENTIFIC_NAME_COLUMN = "ScientificName";
\r
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 4e14808ae8b283b20036a2b55584dbf4b6d76dd0..eec2fa1bbdffe6eec05cb450e0ec3206a36ca062 100644
(file)
--- 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;
\r
import eu.etaxonomy.cdm.io.common.IImportConfigurator;
\r
import eu.etaxonomy.cdm.io.common.MapWrapper;
\r
import eu.etaxonomy.cdm.io.common.ICdmIO;
\r
import eu.etaxonomy.cdm.io.common.IImportConfigurator;
\r
import eu.etaxonomy.cdm.io.common.MapWrapper;
\r
+import eu.etaxonomy.cdm.io.excel.common.ExcelImportConfiguratorBase;
\r
import eu.etaxonomy.cdm.io.excel.common.ExcelImportState;
\r
import eu.etaxonomy.cdm.model.common.CdmBase;
\r
import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
\r
import eu.etaxonomy.cdm.io.excel.common.ExcelImportState;
\r
import eu.etaxonomy.cdm.model.common.CdmBase;
\r
import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
\r
@@
-47,7
+48,7
@@
import eu.etaxonomy.cdm.persistence.query.MatchMode;
* @version 1.0
\r
*/
\r
@Component
\r
* @version 1.0
\r
*/
\r
@Component
\r
-public class DistributionImport extends CdmIoBase<ExcelImportState
> implements ICdmIO<ExcelImportState
> {
\r
+public class DistributionImport extends CdmIoBase<ExcelImportState
<ExcelImportConfiguratorBase>> implements ICdmIO<ExcelImportState<ExcelImportConfiguratorBase>
> {
\r
\r
/* used */
\r
private static final String EDIT_NAME_COLUMN = "EDIT";
\r
\r
/* used */
\r
private static final String EDIT_NAME_COLUMN = "EDIT";
\r
@@
-71,7
+72,7
@@
public class DistributionImport extends CdmIoBase<ExcelImportState> implements I
Map<Taxon, TaxonDescription> myDescriptions = new HashMap<Taxon, TaxonDescription>();
\r
\r
@Override
\r
Map<Taxon, TaxonDescription> myDescriptions = new HashMap<Taxon, TaxonDescription>();
\r
\r
@Override
\r
- protected boolean doInvoke(ExcelImportState state) {
\r
+ protected boolean doInvoke(ExcelImportState
<ExcelImportConfiguratorBase>
state) {
\r
\r
if (logger.isDebugEnabled()) { logger.debug("Importing distribution data"); }
\r
\r
\r
if (logger.isDebugEnabled()) { logger.debug("Importing distribution data"); }
\r
\r
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 6117975a4c25ebdb4d0d520aa9633c31c64b4107..06e1817608d2ce72424af46eae4de3ad69275f3b 100644
(file)
--- 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
\r
* @version 1.0
\r
*/
\r
* @created 11.05.2009
\r
* @version 1.0
\r
*/
\r
-public class TaxonExcelImportState extends ExcelImportState{
\r
+public class TaxonExcelImportState extends ExcelImportState
<ExcelImportConfiguratorBase>
{
\r
@SuppressWarnings("unused")
\r
private static final Logger logger = Logger.getLogger(TaxonExcelImportState.class);
\r
\r
@SuppressWarnings("unused")
\r
private static final Logger logger = Logger.getLogger(TaxonExcelImportState.class);
\r
\r