From 748cb8181687fc041fcd1603f198fcdf14f7b426 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Fri, 21 Feb 2020 10:48:26 +0100 Subject: [PATCH] cleanup --- .../cdm/io/caryo/CaryoImportConfigurator.java | 43 ++++++++----------- .../io/mexico/MexicoBorhidiExcelImport.java | 22 +--------- .../MexicoBorhidiImportConfigurator.java | 25 ++--------- .../MexicoConabioImportConfigurator.java | 30 ------------- 4 files changed, 22 insertions(+), 98 deletions(-) diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/caryo/CaryoImportConfigurator.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/caryo/CaryoImportConfigurator.java index abe18a55..930b211d 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/io/caryo/CaryoImportConfigurator.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/caryo/CaryoImportConfigurator.java @@ -1,8 +1,8 @@ /** * Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * The contents of this file are subject to the Mozilla Public License Version 1.1 * See LICENSE.TXT at the top of this package for the full license terms. */ @@ -13,61 +13,52 @@ import org.apache.log4j.Logger; import eu.etaxonomy.cdm.database.ICdmDataSource; import eu.etaxonomy.cdm.io.common.DbImportConfiguratorBase; -import eu.etaxonomy.cdm.io.common.IImportConfigurator; import eu.etaxonomy.cdm.io.common.Source; import eu.etaxonomy.cdm.io.common.mapping.IInputTransformer; import eu.etaxonomy.cdm.model.name.NomenclaturalCode; - /** * @author a.mueller * @since 20.03.2008 - * @version 1.0 */ -public class CaryoImportConfigurator extends DbImportConfiguratorBase implements IImportConfigurator{ - @SuppressWarnings("unused") +public class CaryoImportConfigurator + extends DbImportConfiguratorBase{ + + private static final long serialVersionUID = 9002177401082394179L; + @SuppressWarnings("unused") private static Logger logger = Logger.getLogger(CaryoImportConfigurator.class); private boolean isDoTaxa; - + private static IInputTransformer defaultTransformer = new CaryoTransformer(); - + public static CaryoImportConfigurator NewInstance(Source source, ICdmDataSource destination){ return new CaryoImportConfigurator(source, destination); -} - + } - - protected void makeIoClassList(){ + @SuppressWarnings("unchecked") + @Override + protected void makeIoClassList(){ ioClassList = new Class[]{ CaryoTaxonImport.class , - }; + }; } - - /* (non-Javadoc) - * @see eu.etaxonomy.cdm.io.common.IImportConfigurator#getNewState() - */ - public CaryoImportState getNewState() { + @SuppressWarnings("unchecked") + @Override + public CaryoImportState getNewState() { return new CaryoImportState(this); } - - private CaryoImportConfigurator(Source source, ICdmDataSource destination) { super(source, destination, NomenclaturalCode.ICNAFP, defaultTransformer); } - - public boolean isDoTaxa() { return this.isDoTaxa; } - - public void setDoTaxa(boolean isDoTaxa) { this.isDoTaxa = isDoTaxa; } - } diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoBorhidiExcelImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoBorhidiExcelImport.java index bbdf5ee3..308ec016 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoBorhidiExcelImport.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoBorhidiExcelImport.java @@ -46,7 +46,6 @@ import eu.etaxonomy.cdm.strategy.parser.TimePeriodParser; /** * @author a.mueller * @since 16.06.2016 - * */ @Component public class MexicoBorhidiExcelImport @@ -60,7 +59,6 @@ public class MexicoBorhidiExcelImport state) { String line = state.getCurrentLine() + ": "; @@ -84,7 +82,6 @@ public class MexicoBorhidiExcelImport state) { if (rubiaceaeNode == null){ MexicoBorhidiImportConfigurator config = state.getConfig(); @@ -110,11 +105,6 @@ public class MexicoBorhidiExcelImport record, SimpleExcelTaxonImportState state) { String line = state.getCurrentLine() + ": "; @@ -255,10 +245,6 @@ public class MexicoBorhidiExcelImport state, IBotanicalName name) { String newExtensionStr = name.getFullTitleCache() + " - BORHIDI"; UUID uuidNomRefExtension = MexicoConabioTransformer.uuidNomRefExtension; @@ -286,6 +268,4 @@ public class MexicoBorhidiExcelImport(this); } + @SuppressWarnings("unchecked") @Override protected void makeIoClassList() { ioClassList = new Class[]{ @@ -57,21 +51,10 @@ public class MexicoBorhidiImportConfigurator extends ExcelImportConfiguratorBase }; } - - /** - * @return the secReference - */ public Reference getSecReference() { return secReference; } - - - /** - * @param secReference - */ public void setSecReference(Reference secReference) { this.secReference = secReference; } - -} - +} \ No newline at end of file diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoConabioImportConfigurator.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoConabioImportConfigurator.java index c1bf468f..824fdee1 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoConabioImportConfigurator.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoConabioImportConfigurator.java @@ -20,7 +20,6 @@ import eu.etaxonomy.cdm.model.reference.Reference; /** * @author a.mueller * @since 16.06.2016 - * */ public class MexicoConabioImportConfigurator extends ExcelImportConfiguratorBase{ private static final long serialVersionUID = -2795059530001736347L; @@ -60,59 +59,30 @@ public class MexicoConabioImportConfigurator extends ExcelImportConfiguratorBase }; } - /** - * @return the doTaxa - */ public boolean isDoTaxa() { return doTaxa; } - - /** - * @param doTaxa the doTaxa to set - */ public void setDoTaxa(boolean doTaxa) { this.doTaxa = doTaxa; } - /** - * @return the doDistributions - */ public boolean isDoDistributions() { return doDistributions; } - - /** - * @param doDistributions the doDistributions to set - */ public void setDoDistributions(boolean doDistributions) { this.doDistributions = doDistributions; } - /** - * @return the doCommonNames - */ public boolean isDoCommonNames() { return doCommonNames; } - - /** - * @param doCommonNames the doCommonNames to set - */ public void setDoCommonNames(boolean doCommonNames) { this.doCommonNames = doCommonNames; } - /** - * @return the secReference - */ public Reference getSecReference() { return secReference; } - - - /** - * @param secReference - */ public void setSecReference(Reference secReference) { this.secReference = secReference; } -- 2.34.1