branch develop updated (04a0621 -> fb99f0e)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 04a0621 Use eugene 3.0-alpha-6 and use new compact format new f8c2849 Correction de la condition empty, on sauvait des enregistrement avec des valeurs nulles (See #8534) new fb99f0e Clean code The 2 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 fb99f0e5630e2a723a8d0b6d14746a5e57f7cdae Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 10 15:27:16 2016 +0200 Clean code commit f8c28498c4f195c06d792dc4372c21a409d2fb0d Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 10 15:27:12 2016 +0200 Correction de la condition empty, on sauvait des enregistrement avec des valeurs nulles (See #8534) Summary of changes: .../longline/GearUseFeaturesLonglineUIHandler.java | 50 +++++++++++----------- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 47 ++++++++++---------- .../GearUseFeaturesMeasurementLonglineDto.java | 2 +- .../seine/GearUseFeaturesMeasurementSeineDto.java | 2 +- 4 files changed, 50 insertions(+), 51 deletions(-) -- 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 observe. See https://gitlab.nuiton.org/codelutin/observe.git commit f8c28498c4f195c06d792dc4372c21a409d2fb0d Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 10 15:27:12 2016 +0200 Correction de la condition empty, on sauvait des enregistrement avec des valeurs nulles (See #8534) --- .../services/dto/longline/GearUseFeaturesMeasurementLonglineDto.java | 2 +- .../observe/services/dto/seine/GearUseFeaturesMeasurementSeineDto.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/longline/GearUseFeaturesMeasurementLonglineDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/longline/GearUseFeaturesMeasurementLonglineDto.java index 256b8e1..f89d1f2 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/longline/GearUseFeaturesMeasurementLonglineDto.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/longline/GearUseFeaturesMeasurementLonglineDto.java @@ -27,7 +27,7 @@ public class GearUseFeaturesMeasurementLonglineDto extends AbstractGearUseFeatur private static final long serialVersionUID = 4121465684829026103L; public boolean isEmpty() { - return gearCaracteristic == null && measurementValue == null; + return gearCaracteristic == null || measurementValue == null; } } diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/seine/GearUseFeaturesMeasurementSeineDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/GearUseFeaturesMeasurementSeineDto.java index 345ed80..f71118a 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/seine/GearUseFeaturesMeasurementSeineDto.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/GearUseFeaturesMeasurementSeineDto.java @@ -27,7 +27,7 @@ public class GearUseFeaturesMeasurementSeineDto extends AbstractGearUseFeaturesM private static final long serialVersionUID = 3690474929450804018L; public boolean isEmpty() { - return gearCaracteristic == null && measurementValue == null; + 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 observe. See https://gitlab.nuiton.org/codelutin/observe.git commit fb99f0e5630e2a723a8d0b6d14746a5e57f7cdae Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 10 15:27:16 2016 +0200 Clean code --- .../longline/GearUseFeaturesLonglineUIHandler.java | 50 +++++++++++----------- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 47 ++++++++++---------- 2 files changed, 48 insertions(+), 49 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java index 1d47d88..b2a2540 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java @@ -22,12 +22,18 @@ package fr.ird.observe.application.swing.ui.content.table.impl.longline; * #L% */ -import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; -import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; import fr.ird.observe.application.swing.db.DataContext; import fr.ird.observe.application.swing.db.constants.DataContextType; +import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; +import fr.ird.observe.application.swing.ui.ObserveMainUI; +import fr.ird.observe.application.swing.ui.UIHelper; +import fr.ird.observe.application.swing.ui.content.ContentMode; +import fr.ird.observe.application.swing.ui.content.ContentUIInitializer; +import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; +import fr.ird.observe.application.swing.ui.content.table.impl.seine.GearUseFeatureMeasurementCellEditor; +import fr.ird.observe.application.swing.ui.content.table.impl.seine.GearUseFeatureMeasurementCellRenderer; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto; import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDto; @@ -41,13 +47,6 @@ import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.services.service.longline.TripLonglineGearUseService; -import fr.ird.observe.application.swing.ui.ObserveMainUI; -import fr.ird.observe.application.swing.ui.UIHelper; -import fr.ird.observe.application.swing.ui.content.ContentMode; -import fr.ird.observe.application.swing.ui.content.ContentUIInitializer; -import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; -import fr.ird.observe.application.swing.ui.content.table.impl.seine.GearUseFeatureMeasurementCellEditor; -import fr.ird.observe.application.swing.ui.content.table.impl.seine.GearUseFeatureMeasurementCellRenderer; import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; @@ -68,6 +67,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; +import java.util.stream.Collectors; import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; @@ -180,7 +180,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip t("observe.content.measurement.delete.message"), JOptionPane.WARNING_MESSAGE, new Object[]{t("observe.choice.confirm.delete"), - t("observe.choice.cancel")}, + t("observe.choice.cancel")}, 1); if (response != 0) { @@ -203,17 +203,17 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip GearDto gearDto = gearDtoForm.getObject(); - return Lists.newArrayList( - Iterables.transform(gearDto.getGearCaracteristic(), - input -> { - GearUseFeaturesMeasurementLonglineDto measurementLonglineDto = new GearUseFeaturesMeasurementLonglineDto(); - measurementLonglineDto.setGearCaracteristic(input); - String gearCaracterisiticTypeId = (String) input.getPropertyValue(GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE); - if (GearCaracteristicTypeDtos.isBoolean(gearCaracterisiticTypeId)) { - measurementLonglineDto.setMeasurementValue(Boolean.FALSE.toString()); - } - return measurementLonglineDto; - })); + return gearDto.getGearCaracteristic().stream() + .map(input -> { + GearUseFeaturesMeasurementLonglineDto measurementLonglineDto = new GearUseFeaturesMeasurementLonglineDto(); + measurementLonglineDto.setGearCaracteristic(input); + String gearCaracterisiticTypeId = (String) input.getPropertyValue(GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE); + if (GearCaracteristicTypeDtos.isBoolean(gearCaracterisiticTypeId)) { + measurementLonglineDto.setMeasurementValue(Boolean.FALSE.toString()); + } + return measurementLonglineDto; + }) + .collect(Collectors.toList()); } @Override @@ -471,8 +471,9 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip protected void doPersist(TripLonglineGearUseDto bean) { // On ne persiste pas les measurements qui sont vides - for (GearUseFeaturesLonglineDto gearUseFeatures : bean.getGearUseFeaturesLongline()) { - if (!gearUseFeatures.isGearUseFeaturesMeasurementEmpty()) { + bean.getGearUseFeaturesLongline().stream() + .filter(gearUseFeatures -> !gearUseFeatures.isGearUseFeaturesMeasurementEmpty()) + .forEach(gearUseFeatures -> { Iterator<GearUseFeaturesMeasurementLonglineDto> iterator = gearUseFeatures.getGearUseFeaturesMeasurement().iterator(); while (iterator.hasNext()) { GearUseFeaturesMeasurementLonglineDto gearUseFeaturesMeasurement = iterator.next(); @@ -480,8 +481,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip iterator.remove(); } } - } - } + }); SaveResultDto saveResult = getTripLonglineGearUseService().save(bean); saveResult.toDto(bean); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java index 64133be..2df6166 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java @@ -22,12 +22,16 @@ package fr.ird.observe.application.swing.ui.content.table.impl.seine; * #L% */ -import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; -import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; import fr.ird.observe.application.swing.db.DataContext; import fr.ird.observe.application.swing.db.constants.DataContextType; +import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; +import fr.ird.observe.application.swing.ui.ObserveMainUI; +import fr.ird.observe.application.swing.ui.UIHelper; +import fr.ird.observe.application.swing.ui.content.ContentMode; +import fr.ird.observe.application.swing.ui.content.ContentUIInitializer; +import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; import fr.ird.observe.services.dto.referential.GearCaracteristicTypeDtos; @@ -41,11 +45,6 @@ import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; import fr.ird.observe.services.dto.seine.TripSeineGearUseDtos; import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.services.service.seine.TripSeineGearUseService; -import fr.ird.observe.application.swing.ui.ObserveMainUI; -import fr.ird.observe.application.swing.ui.UIHelper; -import fr.ird.observe.application.swing.ui.content.ContentMode; -import fr.ird.observe.application.swing.ui.content.ContentUIInitializer; -import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; @@ -66,6 +65,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; +import java.util.stream.Collectors; import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; @@ -177,8 +177,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei t("observe.title.delete"), t("observe.content.measurement.delete.message"), JOptionPane.WARNING_MESSAGE, - new Object[]{t("observe.choice.confirm.delete"), - t("observe.choice.cancel")}, + new Object[]{t("observe.choice.confirm.delete"), t("observe.choice.cancel")}, 1); if (response != 0) { @@ -201,17 +200,17 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei GearDto gearDto = gearDtoForm.getObject(); - return Lists.newArrayList( - Iterables.transform(gearDto.getGearCaracteristic(), - input -> { - GearUseFeaturesMeasurementSeineDto measurementSeineDto = new GearUseFeaturesMeasurementSeineDto(); - String gearCaracterisiticTypeId = (String) input.getPropertyValue(GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE); - if (GearCaracteristicTypeDtos.isBoolean(gearCaracterisiticTypeId)) { - measurementSeineDto.setMeasurementValue(Boolean.FALSE.toString()); - } - measurementSeineDto.setGearCaracteristic(input); - return measurementSeineDto; - })); + return gearDto.getGearCaracteristic().stream() + .map(input -> { + GearUseFeaturesMeasurementSeineDto measurementSeineDto = new GearUseFeaturesMeasurementSeineDto(); + String gearCaracterisiticTypeId = (String) input.getPropertyValue(GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE); + if (GearCaracteristicTypeDtos.isBoolean(gearCaracterisiticTypeId)) { + measurementSeineDto.setMeasurementValue(Boolean.FALSE.toString()); + } + measurementSeineDto.setGearCaracteristic(input); + return measurementSeineDto; + }) + .collect(Collectors.toList()); } @@ -468,8 +467,9 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei protected void doPersist(TripSeineGearUseDto bean) { // On ne persiste pas les measurements qui sont vides - for (GearUseFeaturesSeineDto gearUseFeatures : bean.getGearUseFeaturesSeine()) { - if (!gearUseFeatures.isGearUseFeaturesMeasurementEmpty()) { + bean.getGearUseFeaturesSeine().stream() + .filter(gearUseFeatures -> !gearUseFeatures.isGearUseFeaturesMeasurementEmpty()) + .forEach(gearUseFeatures -> { Iterator<GearUseFeaturesMeasurementSeineDto> iterator = gearUseFeatures.getGearUseFeaturesMeasurement().iterator(); while (iterator.hasNext()) { GearUseFeaturesMeasurementSeineDto gearUseFeaturesMeasurement = iterator.next(); @@ -477,8 +477,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei 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