cleanup

diff --git a/cdmlib-api/src/main/java/eu/etaxonomy/cdm/api/dto/DerivedUnitDTO.java b/cdmlib-api/src/main/java/eu/etaxonomy/cdm/api/dto/DerivedUnitDTO.java
index 5a79814810a5ef6370d1e05c2a100b769848ebd0..bc071bf3325cea8262e92bae57c02f90f2300b8d 100644 (file)
--- a/cdmlib-api/src/main/java/eu/etaxonomy/cdm/api/dto/DerivedUnitDTO.java
+++ b/cdmlib-api/src/main/java/eu/etaxonomy/cdm/api/dto/DerivedUnitDTO.java
@@ -41,7 +41,7 @@ public class DerivedUnitDTO
     private List<DerivedUnitStatusDto> status;
 
     private String specimenShortTitle;
-    private List<TypedEntityReference<Taxon>> associatedTaxa = new ArrayList<>();;
+    private List<TypedEntityReference<Taxon>> associatedTaxa = new ArrayList<>();
     private URI preferredStableUri;
 
     private DerivationEventDTO derivationEvent;

diff --git a/cdmlib-api/src/main/java/eu/etaxonomy/cdm/api/dto/FieldUnitDTO.java b/cdmlib-api/src/main/java/eu/etaxonomy/cdm/api/dto/FieldUnitDTO.java
index 83f54c70ca235a30dd0f50263a05deb7c7013ac3..19e82fb4dad9eca28234287442188189317522fb 100644 (file)
--- a/cdmlib-api/src/main/java/eu/etaxonomy/cdm/api/dto/FieldUnitDTO.java
+++ b/cdmlib-api/src/main/java/eu/etaxonomy/cdm/api/dto/FieldUnitDTO.java
@@ -160,7 +160,7 @@ public class FieldUnitDTO extends SpecimenOrObservationBaseDTO<FieldUnit> {
      * The latter lists all collections with the number of specimens which are involved in this tree.
      */
     private TreeLabels assembleLablesFromTree(
-            boolean doSummaryLabel, boolean collectionsStatistics) {
+            boolean doSummaryLabel, boolean doCollectionsStatistics) {
 
         final String SEPARATOR_STRING = ", ";
 
@@ -196,7 +196,7 @@ public class FieldUnitDTO extends SpecimenOrObservationBaseDTO<FieldUnit> {
             treeLabels.summaryLabel = summaryLabel;
         }
 
-        if(collectionsStatistics) {
+        if(doCollectionsStatistics) {
             List<String> collectionStats = new ArrayList<>();
             for (CollectionDTO collectionDTO : unitIdenfierLabelsByCollections.keySet()) {
                 int unitCount = unitIdenfierLabelsByCollections.get(collectionDTO).size();
@@ -236,5 +236,4 @@ public class FieldUnitDTO extends SpecimenOrObservationBaseDTO<FieldUnit> {
         String summaryLabel = null;
         String collectionsStatistics = null;
     }
-
 }
\ No newline at end of file

diff --git a/cdmlib-api/src/main/java/eu/etaxonomy/cdm/api/dto/GatheringEventDTO.java b/cdmlib-api/src/main/java/eu/etaxonomy/cdm/api/dto/GatheringEventDTO.java
index 355c6fd9a6c9648dc7f2885bf2fb20360e3dfd13..b448004ced4f1e83b0eacfeff29096f544b946e4 100755 (executable)
--- a/cdmlib-api/src/main/java/eu/etaxonomy/cdm/api/dto/GatheringEventDTO.java
+++ b/cdmlib-api/src/main/java/eu/etaxonomy/cdm/api/dto/GatheringEventDTO.java
@@ -79,6 +79,7 @@ public class GatheringEventDTO implements Serializable{
         this.collectingMethod = collectingMethod;
     }
 
+
     public Integer getAbsoluteElevation() {
         return absoluteElevation;
     }

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/compare/taxon/TaxonComparator.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/compare/taxon/TaxonComparator.java
index 578d07473c967c2ce75f09b43d39e54d9a321e1d..53b7fb92b1b2753e26f10fcc375cc45474117924 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/compare/taxon/TaxonComparator.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/compare/taxon/TaxonComparator.java
@@ -195,9 +195,6 @@ public class TaxonComparator implements Comparator<TaxonBase>, Serializable {
     }
 
     /**
-     *
-     * @param name1
-     * @param name2
      * @param includeNomIlleg
      *    if <code>true</code> and if both names have no date or same date, the only
      *    name having nom. illeg. state is handled as if the name was published later than the name

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/common/TimePeriodPartialFormatter.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/common/TimePeriodPartialFormatter.java
index 4db0cdd86771a6ba795b1564072de9b564d07a75..6b7a44264cd28e5239479bf36cc82e6d19785905 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/common/TimePeriodPartialFormatter.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/common/TimePeriodPartialFormatter.java
@@ -52,5 +52,4 @@ public class TimePeriodPartialFormatter extends DateTimeFormatter{
 
                return result;
        }
-
-}
+}
\ No newline at end of file

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/SingleReadAlignment.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/SingleReadAlignment.java
index 4bee6d613e66d9137d52fc496000e25b1efa4492..83ed1e32eba7e6011945ee59ebb948caabe0236e 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/SingleReadAlignment.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/SingleReadAlignment.java
@@ -41,7 +41,7 @@ import eu.etaxonomy.cdm.model.common.VersionableEntity;
 @XmlRootElement(name = "SingleReadAlignment")\r
 @Entity\r
 @Audited\r
-public class SingleReadAlignment extends VersionableEntity implements Serializable {\r
+public class SingleReadAlignment extends VersionableEntity {\r
        private static final long serialVersionUID = 6141518347067279304L;\r
 \r
        /** @see #getDnaMarker() */\r
@@ -79,10 +79,12 @@ public class SingleReadAlignment extends VersionableEntity implements Serializab
 \r
 \r
        public static class Shift implements Cloneable, Serializable {\r
-               public int position;\r
+        private static final long serialVersionUID = 1520907434703028506L;\r
+\r
+        public int position;\r
                public int shift;\r
 \r
-               public Shift(){};\r
+               public Shift(){}\r
                public Shift(int position, int steps) {\r
                        this.position = position;\r
                        this.shift = steps;\r
@@ -111,7 +113,7 @@ public class SingleReadAlignment extends VersionableEntity implements Serializab
 \r
 // ***************** CONSTRUCTOR *************************/\r
 \r
-       protected SingleReadAlignment(){};\r
+       protected SingleReadAlignment(){}\r
 \r
        private SingleReadAlignment(Sequence consensusAlignment, SingleRead singleRead,\r
                        Shift[] shifts, String editedSequence){\r

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/security/AbstractRequestToken.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/security/AbstractRequestToken.java
index 4d174eeeb445ee9dab2cad38b5ad65feadb72d72..95f42472b4c933497341d08c5edf7a655a0e8e13 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/security/AbstractRequestToken.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/security/AbstractRequestToken.java
@@ -20,9 +20,6 @@ public class AbstractRequestToken {
     protected String token;
     private Date expiryDate;
 
-    /**
-     * 
-     */
     public AbstractRequestToken() {
         super();
     }

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/FieldUnitDtoLoader.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/FieldUnitDtoLoader.java
index 702beec4e67d370124ebc6f0a9a28a437592aecc..58522803cc5640674d3c75ef27e20615f90b4d6f 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/FieldUnitDtoLoader.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/FieldUnitDtoLoader.java
@@ -76,6 +76,7 @@ public class FieldUnitDtoLoader extends SpecimenOrObservationBaseDtoLoader<Field
 
         dto.setFieldNotes(fieldUnit.getFieldNotes());
         dto.setFieldNumber(fieldUnit.getFieldNumber());
+
         if(typeIncludeFilter == null) {
             typeIncludeFilter = EnumSet.allOf(SpecimenOrObservationType.class);
         }
@@ -88,10 +89,12 @@ public class FieldUnitDtoLoader extends SpecimenOrObservationBaseDtoLoader<Field
 
         if (fieldUnit.getGatheringEvent() != null) {
             GatheringEvent gatheringEvent = fieldUnit.getGatheringEvent();
-            // Country
+
+            //country
             NamedArea country = gatheringEvent.getCountry();
             dto.setCountry(country != null ? country.getLabel() : null);
-            // Collection
+
+            //collector/fieldNumber
             AgentBase<?> collector = gatheringEvent.getCollector();
             String fieldNumber = fieldUnit.getFieldNumber();
             String collectionString = "";

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/GatheringEventDtoLoader.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/GatheringEventDtoLoader.java
index e11406c7e50fa6da7a0ee4feaf861fc9cce3cda5..cd4855b2a6d41d9cb95f1d01d9d056e8033bcdb4 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/GatheringEventDtoLoader.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/GatheringEventDtoLoader.java
@@ -76,6 +76,7 @@ public class GatheringEventDtoLoader {
         dto.setDistanceToWaterSurface(gathering.getDistanceToWaterSurface());
         dto.setDistanceToWaterSurfaceMax(gathering.getDistanceToWaterSurfaceMax());
         dto.setDistanceToWaterSurfaceText(gathering.getDistanceToWaterSurfaceText());
+
         //TODO why only start date
         dto.setDate(gathering.getGatheringDate());