cleanup

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelReferenceImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelReferenceImport.java
index 1e4ec0f497096d8dfe32593b231a6355eed3cc5b..b832d3deb52662cc7cd80260f2a0269a571c6225 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelReferenceImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelReferenceImport.java
@@ -6,7 +6,6 @@
 * 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.
 */
-
 package eu.etaxonomy.cdm.io.berlinModel.in;
 
 import static eu.etaxonomy.cdm.io.berlinModel.BerlinModelTransformer.REF_ARTICLE;
@@ -93,7 +92,6 @@ public class BerlinModelReferenceImport extends BerlinModelImportBase {
        public static final String REFERENCE_NAMESPACE = "Reference";
        private static final String REF_AUTHOR_NAMESPACE = "Reference.refAuthorString";
 
-
        public static final UUID REF_DEPOSITED_AT_UUID = UUID.fromString("23ca88c7-ce73-41b2-8ca3-2cb22f013beb");
        public static final UUID REF_SOURCE_UUID = UUID.fromString("d6432582-2216-4b08-b0db-76f6c1013141");
        public static final UUID DATE_STRING_UUID = UUID.fromString("e4130eae-606e-4b0c-be4f-e93dc161be7d");
@@ -103,7 +101,6 @@ public class BerlinModelReferenceImport extends BerlinModelImportBase {
        private static final String pluralString = "references";
        private static final String dbTableName = "reference";
 
-
        public BerlinModelReferenceImport(){
                super(dbTableName, pluralString);
        }
@@ -153,7 +150,6 @@ public class BerlinModelReferenceImport extends BerlinModelImportBase {
         ,new CdmStringMapper("refAuthorString", "refAuthorString"),
        };
 
-
        protected static String[] operationalAttributes = new String[]{
                "refId", "refCache", "nomRefCache", "preliminaryFlag", "inRefFk", "title", "nomTitleAbbrev",
                "refAuthorString", "nomAuthorTeamFk",
@@ -171,8 +167,6 @@ public class BerlinModelReferenceImport extends BerlinModelImportBase {
        //TODO isPaper
        //
 
-
-
        //type to count the references nomReferences that have been created and saved
        private class RefCounter{
                RefCounter() {refCount = 0;}
@@ -256,7 +250,7 @@ public class BerlinModelReferenceImport extends BerlinModelImportBase {
                } catch (SQLException e) {
                        logger.error("SQLException:" +  e);
                        state.setUnsuccessfull();
-                       return;
+               return;
                }
                logger.info("end make " + getPluralString() + " ... " + getSuccessString(success));
                if (! success){
@@ -265,7 +259,6 @@ public class BerlinModelReferenceImport extends BerlinModelImportBase {
                return;
        }
 
-
     @Override
        public boolean doPartition(@SuppressWarnings("rawtypes") ResultSetPartitioner partitioner, BerlinModelImportState state) {
         state.getDeduplicationHelper().restartSession();

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonNameImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonNameImport.java
index 3b7451d951cc083f3eb00d3a578cbacc0344722a..2a938e5a2633a4c669fb104a66a1f74301b8c1b1 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonNameImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonNameImport.java
@@ -160,11 +160,6 @@ public class BerlinModelTaxonNameImport extends BerlinModelImportBase {
             wrap.add(ref, detail);\r
            }\r
 \r
-\r
-        /**\r
-         * @param nomRef\r
-         * @return\r
-         */\r
         public Set<ReferenceCandidate> getCandidates(Reference exemplar) {\r
             String hash = refHash(exemplar);\r
             ReferenceMapping.ReferenceWrapper wrap = abbrevMapping.get(hash);\r
@@ -1209,20 +1204,10 @@ public class BerlinModelTaxonNameImport extends BerlinModelImportBase {
 //        return i;\r
 //    }\r
 \r
-    /**\r
-     * @param fullNomRefCache\r
-     * @param taxonName\r
-     * @return\r
-     */\r
     private String unparsedAndName(String fullNomRefCache, TaxonName taxonName) {\r
         return fullNomRefCache +" | " + taxonName.getFullTitleCache();\r
     }\r
 \r
-\r
-    /**\r
-     * @param noMatch\r
-     * @param fullTitleCache\r
-     */\r
     private void printResult(MatchType type, String text) {\r
         List<String> list = matchResults.get(type);\r
         if (list == null){\r

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/bogota/BogotaSpecimenImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/bogota/BogotaSpecimenImport.java
index 2784bd3b17dfdcc520918720d0b84e58b4b246e1..525aafb7f08773088d17ece8a8ddef2b5c342f63 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/bogota/BogotaSpecimenImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/bogota/BogotaSpecimenImport.java
@@ -425,14 +425,6 @@ public class BogotaSpecimenImport<CONFIG extends BogotaSpecimenImportConfigurato
         }
     }
 
-
-    /**
-     * @param facade
-     * @param state
-     * @param line
-     * @param record
-     * @param voucherId
-     */
     private void makeLocationFields(DerivedUnitFacade facade, SimpleExcelSpecimenImportState<CONFIG> state, String line,
             Map<String, String> record) {
         //Altitude
@@ -498,14 +490,6 @@ public class BogotaSpecimenImport<CONFIG extends BogotaSpecimenImportConfigurato
         }
     }
 
-
-    /**
-     * @param strAltitudeFrom
-     * @param strAltitudeTo
-     * @param state
-     * @param line
-     * @param colAltitudeTo
-     */
     private void checkNoToIfNoFrom(String strFrom, String strTo,
             SimpleExcelSpecimenImportState<CONFIG> state,
             String line, String toAttributeName) {
@@ -519,12 +503,6 @@ public class BogotaSpecimenImport<CONFIG extends BogotaSpecimenImportConfigurato
 
     private ReferenceSystem defaultGeocodeMethod;
 
-    /**
-     * @param state
-     * @param record
-     * @param line
-     * @return
-     */
     private ReferenceSystem makeReferenceSystem(SimpleExcelSpecimenImportState<CONFIG> state,
             Map<String, String> record, String line) {
         String defaultStrRefSys = "Wieczorek, J., Guo, Q., & Hijmans, R. (2004). The point-radius method for georeferencing locality descriptions and calculating associated uncertainty. International journal of geographical information science, 18(8), 745-767.; Escobar D, Díaz SR, Jojoa LM, Rudas E, Albarracín RD, Ramírez C, Gómez JY, López CR, Saavedra J (2015). Georreferenciación de localidades: Una guía de referencia para colecciones biológicas. Instituto de Investigación de Recursos Biológicos Alexander von Humboldt – Instituto de Ciencias Naturales, Universidad Nacional de Colombia. Bogotá D.C., Colombia. 95 p.";
@@ -547,11 +525,6 @@ public class BogotaSpecimenImport<CONFIG extends BogotaSpecimenImportConfigurato
     }
 
     private NamedArea bogota;
-    /**
-     * @param state
-     * @param line
-     * @return
-     */
     private NamedArea makeBogota(SimpleExcelSpecimenImportState<CONFIG> state, String line) {
         if (bogota != null){
             return bogota;
@@ -565,13 +538,6 @@ public class BogotaSpecimenImport<CONFIG extends BogotaSpecimenImportConfigurato
         }
     }
 
-
-    /**
-     * @param facade
-     * @param state
-     * @param line
-     * @param record
-     */
     private void makeCollectorFields(DerivedUnitFacade facade, SimpleExcelSpecimenImportState<CONFIG> state, String line,
             Map<String, String> record) {
 
@@ -629,11 +595,6 @@ public class BogotaSpecimenImport<CONFIG extends BogotaSpecimenImportConfigurato
         facade.setCollector(collector);
     }
 
-
-    /**
-     * @param string
-     * @return
-     */
     private String unknownToNull(String string) {
         if (string == null || string.equalsIgnoreCase("unknown")){
             return null;
@@ -656,14 +617,6 @@ public class BogotaSpecimenImport<CONFIG extends BogotaSpecimenImportConfigurato
         return anonymous;
     }
 
-
-    /**
-     * @param facade
-     * @param state
-     * @param line
-     * @param record
-     * @param taxonBase
-     */
     private void makeDetermination(DerivedUnit specimen, SimpleExcelSpecimenImportState<CONFIG> state, String line,
             Map<String, String> record, TaxonName taxonName) {
 
@@ -693,13 +646,6 @@ public class BogotaSpecimenImport<CONFIG extends BogotaSpecimenImportConfigurato
         }
     }
 
-
-    /**
-     * @param state
-     * @param record
-     * @param line
-     * @return
-     */
     private TeamOrPersonBase<?> makeDeterminer(SimpleExcelSpecimenImportState<CONFIG> state,
             Map<String, String> record, String line) {
         String identifier = record.get(COL_IDENTIFIER);
@@ -733,13 +679,6 @@ public class BogotaSpecimenImport<CONFIG extends BogotaSpecimenImportConfigurato
         }
     }
 
-
-    /**
-     * @param state
-     * @param record
-     * @param line
-     * @return
-     */
     private TimePeriod makeIdentificationDate(SimpleExcelSpecimenImportState<CONFIG> state,
             Map<String, String> record, String line) {
         String strDate = record.get(COL_IDENTIFICATION_DATE);
@@ -758,13 +697,6 @@ public class BogotaSpecimenImport<CONFIG extends BogotaSpecimenImportConfigurato
         return TimePeriod.NewInstance(start);
     }
 
-
-    /**
-     * @param state
-     * @param record
-     * @param line
-     * @return
-     */
     private DefinedTerm makeDeterminationQualifier(SimpleExcelSpecimenImportState<CONFIG> state,
             Map<String, String> record, String line) {
         String qualifier = record.get(COL_IDENTIFICATION_QUALIFIER);
@@ -791,11 +723,6 @@ public class BogotaSpecimenImport<CONFIG extends BogotaSpecimenImportConfigurato
         }
     }
 
-
-    /**
-     * @param taxonBase
-     * @return
-     */
     private Taxon getTaxon(TaxonBase<?> taxonBase) {
         if (taxonBase.isInstanceOf(Synonym.class)){
             return CdmBase.deproxy(taxonBase, Synonym.class).getAcceptedTaxon();
@@ -804,14 +731,6 @@ public class BogotaSpecimenImport<CONFIG extends BogotaSpecimenImportConfigurato
         }
     }
 
-
-    /**
-     * @param state
-     * @param line
-     * @param record
-     * @param noStr
-     * @return
-     */
     private TaxonBase<?> getTaxonByCdmId(SimpleExcelSpecimenImportState<CONFIG> state, String line,
             Map<String, String> record, String noStr) {
 
@@ -841,10 +760,6 @@ public class BogotaSpecimenImport<CONFIG extends BogotaSpecimenImportConfigurato
         return IdentifiableSource.NewDataImportInstance(getValue(state.getOriginalRecord(), COL_VOUCHER_ID), COL_VOUCHER_ID, getSourceCitation(state));
     }
 
-    /**
-     * @param state
-     * @return
-     */
     protected Reference getSourceCitation(SimpleExcelSpecimenImportState<CONFIG> state) {
         Reference source = state.getConfig().getSourceReference();
         if (source.getId() == 0){
@@ -858,4 +773,4 @@ public class BogotaSpecimenImport<CONFIG extends BogotaSpecimenImportConfigurato
         }
         return source;
     }
-}
+}
\ No newline at end of file