cleanup

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/cyprus/CyprusSpecimenActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/cyprus/CyprusSpecimenActivator.java
index d2576adbb1b212d689b59bd47c3e98f51cdbec48..d277005e4810d989c16af8b23aede4561a0fd1f2 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/cyprus/CyprusSpecimenActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/cyprus/CyprusSpecimenActivator.java
@@ -6,7 +6,6 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1\r
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
-\r
 package eu.etaxonomy.cdm.app.cyprus;\r
 \r
 import java.net.URISyntaxException;\r
@@ -27,9 +26,9 @@ import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
 /**\r
  * @author a.mueller\r
  * @since 16.12.2010\r
- * @version 1.0\r
  */\r
 public class CyprusSpecimenActivator {\r
+\r
        @SuppressWarnings("unused")\r
     private static final Logger logger = LogManager.getLogger();\r
 \r

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/CicadActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/CicadActivator.java
index 8c8514dd6dc97bdd7a330f5c32cc9f01311612ec..6c2cefb2157beaa439b765b9525bab42d5cc2a2d 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/CicadActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/CicadActivator.java
@@ -25,7 +25,6 @@ import eu.etaxonomy.cdm.io.sdd.in.SDDImportConfigurator;
 /**\r
  * @author h.fradin\r
  * @since 24.10.2008\r
- * @version 1.0\r
  */\r
 public class CicadActivator {\r
 \r

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/ErythroneuraActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/ErythroneuraActivator.java
index fb7cf93919d69c0f2759e04ab93153af14c85992..2acac0867c8d2f600dee28b74d3127aef94d85c0 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/ErythroneuraActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/ErythroneuraActivator.java
@@ -6,7 +6,6 @@
  * The contents of this file are subject to the Mozilla Public License Version 1.1\r
  * See LICENSE.TXT at the top of this package for the full license terms.\r
  */\r
-\r
 package eu.etaxonomy.cdm.app.sdd;\r
 \r
 import java.net.URISyntaxException;\r
@@ -25,7 +24,6 @@ import eu.etaxonomy.cdm.io.sdd.in.SDDImportConfigurator;
 /**\r
  * @author h.fradin\r
  * @since 24.10.2008\r
- * @version 1.0\r
  */\r
 public class ErythroneuraActivator {\r
 \r

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/cyprus/CyprusExcelImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/cyprus/CyprusExcelImport.java
index 8728f2718faced930d7776ab83f39799207a4db0..093660b3e7ab1e83f7249779f35da3104cc74d53 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/cyprus/CyprusExcelImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/cyprus/CyprusExcelImport.java
@@ -376,7 +376,6 @@ public class CyprusExcelImport
                }
        }
 
-
        private void makeHeterotypicSynonyms(CyprusImportState state, List<String> heterotypicSynonymList, Taxon mainTaxon) {
                for (String heterotypicSynonym: heterotypicSynonymList){
                        if (StringUtils.isNotBlank(heterotypicSynonym)){
@@ -386,7 +385,6 @@ public class CyprusExcelImport
                }
        }
 
-
        private void makeSystematics(String systematicsString, Taxon mainTaxon) {
                //Systematics
                if (StringUtils.isNotBlank(systematicsString)){

diff --git a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaDistributionTaxon.java b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaDistributionTaxon.java
index 6b849ef8277c9a2778242af45e1d4cd56bea7222..4154fe31f92a8031c2e14d6b9cda63c15ad9178f 100644 (file)
--- a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaDistributionTaxon.java
+++ b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaDistributionTaxon.java
@@ -1,12 +1,11 @@
 /**\r
 * Copyright (C) 2009 EDIT\r
-* European Distributed Institute of Taxonomy \r
+* European Distributed Institute of Taxonomy\r
 * http://www.e-taxonomy.eu\r
-* \r
+*\r
 * The contents of this file are subject to the Mozilla Public License Version 1.1\r
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
-\r
 package eu.etaxonomy.cdm.io.pesi.faunaEuropaea;\r
 \r
 import java.util.HashSet;\r
@@ -16,17 +15,13 @@ import java.util.UUID;
 /**\r
  * @author a.babadshanjan\r
  * @since 10.09.2009\r
- * @version 1.0\r
  */\r
 public class FaunaEuropaeaDistributionTaxon {\r
-       \r
+\r
        private UUID taxonUuid;\r
        private int taxonId;\r
-       private Set<FaunaEuropaeaDistribution> distributions;   \r
-       \r
-       /**\r
-        * @param distributions\r
-        */\r
+       private Set<FaunaEuropaeaDistribution> distributions;\r
+\r
        public FaunaEuropaeaDistributionTaxon() {\r
                this.distributions = new HashSet<FaunaEuropaeaDistribution>();\r
        }\r
@@ -37,33 +32,7 @@ public class FaunaEuropaeaDistributionTaxon {
                this();\r
                this.taxonUuid = taxonUuid;\r
        }\r
-//     /**\r
-//      * @return the taxonUuid\r
-//      */\r
-//     public UUID getTaxonUuid() {\r
-//             return taxonUuid;\r
-//     }\r
-//     /**\r
-//      * @param taxonUuid the taxonUuid to set\r
-//      */\r
-//     public void setTaxonUuid(UUID taxonUuid) {\r
-//             this.taxonUuid = taxonUuid;\r
-//     }\r
-//     /**\r
-//      * @return the taxonId\r
-//      */\r
-//     public int getTaxonId() {\r
-//             return taxonId;\r
-//     }\r
-//     /**\r
-//      * @param taxonId the taxonId to set\r
-//      */\r
-//     public void setTaxonId(int taxonId) {\r
-//             this.taxonId = taxonId;\r
-//     }\r
-       /**\r
-        * @return the distributions\r
-        */\r
+\r
        public Set<FaunaEuropaeaDistribution> getDistributions() {\r
                return distributions;\r
        }\r
@@ -73,7 +42,7 @@ public class FaunaEuropaeaDistributionTaxon {
        public void setDistributions(Set<FaunaEuropaeaDistribution> distributions) {\r
                this.distributions = distributions;\r
        }\r
-       \r
+\r
        public void addDistribution(FaunaEuropaeaDistribution fauEuDistribution) {\r
                distributions.add(fauEuDistribution);\r
        }\r

diff --git a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaReference.java b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaReference.java
index 0ceb7ed487ff09752ebf7ca9e5bb00fec517a4a3..1123b508e69093867af8408858d6a14240d6fa73 100644 (file)
--- a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaReference.java
+++ b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaReference.java
@@ -1,8 +1,8 @@
 /**\r
 * Copyright (C) 2009 EDIT\r
-* European Distributed Institute of Taxonomy \r
+* European Distributed Institute of Taxonomy\r
 * http://www.e-taxonomy.eu\r
-* \r
+*\r
 * The contents of this file are subject to the Mozilla Public License Version 1.1\r
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
@@ -11,15 +11,12 @@ package eu.etaxonomy.cdm.io.pesi.faunaEuropaea;
 \r
 import java.util.UUID;\r
 \r
-import eu.etaxonomy.cdm.model.reference.Reference;\r
-\r
 /**\r
  * @author a.babadshanjan\r
  * @since 13.09.2009\r
- * @version 1.0\r
  */\r
 public class FaunaEuropaeaReference {\r
-       \r
+\r
        private UUID taxonUuid;\r
        //private Reference cdmReference;\r
 //     private int taxonId;\r
@@ -29,95 +26,56 @@ public class FaunaEuropaeaReference {
        private String referenceTitle;\r
        private String referenceSource;\r
        private String page;\r
-       \r
-       \r
-       /**\r
-        * @return the page\r
-        */\r
+\r
        public String getPage() {\r
                return page;\r
        }\r
-       /**\r
-        * @param page the page to set\r
-        */\r
        public void setPage(String page) {\r
                this.page = page;\r
        }\r
-       /**\r
-        * @return the taxonUuid\r
-        */\r
+\r
        public UUID getTaxonUuid() {\r
                return taxonUuid;\r
        }\r
-       /**\r
-        * @param taxonUuid the taxonUuid to set\r
-        */\r
        public void setTaxonUuid(UUID taxonUuid) {\r
                this.taxonUuid = taxonUuid;\r
        }\r
-       /**\r
-        * @return the referenceId\r
-        */\r
+\r
        public int getReferenceId() {\r
                return referenceId;\r
        }\r
-       /**\r
-        * @param referenceId the referenceId to set\r
-        */\r
        public void setReferenceId(int referenceId) {\r
                this.referenceId = referenceId;\r
        }\r
-       /**\r
-        * @return the referenceYear\r
-        */\r
+\r
        public String getReferenceYear() {\r
                return referenceYear;\r
        }\r
-       /**\r
-        * @param referenceYear the referenceYear to set\r
-        */\r
        public void setReferenceYear(String referenceYear) {\r
                this.referenceYear = referenceYear;\r
        }\r
-       /**\r
-        * @return the referenceTitle\r
-        */\r
+\r
        public String getReferenceTitle() {\r
                return referenceTitle;\r
        }\r
-       /**\r
-        * @param referenceTitle the referenceTitle to set\r
-        */\r
        public void setReferenceTitle(String referenceTitle) {\r
                this.referenceTitle = referenceTitle;\r
        }\r
-       /**\r
-        * @return the referenceSource\r
-        */\r
+\r
        public String getReferenceSource() {\r
                return referenceSource;\r
        }\r
-       /**\r
-        * @param referenceSource the referenceSource to set\r
-        */\r
        public void setReferenceSource(String referenceSource) {\r
                this.referenceSource = referenceSource;\r
        }\r
-       /**\r
-        * @return the referenceAuthor\r
-        */\r
+\r
        public String getReferenceAuthor() {\r
                return referenceAuthor;\r
        }\r
-       /**\r
-        * @param referenceAuthor the referenceAuthor to set\r
-        */\r
        public void setReferenceAuthor(String referenceAuthor) {\r
                this.referenceAuthor = referenceAuthor;\r
        }\r
-       /**\r
-        * @return the cdmReference\r
-        */\r
+\r
        /*public Reference getCdmReference() {\r
                return cdmReference;\r
        }*/\r
@@ -127,5 +85,4 @@ public class FaunaEuropaeaReference {
        /*public void setCdmReference(Reference cdmReference) {\r
                this.cdmReference = cdmReference;\r
        }*/\r
-\r
-}\r
+}
\ No newline at end of file

diff --git a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaReferenceTaxon.java b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaReferenceTaxon.java
index b28df404ecc379176e3bf331aafbae79681452c1..b949048aa5052649fecfe62695e7cd2b4c5b8a83 100644 (file)
--- a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaReferenceTaxon.java
+++ b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaReferenceTaxon.java
@@ -1,8 +1,8 @@
 /**\r
 * Copyright (C) 2009 EDIT\r
-* European Distributed Institute of Taxonomy \r
+* European Distributed Institute of Taxonomy\r
 * http://www.e-taxonomy.eu\r
-* \r
+*\r
 * The contents of this file are subject to the Mozilla Public License Version 1.1\r
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
@@ -16,14 +16,13 @@ import java.util.UUID;
 /**\r
  * @author a.babadshanjan\r
  * @since 13.09.2009\r
- * @version 1.0\r
  */\r
 public class FaunaEuropaeaReferenceTaxon {\r
-       \r
+\r
        private UUID taxonUuid;\r
        private int taxonId;\r
-       private Set<FaunaEuropaeaReference> references; \r
-       \r
+       private Set<FaunaEuropaeaReference> references;\r
+\r
        /**\r
         * @param references\r
         */\r
@@ -37,48 +36,33 @@ public class FaunaEuropaeaReferenceTaxon {
                this();\r
                this.taxonUuid = taxonUuid;\r
        }\r
-       \r
-       /**\r
-        * @param taxonUuid\r
-        */\r
+\r
+\r
        public FaunaEuropaeaReferenceTaxon(Integer taxonId) {\r
                this();\r
                this.taxonId = taxonId;\r
        }\r
-       \r
-       /**\r
-        * @return the taxonUuid\r
-        */\r
+\r
+\r
        public UUID getTaxonUuid() {\r
                return taxonUuid;\r
        }\r
-       /**\r
-        * @param taxonUuid the taxonUuid to set\r
-        */\r
        public void setTaxonUuid(UUID taxonUuid) {\r
                this.taxonUuid = taxonUuid;\r
        }\r
-       /**\r
-        * @param taxonUuid the taxonId to set\r
-        */\r
+\r
        public void setTaxonId(Integer taxonId) {\r
                this.taxonId = taxonId;\r
        }\r
-       \r
-       /**\r
-        * @return the distributions\r
-        */\r
+\r
        public Set<FaunaEuropaeaReference> getReferences() {\r
                return references;\r
        }\r
-       /**\r
-        * @param distributions the distributions to set\r
-        */\r
        public void setReferences(Set<FaunaEuropaeaReference> references) {\r
                this.references = references;\r
        }\r
-       \r
+\r
        public void addReference(FaunaEuropaeaReference fauEuReference) {\r
                references.add(fauEuReference);\r
        }\r
-}\r
+}
\ No newline at end of file

diff --git a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaTaxon.java b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaTaxon.java
index 03e3c166c4388924822d4584994d0579ae77049b..6e97b7fdb3cb18b9670d19b1e0c15a66de5f8ac5 100644 (file)
--- a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaTaxon.java
+++ b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaTaxon.java
@@ -1,12 +1,11 @@
 /**\r
 * Copyright (C) 2009 EDIT\r
-* European Distributed Institute of Taxonomy \r
+* European Distributed Institute of Taxonomy\r
 * http://www.e-taxonomy.eu\r
-* \r
+*\r
 * The contents of this file are subject to the Mozilla Public License Version 1.1\r
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
-\r
 package eu.etaxonomy.cdm.io.pesi.faunaEuropaea;\r
 \r
 import java.util.UUID;\r
@@ -14,10 +13,9 @@ import java.util.UUID;
 /**\r
  * @author a.babadshanjan\r
  * @since 26.05.2009\r
- * @version 1.0\r
  */\r
 public class FaunaEuropaeaTaxon {\r
-       \r
+\r
        private UUID uuid;\r
        private UUID parentUuid;\r
        private int id;\r
@@ -46,7 +44,7 @@ public class FaunaEuropaeaTaxon {
        private boolean valid = false;\r
 //     private int authorId;\r
 //     private UUID nameUuid;\r
-       \r
+\r
        /**\r
         * @return the authorName\r
         */\r
@@ -83,16 +81,16 @@ public class FaunaEuropaeaTaxon {
                this.originalGenusName = "";\r
                this.authorName = "";\r
        }\r
-       \r
+\r
 //     public FaunaEuropaeaTaxon(String name, int parentId) {\r
 //             this(name, parentId, null);\r
 //     }\r
-       \r
+\r
 //     public FaunaEuropaeaTaxon(String scientificName, int parentId, String reference) {\r
 //             this.parentId = parentId;\r
 //             this.localName = scientificName;\r
 //     }\r
-       \r
+\r
        /**\r
         * @return the greatGreatGrandParentRankId\r
         */\r
@@ -149,7 +147,7 @@ public class FaunaEuropaeaTaxon {
        public void setParentId(int parentId) {\r
                this.parentId = parentId;\r
        }\r
-       \r
+\r
        /**\r
         * @return the name\r
         */\r