This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit c916becbf93af9ee1c1a78e9e38b3608b2b6bda7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Mar 6 09:27:43 2016 +0100 Ne pas envoyer les caractéristiques vides à la sauvegarde --- .../impl/longline/GearUseFeaturesLonglineUIHandler.java | 13 +++++++++++++ .../table/impl/seine/GearUseFeaturesSeineUIHandler.java | 14 ++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java index f8e0c70..f356733 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java @@ -73,6 +73,7 @@ import java.beans.PropertyChangeListener; import java.io.Serializable; import java.util.Collections; import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Set; @@ -495,6 +496,18 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip @Override protected void doPersist(TripLonglineGearUseDto bean) { + // On ne persiste pas les measurements qui sont vides + for (GearUseFeaturesLonglineDto gearUseFeatures : bean.getGearUseFeaturesLongline()) { + if (!gearUseFeatures.isGearUseFeaturesMeasurementEmpty()) { + Iterator<GearUseFeaturesMeasurementLonglineDto> iterator = gearUseFeatures.getGearUseFeaturesMeasurement().iterator(); + while (iterator.hasNext()) { + GearUseFeaturesMeasurementLonglineDto gearUseFeaturesMeasurement = iterator.next(); + if (gearUseFeaturesMeasurement.isEmpty()) { + iterator.remove(); + } + } + } + } SaveResultDto saveResult = getTripLonglineGearUseService().save(bean); saveResult.toDto(bean); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java index aa1162c..851e552 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java @@ -71,6 +71,7 @@ import java.beans.PropertyChangeListener; import java.io.Serializable; import java.util.Collections; import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Set; @@ -492,6 +493,19 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei @Override protected void doPersist(TripSeineGearUseDto bean) { + // On ne persiste pas les measurements qui sont vides + for (GearUseFeaturesSeineDto gearUseFeatures : bean.getGearUseFeaturesSeine()) { + if (!gearUseFeatures.isGearUseFeaturesMeasurementEmpty()) { + Iterator<GearUseFeaturesMeasurementSeineDto> iterator = gearUseFeatures.getGearUseFeaturesMeasurement().iterator(); + while (iterator.hasNext()) { + GearUseFeaturesMeasurementSeineDto gearUseFeaturesMeasurement = iterator.next(); + if (gearUseFeaturesMeasurement.isEmpty()) { + iterator.remove(); + } + } + } + } + SaveResultDto saveResult = getTripSeineGearUseService().save(bean); saveResult.toDto(bean); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.