cleanup

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/globis/GlobisImportBase.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/globis/GlobisImportBase.java
index b8ac6ec2042201d7ceda59350e5ea869f2421b60..75256a6d7e3a40b24896ce0c6a8470b033694df9 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/globis/GlobisImportBase.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/globis/GlobisImportBase.java
@@ -31,7 +31,6 @@ import eu.etaxonomy.cdm.io.common.ResultSetPartitioner;
 import eu.etaxonomy.cdm.io.common.Source;\r
 import eu.etaxonomy.cdm.io.common.mapping.DbImportMapping;\r
 import eu.etaxonomy.cdm.io.common.mapping.UndefinedTransformerMethodException;\r
-import eu.etaxonomy.cdm.model.agent.INomenclaturalAuthor;\r
 import eu.etaxonomy.cdm.model.agent.Person;\r
 import eu.etaxonomy.cdm.model.agent.Team;\r
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;\r
@@ -168,8 +167,8 @@ public abstract class GlobisImportBase<CDM_BASE extends CdmBase> extends CdmImpo
                zooName.setExBasionymAuthorship(getExistingAuthor(zooName.getExBasionymAuthorship(), state));\r
        }\r
 \r
-       private TeamOrPersonBase<?> getExistingAuthor(INomenclaturalAuthor nomAuthor, GlobisImportState state) {\r
-               TeamOrPersonBase<?> author = (TeamOrPersonBase<?>)nomAuthor;\r
+       private TeamOrPersonBase<?> getExistingAuthor(TeamOrPersonBase<?> nomAuthor, GlobisImportState state) {\r
+               TeamOrPersonBase<?> author = nomAuthor;\r
                if (author == null){\r
                        return null;\r
                }\r

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoConabioCommonNamesImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoConabioCommonNamesImport.java
index 2c2196075572587bf83688b0913bf4f35fa169eb..011abb7485ab27b5b7684ecad902ad16c1ec4597 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoConabioCommonNamesImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoConabioCommonNamesImport.java
@@ -8,7 +8,6 @@
 */
 package eu.etaxonomy.cdm.io.mexico;
 
-import eu.etaxonomy.cdm.common.URI;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
@@ -18,6 +17,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 
+import eu.etaxonomy.cdm.common.URI;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.description.CommonTaxonName;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
@@ -31,7 +31,6 @@ import eu.etaxonomy.cdm.model.term.TermVocabulary;
 /**
  * @author a.mueller
  * @since 16.06.2016
- *
  */
 @Component
 public class MexicoConabioCommonNamesImport<CONFIG extends MexicoConabioImportConfigurator>
@@ -46,7 +45,6 @@ public class MexicoConabioCommonNamesImport<CONFIG extends MexicoConabioImportCo
 
     private Map<String, Taxon> taxonIdMap;
 
-
     @Override
     protected String getWorksheetName(CONFIG config) {
         return "NombresComunes";
@@ -85,7 +83,6 @@ public class MexicoConabioCommonNamesImport<CONFIG extends MexicoConabioImportCo
                         null, null, ref, null);
             }
 
-
             getTaxonService().save(taxon);
         }
     }
@@ -138,9 +135,7 @@ public class MexicoConabioCommonNamesImport<CONFIG extends MexicoConabioImportCo
         }
     }
 
-    /**
-     * @param state
-     */
+
     @SuppressWarnings("unchecked")
     private void initLanguageVocabulary(SimpleExcelTaxonImportState<CONFIG> state) {
         if (languagesVoc == null){
@@ -217,10 +212,6 @@ public class MexicoConabioCommonNamesImport<CONFIG extends MexicoConabioImportCo
         return ref;
     }
 
-    /**
-     * @param taxon
-     * @return
-     */
     private TaxonDescription getTaxonDescription(Taxon taxon) {
         if (!taxon.getDescriptions().isEmpty()){
             return taxon.getDescriptions().iterator().next();

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoConabioDistributionImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoConabioDistributionImport.java
index 5cd5d3bcf33feaa4f70cdef24d882720abe6d45f..452a7668ef49fadbfd7a16e09fcb599fc06ac0b7 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoConabioDistributionImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoConabioDistributionImport.java
@@ -8,7 +8,6 @@
 */
 package eu.etaxonomy.cdm.io.mexico;
 
-import eu.etaxonomy.cdm.common.URI;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
@@ -17,6 +16,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 
+import eu.etaxonomy.cdm.common.URI;
 import eu.etaxonomy.cdm.ext.geo.GeoServiceArea;
 import eu.etaxonomy.cdm.ext.geo.GeoServiceAreaAnnotatedMapping;
 import eu.etaxonomy.cdm.io.common.mapping.UndefinedTransformerMethodException;
@@ -39,7 +39,6 @@ import eu.etaxonomy.cdm.model.term.TermType;
 /**
  * @author a.mueller
  * @since 16.06.2016
- *
  */
 @Component
 public class MexicoConabioDistributionImport<CONFIG extends MexicoConabioImportConfigurator>
@@ -153,11 +152,6 @@ public class MexicoConabioDistributionImport<CONFIG extends MexicoConabioImportC
         return mexico;
     }
 
-    /**
-     * @param state
-     * @param refStr
-     * @return
-     */
     private Reference getReference(SimpleExcelTaxonImportState<CONFIG> state, String refStr) {
         if (StringUtils.isBlank(refStr)){
             return null;
@@ -171,11 +165,6 @@ public class MexicoConabioDistributionImport<CONFIG extends MexicoConabioImportC
         return ref;
     }
 
-    /**
-     * @param desc
-     * @param string
-     * @param uuidUserDefinedAnnotationTypeVocabulary
-     */
     private void handleDistribution(SimpleExcelTaxonImportState<CONFIG> state, TaxonDescription desc, String key,
             UUID uuid, String line) {
         Map<String, String> record = state.getOriginalRecord();
@@ -189,10 +178,6 @@ public class MexicoConabioDistributionImport<CONFIG extends MexicoConabioImportC
         }
     }
 
-    /**
-     * @param taxon
-     * @return
-     */
     private TaxonDescription getTaxonDescription(Taxon taxon) {
         if (!taxon.getDescriptions().isEmpty()){
             return taxon.getDescriptions().iterator().next();
@@ -202,9 +187,6 @@ public class MexicoConabioDistributionImport<CONFIG extends MexicoConabioImportC
         }
     }
 
-    /**
-     * @param state
-     */
     @SuppressWarnings("unchecked")
     private void initAreaVocabulary(SimpleExcelTaxonImportState<CONFIG> state) {
         if (stateAreasVoc == null){
@@ -215,10 +197,6 @@ public class MexicoConabioDistributionImport<CONFIG extends MexicoConabioImportC
         }
     }
 
-    /**
-     * @param state
-     * @return
-     */
     @SuppressWarnings("unchecked")
     private void createStateAreasVoc(SimpleExcelTaxonImportState<CONFIG> state) {
         //voc

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 dccd165fd7e99d705402f0889af81b909ad2122e..13cfeb90b26167a35d997957190780c0c15c8532 100644 (file)
--- 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
@@ -9,7 +9,6 @@
 package eu.etaxonomy.cdm.io.mexico;
 
 import eu.etaxonomy.cdm.common.URI;
-
 import eu.etaxonomy.cdm.database.ICdmDataSource;
 import eu.etaxonomy.cdm.io.common.ImportStateBase;
 import eu.etaxonomy.cdm.io.common.mapping.IInputTransformer;
@@ -86,5 +85,4 @@ public class MexicoConabioImportConfigurator extends ExcelImportConfiguratorBase
     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/MexicoConabioTaxonImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoConabioTaxonImport.java
index ccc20609ca7c690125255748435226ca0b441221..45d7d058bf3914e0f6abc56a8c04441c1dd4f01e 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoConabioTaxonImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoConabioTaxonImport.java
@@ -55,7 +55,6 @@ import eu.etaxonomy.cdm.strategy.parser.TimePeriodParser;
 /**
  * @author a.mueller
  * @since 16.06.2016
- *
  */
 @Component
 public class MexicoConabioTaxonImport<CONFIG extends MexicoConabioImportConfigurator>
@@ -199,11 +198,6 @@ public class MexicoConabioTaxonImport<CONFIG extends MexicoConabioImportConfigur
         }
     }
 
-    /**
-     * @param state
-     * @param secRefStr
-     * @return
-     */
     private Reference getSecRef(SimpleExcelTaxonImportState<CONFIG> state, String secRefStr, String line) {
         Reference result = state.getReference(secRefStr);
         if (result == null && secRefStr != null){
@@ -247,12 +241,6 @@ public class MexicoConabioTaxonImport<CONFIG extends MexicoConabioImportConfigur
         return result;
     }
 
-
-
-    /**
-     * @param team
-     * @param author
-     */
     private void addTeamMember(Team team, String author) {
         if (StringUtils.isNotBlank(author)){
             Person person = Person.NewInstance();
@@ -261,13 +249,6 @@ public class MexicoConabioTaxonImport<CONFIG extends MexicoConabioImportConfigur
         }
     }
 
-
-
-    /**
-     * @param record
-     * @param state
-     * @return
-     */
     private IBotanicalName makeName(String line, Map<String, String> record, SimpleExcelTaxonImportState<CONFIG> state) {
 
         String authorStr = getValueNd(record, "AutorSinAnio");
@@ -349,12 +330,6 @@ public class MexicoConabioTaxonImport<CONFIG extends MexicoConabioImportConfigur
         return result;
     }
 
-
-
-    /**
-     * @param name
-     * @param state
-     */
     private void addSourcesToReferences(IBotanicalName name, SimpleExcelTaxonImportState<CONFIG> state) {
         Reference nomRef = name.getNomenclaturalReference();
         if (nomRef != null){
@@ -365,12 +340,6 @@ public class MexicoConabioTaxonImport<CONFIG extends MexicoConabioImportConfigur
         }
     }
 
-
-
-    /**
-     * @param referencedName
-     * @param refType
-     */
     private void adaptRefTypeForGeneric(IBotanicalName referencedName, String refTypeStr) {
         INomenclaturalReference ref = referencedName.getNomenclaturalReference();
         if (ref == null){
@@ -382,7 +351,6 @@ public class MexicoConabioTaxonImport<CONFIG extends MexicoConabioImportConfigur
         }
     }
 
-
     private ReferenceType refTypeByRefTypeStr(String refType){
         if ("A".equals(refType)){  //Article
             return ReferenceType.Article;
@@ -395,12 +363,6 @@ public class MexicoConabioTaxonImport<CONFIG extends MexicoConabioImportConfigur
         }
     }
 
-    /**
-     * @param nomRefStr
-     * @param refType
-     * @param fullNameStr
-     * @return
-     */
     private String getRefNameStr(String nomRefStr, String refTypeStr, String fullNameStr) {
         String refNameStr = fullNameStr;
         ReferenceType refType = refTypeByRefTypeStr(refTypeStr);
@@ -416,11 +378,6 @@ public class MexicoConabioTaxonImport<CONFIG extends MexicoConabioImportConfigur
         return refNameStr;
     }
 
-    /**
-     * @param state
-     * @param equal
-     * @param referencedName
-     */
     private void addNomRefExtension(SimpleExcelTaxonImportState<CONFIG> state, IBotanicalName name, Boolean equal) {
         String equalStr = equal == null ? "" : equal == true ? "EQUAL\n" : "NOT EQUAL\n";
         name.setFullTitleCache(null, false);
@@ -439,20 +396,11 @@ public class MexicoConabioTaxonImport<CONFIG extends MexicoConabioImportConfigur
     }
 
     boolean nameMapIsInitialized = false;
-    /**
-     * @param state
-     * @param fullName
-     * @return
-     */
     private IBotanicalName getExistingName(SimpleExcelTaxonImportState<CONFIG> state, IBotanicalName fullName) {
         initExistinNames(state);
         return (IBotanicalName)state.getName(fullName.getTitleCache());
     }
 
-    /**
-     * @param state
-     */
-    @SuppressWarnings("rawtypes")
     private void initExistinNames(SimpleExcelTaxonImportState<CONFIG> state) {
         if (!nameMapIsInitialized){
             List<String> propertyPaths = Arrays.asList("");
@@ -464,12 +412,9 @@ public class MexicoConabioTaxonImport<CONFIG extends MexicoConabioImportConfigur
         }
     }
 
-
-
     /**
-     * @param record
-     * @param string
-     * @return
+     * Same as {@link #getValue(eu.etaxonomy.cdm.io.excel.common.ExcelImportState, String)}
+     * but "ND" return null.
      */
     private String getValueNd(Map<String, String> record, String string) {
         String value = getValue(record, string);
@@ -480,7 +425,6 @@ public class MexicoConabioTaxonImport<CONFIG extends MexicoConabioImportConfigur
         }
     }
 
-
     @Override
     protected void secondPass(SimpleExcelTaxonImportState<CONFIG> state) {
 //        IdCAT_AscendenteInmediato, IdCATRel, TipoRelacion
@@ -522,10 +466,6 @@ public class MexicoConabioTaxonImport<CONFIG extends MexicoConabioImportConfigur
         }
     }
 
-     /**
-     * @param line
-     * @param name
-     */
     private void makeConceptRelation(String line, TaxonName name) {
         if (name.getTaxonBases().size()==2){
             Iterator<TaxonBase> it = name.getTaxonBases().iterator();
@@ -544,13 +484,8 @@ public class MexicoConabioTaxonImport<CONFIG extends MexicoConabioImportConfigur
         }else if (name.getTaxonBases().size()>2){
             logger.warn(line + "Names with more than 2 taxa not yet handled");
         }
-
     }
 
-    /**
-     * @param next
-     * @return
-     */
     private Taxon getAccepted(TaxonBase<?> taxonBase) {
         if (taxonBase.isInstanceOf(Taxon.class)){
             return CdmBase.deproxy(taxonBase, Taxon.class);
@@ -574,9 +509,8 @@ public class MexicoConabioTaxonImport<CONFIG extends MexicoConabioImportConfigur
         return classification;
     }
 
-
     @Override
     protected boolean isIgnore(SimpleExcelTaxonImportState<CONFIG> state) {
         return ! state.getConfig().isDoTaxa();
     }
-}
+}
\ No newline at end of file

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoConabioTransformer.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoConabioTransformer.java
index d8b66aeefeaed5ec00f547af385d12b0d27ecb72..369156dfe9e527ab76a49de8e3abd5647a4279ba 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoConabioTransformer.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoConabioTransformer.java
@@ -21,7 +21,6 @@ import eu.etaxonomy.cdm.model.name.Rank;
 /**
  * @author a.mueller
  * @since 16.06.2016
- *
  */
 public class MexicoConabioTransformer extends InputTransformerBase{
 
@@ -76,7 +75,6 @@ public class MexicoConabioTransformer extends InputTransformerBase{
     public static final UUID uuidYucatan = UUID.fromString("5dd5d5fa-77f0-42f6-a45c-384130e5f16d");
     public static final UUID uuidZacatecas = UUID.fromString("0e9bc1f2-0154-4424-85c7-1bfc8cf3696c");
 
-
     public static final UUID uuidMexicanLanguagesVoc = UUID.fromString("d37d043e-94af-4cb0-b702-e6f45318b039");
 
     public static final UUID uuidChontal = UUID.fromString("e2ea70d0-605b-4e21-9848-aefe38ea6abb");
@@ -160,7 +158,6 @@ public class MexicoConabioTransformer extends InputTransformerBase{
         }
     }
 
-
     @Override
     public UUID getPresenceTermUuid(String key) throws UndefinedTransformerMethodException {
         if (StringUtils.isBlank(key)){
@@ -174,7 +171,4 @@ public class MexicoConabioTransformer extends InputTransformerBase{
             return null;
         }
     }
-
-
-
-}
+}
\ No newline at end of file

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/SimpleExcelTaxonImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/SimpleExcelTaxonImport.java
index 49a6fb6fcc7a6e18763ded74f79a69843a7ce071..8ff440d666087b61311bf06df3b550cc0a043287 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/SimpleExcelTaxonImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/SimpleExcelTaxonImport.java
@@ -70,13 +70,6 @@ public abstract class SimpleExcelTaxonImport<CONFIG extends ExcelImportConfigura
         return IdentifiableSource.NewDataImportInstance("line: " + state.getCurrentLine(), null, state.getConfig().getSourceReference());
     }
 
-    /**
-     * @param state
-     * @param speciesName
-     * @param sec
-     * @param taxon
-     * @param familyNode
-     */
     protected void makeGenus(SimpleExcelTaxonImportState<CONFIG> state,
             IBotanicalName speciesName,
             Reference sec,

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/SimpleExcelTaxonImportState.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/SimpleExcelTaxonImportState.java
index 455322fadcbe9c70a0ff4c3ba9e354509d1bc660..283fcbbba6ce7c46005abd68dcc8352b8bf97a36 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/SimpleExcelTaxonImportState.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/SimpleExcelTaxonImportState.java
@@ -25,7 +25,6 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
 /**
  * @author a.mueller
  * @since 16.06.2016
- *
  */
 public class SimpleExcelTaxonImportState<CONFIG extends ExcelImportConfiguratorBase>
         extends ExcelImportState<CONFIG, ExcelRowBase>{
@@ -45,9 +44,7 @@ public class SimpleExcelTaxonImportState<CONFIG extends ExcelImportConfiguratorB
     private final Map<String, Taxon> taxonMap = new HashMap<>();
 
 // ************************* CONSTRUCTUR *******************************/
-    /**
-     * @param config
-     */
+
     public SimpleExcelTaxonImportState(CONFIG config) {
         super(config);
     }
@@ -103,5 +100,4 @@ public class SimpleExcelTaxonImportState<CONFIG extends ExcelImportConfiguratorB
     public boolean containsTaxon(String key) {
         return taxonMap.containsKey(key);
     }
-
-}
+}
\ No newline at end of file

diff --git a/cdm-eflora/src/main/java/eu/etaxonomy/cdm/io/eflora/centralAfrica/ferns/CentralAfricaFernsTaxonRelationImport.java b/cdm-eflora/src/main/java/eu/etaxonomy/cdm/io/eflora/centralAfrica/ferns/CentralAfricaFernsTaxonRelationImport.java
index 1b3d767c2602b7883338d4548cc745599c93a826..b9cfc20f40a4383052cac234ea00da2b7809dcd6 100644 (file)
--- a/cdm-eflora/src/main/java/eu/etaxonomy/cdm/io/eflora/centralAfrica/ferns/CentralAfricaFernsTaxonRelationImport.java
+++ b/cdm-eflora/src/main/java/eu/etaxonomy/cdm/io/eflora/centralAfrica/ferns/CentralAfricaFernsTaxonRelationImport.java
@@ -32,7 +32,7 @@ import eu.etaxonomy.cdm.io.common.mapping.DbImportTaxIncludedInMapper;
 import eu.etaxonomy.cdm.io.common.mapping.IMappingImport;\r
 import eu.etaxonomy.cdm.io.common.mapping.UndefinedTransformerMethodException;\r
 import eu.etaxonomy.cdm.io.eflora.centralAfrica.ferns.validation.CentralAfricaFernsTaxonImportValidator;\r
-import eu.etaxonomy.cdm.model.agent.INomenclaturalAuthor;\r
+import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
 import eu.etaxonomy.cdm.model.description.CommonTaxonName;\r
@@ -1103,7 +1103,7 @@ public class CentralAfricaFernsTaxonRelationImport
         * @param author\r
         * @return\r
         */\r
-       private String getNomTitleNz(INomenclaturalAuthor author) {\r
+       private String getNomTitleNz(TeamOrPersonBase<?> author) {\r
                if (author != null){\r
                        return CdmUtils.Nz(author.getNomenclaturalTitleCache());\r
                }else{\r