branch develop updated (4124cf3 -> c916bec)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 4124cf3 Migration des feuilles de style (la nouvelle xtension est jcss new fb1be51 Ajout d'une méthode pour savoir si une caractéristique d'un équipement est nulle new 84e0a11 Nettoyage code new c916bec Ne pas envoyer les caractéristiques vides à la sauvegarde The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: 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 commit 84e0a115b049e17967e03af21d1a053337271c90 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Mar 6 09:25:50 2016 +0100 Nettoyage code commit fb1be5154606799465606ede09c0e4e064b04274 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Mar 6 09:25:34 2016 +0100 Ajout d'une méthode pour savoir si une caractéristique d'un équipement est nulle Summary of changes: .../impl/longline/GearUseFeaturesLonglineUIHandler.java | 13 +++++++++++++ .../table/impl/seine/GearUseFeaturesSeineUIHandler.java | 14 ++++++++++++++ .../longline/GearUseFeaturesMeasurementLonglineDto.java | 11 +++++++++++ .../dto/seine/GearUseFeaturesMeasurementSeineDto.java | 11 +++++++++++ .../service/longline/TripLonglineGearUseServiceTopia.java | 11 ++--------- 5 files changed, 51 insertions(+), 9 deletions(-) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/GearUseFeaturesMeasurementLonglineDto.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/GearUseFeaturesMeasurementSeineDto.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 fb1be5154606799465606ede09c0e4e064b04274 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Mar 6 09:25:34 2016 +0100 Ajout d'une méthode pour savoir si une caractéristique d'un équipement est nulle --- .../dto/longline/GearUseFeaturesMeasurementLonglineDto.java | 11 +++++++++++ .../dto/seine/GearUseFeaturesMeasurementSeineDto.java | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/GearUseFeaturesMeasurementLonglineDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/GearUseFeaturesMeasurementLonglineDto.java new file mode 100644 index 0000000..6a23b14 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/GearUseFeaturesMeasurementLonglineDto.java @@ -0,0 +1,11 @@ +package fr.ird.observe.services.dto.longline; + +public class GearUseFeaturesMeasurementLonglineDto extends AbstractGearUseFeaturesMeasurementLonglineDto { + + private static final long serialVersionUID = 4121465684829026103L; + + public boolean isEmpty() { + return gearCaracteristic == null && measurementValue == null; + } + +} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/GearUseFeaturesMeasurementSeineDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/GearUseFeaturesMeasurementSeineDto.java new file mode 100644 index 0000000..d68d288 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/GearUseFeaturesMeasurementSeineDto.java @@ -0,0 +1,11 @@ +package fr.ird.observe.services.dto.seine; + +public class GearUseFeaturesMeasurementSeineDto extends AbstractGearUseFeaturesMeasurementSeineDto { + + private static final long serialVersionUID = 3690474929450804018L; + + public boolean isEmpty() { + return gearCaracteristic == null && measurementValue == null; + } + +} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 84e0a115b049e17967e03af21d1a053337271c90 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Mar 6 09:25:50 2016 +0100 Nettoyage code --- .../service/longline/TripLonglineGearUseServiceTopia.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseServiceTopia.java index 80ad894..257d127 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseServiceTopia.java @@ -72,10 +72,6 @@ public class TripLonglineGearUseServiceTopia extends ObserveServiceTopia impleme return saveEntity(entity); - //FIXME Quel est le lien avec les mises en oeuvre d'un engin, ne serait-ce qu'un jolie copier-coller -// TripLonglineTopiaDao dao = getTopiaPersistenceContext().getTripLonglineDao(); -// dao.updateEndDate(entity); - } protected SaveResultDto saveEntity(TripLongline entity) { @@ -83,11 +79,6 @@ public class TripLonglineGearUseServiceTopia extends ObserveServiceTopia impleme Date lastUpdateDate = saveResultDto.getLastUpdateDate(); // propagate lastUpdateDate to every gear uses - setLastUpdateDate(entity, lastUpdateDate); - return saveResultDto; - } - - protected void setLastUpdateDate(TripLongline entity, Date lastUpdateDate) { Set<GearUseFeaturesLongline> gearUseFeaturesLonglines = entity.getGearUseFeaturesLongline(); for (GearUseFeaturesLongline gearUseFeaturesLongline : gearUseFeaturesLonglines) { gearUseFeaturesLongline.setLastUpdateDate(lastUpdateDate); @@ -95,5 +86,7 @@ public class TripLonglineGearUseServiceTopia extends ObserveServiceTopia impleme gearUseFeaturesMeasurementLongline.setLastUpdateDate(lastUpdateDate); } } + return saveResultDto; } + } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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>.
participants (1)
-
codelutin.com scm