branch feature/7017 updated (4762be6 -> 90ff5b0)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7017 in repository observe. See http://git.codelutin.com/observe.git from 4762be6 deplacement du traitement après enregistrement dans les services. new 9dd0367 add not null constrainst on gear use features new 90ff5b0 fix measurement save 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 90ff5b0d929b4f9ef7cbf57858270cf8a84c381e Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 30 18:03:33 2015 +0200 fix measurement save code commit 9dd036782d976d2d3abff7885fba5efd72231853 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 30 17:59:41 2015 +0200 add not null constrainst on gear use features Summary of changes: .../src/main/xmi/observe-longline.properties | 6 ++++ .../src/main/xmi/observe-seine.properties | 9 +++++ .../GearUseFeaturesLonglineServiceImpl.java | 42 ++++++++++------------ .../seine/GearUseFeaturesSeineServiceImpl.java | 41 +++++++++------------ 4 files changed, 49 insertions(+), 49 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7017 in repository observe. See http://git.codelutin.com/observe.git commit 9dd036782d976d2d3abff7885fba5efd72231853 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 30 17:59:41 2015 +0200 add not null constrainst on gear use features --- observe-entities/src/main/xmi/observe-longline.properties | 6 ++++++ observe-entities/src/main/xmi/observe-seine.properties | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/observe-entities/src/main/xmi/observe-longline.properties b/observe-entities/src/main/xmi/observe-longline.properties index 14871b1..3fcb760 100644 --- a/observe-entities/src/main/xmi/observe-longline.properties +++ b/observe-entities/src/main/xmi/observe-longline.properties @@ -150,3 +150,9 @@ fr.ird.observe.entities.longline.Basket.attribute.haulingIdentifier.tagValue.not fr.ird.observe.entities.longline.Branchline.attribute.settingIdentifier.tagValue.notNull=true fr.ird.observe.entities.longline.Branchline.attribute.haulingIdentifier.tagValue.notNull=true + +fr.ird.observe.entities.longline.GearUseFeaturesLongline.attribute.gear.tagvalue.notNull=true +fr.ird.observe.entities.longline.GearUseFeaturesLongline.attribute.number.tagvalue.notNull=true + +fr.ird.observe.entities.longline.GearUseFeaturesMeasurementLongline.attribute.gearCaracteristic.tagvalue.notNull=true + diff --git a/observe-entities/src/main/xmi/observe-seine.properties b/observe-entities/src/main/xmi/observe-seine.properties index 56c5db0..7a56696 100644 --- a/observe-entities/src/main/xmi/observe-seine.properties +++ b/observe-entities/src/main/xmi/observe-seine.properties @@ -133,3 +133,12 @@ fr.ird.observe.entities.seine.GearUseFeaturesSeine.attribute.gearUseFeaturesMeas ############################################################################### ### Unicite ############################################################### ############################################################################### + +############################################################################### +### NotNull ################################################################### +############################################################################### + +fr.ird.observe.entities.seine.GearUseFeaturesSeine.attribute.gear.tagvalue.notNull=true +fr.ird.observe.entities.seine.GearUseFeaturesSeine.attribute.number.tagvalue.notNull=true + +fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine.attribute.gearCaracteristic.tagvalue.notNull=true \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7017 in repository observe. See http://git.codelutin.com/observe.git commit 90ff5b0d929b4f9ef7cbf57858270cf8a84c381e Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 30 18:03:33 2015 +0200 fix measurement save code --- .../GearUseFeaturesLonglineServiceImpl.java | 42 ++++++++++------------ .../seine/GearUseFeaturesSeineServiceImpl.java | 41 +++++++++------------ 2 files changed, 34 insertions(+), 49 deletions(-) diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/longline/GearUseFeaturesLonglineServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/longline/GearUseFeaturesLonglineServiceImpl.java index efbe94b..920d654 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/longline/GearUseFeaturesLonglineServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/longline/GearUseFeaturesLonglineServiceImpl.java @@ -107,7 +107,12 @@ public class GearUseFeaturesLonglineServiceImpl extends AbstractObserveService i @Override public GearUseFeaturesLongline onCreateChild(GearUseFeaturesLongline childToCreate) { - GearUseFeaturesLongline childCreated = super.onCreateChild(childToCreate); + + GearUseFeaturesLongline childCreated = getDao(entityClass).create( + GearUseFeaturesLongline.PROPERTY_GEAR,childToCreate.getGear(), + GearUseFeaturesLongline.PROPERTY_NUMBER,childToCreate.getNumber() + ); + childBinder.load(childToCreate, childCreated, false); saveMeasurement(childToCreate, childCreated); return childCreated; @@ -126,49 +131,38 @@ public class GearUseFeaturesLonglineServiceImpl extends AbstractObserveService i TopiaEntityBinder<GearUseFeaturesMeasurementLongline> measurementBinder = getBinder(GearUseFeaturesMeasurementLongline.class, BinderService.EDIT); - List<GearUseFeaturesMeasurementLongline> measurementsToDelete = Lists.newArrayList(); - - if (childSaved.getGearUseFeaturesMeasurement() != null) { - - measurementsToDelete.addAll(childSaved.getGearUseFeaturesMeasurement()); + List<GearUseFeaturesMeasurementLongline> measurementsNew = Lists.newArrayList(); - } + if (!childToSave.isGearUseFeaturesMeasurementEmpty()) { - List<GearUseFeaturesMeasurementLongline> measurementsNew = Lists.newArrayList(); + for (GearUseFeaturesMeasurementLongline measurementToSave : childToSave.getGearUseFeaturesMeasurement()) { - for (GearUseFeaturesMeasurementLongline measurementToSave : childToSave.getGearUseFeaturesMeasurement()) { + GearUseFeaturesMeasurementLongline measurementSaved; - GearUseFeaturesMeasurementLongline measurementSaved; + if (measurementToSave.getTopiaId() == null) { - if (measurementToSave.getTopiaId() == null) { + measurementSaved = dao.create(GearUseFeaturesMeasurementLongline.PROPERTY_GEAR_CARACTERISTIC, measurementToSave.getGearCaracteristic()); - measurementSaved = dao.create(); + measurementBinder.load(measurementToSave, measurementSaved, false); - measurementBinder.load(measurementToSave, measurementSaved, false); + } else { - } else { + measurementSaved = dao.findByTopiaId(measurementToSave.getTopiaId()); - measurementSaved = findByTopiaId(GearUseFeaturesMeasurementLongline.class, measurementToSave.getTopiaId()); + measurementBinder.load(measurementToSave, measurementSaved, true); - measurementBinder.load(measurementToSave, measurementSaved, true); + } - measurementsToDelete.remove(measurementSaved); + measurementsNew.add(measurementSaved); } - measurementsNew.add(measurementSaved); - } childSaved.clearGearUseFeaturesMeasurement(); childSaved.addAllGearUseFeaturesMeasurement(measurementsNew); - for (GearUseFeaturesMeasurementLongline toDelete : measurementsToDelete) { - - dao.delete(toDelete); - - } } diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/seine/GearUseFeaturesSeineServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/seine/GearUseFeaturesSeineServiceImpl.java index a76e778..1f61015 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/seine/GearUseFeaturesSeineServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/seine/GearUseFeaturesSeineServiceImpl.java @@ -108,7 +108,10 @@ public class GearUseFeaturesSeineServiceImpl extends AbstractObserveService impl @Override public GearUseFeaturesSeine onCreateChild(GearUseFeaturesSeine childToCreate) { - GearUseFeaturesSeine childCreated = super.onCreateChild(childToCreate); + GearUseFeaturesSeine childCreated = getDao(entityClass).create( + GearUseFeaturesSeine.PROPERTY_GEAR, childToCreate.getGear(), + GearUseFeaturesSeine.PROPERTY_NUMBER, childToCreate.getNumber()); + childBinder.load(childToCreate, childCreated, false); saveMeasurement(childToCreate, childCreated); return childCreated; @@ -127,50 +130,38 @@ public class GearUseFeaturesSeineServiceImpl extends AbstractObserveService impl TopiaEntityBinder<GearUseFeaturesMeasurementSeine> measurementBinder = getBinder(GearUseFeaturesMeasurementSeine.class, BinderService.EDIT); - List<GearUseFeaturesMeasurementSeine> measurementsToDelete = Lists.newArrayList(); - - if (childSaved.getGearUseFeaturesMeasurement() != null) { + List<GearUseFeaturesMeasurementSeine> measurementsNew = Lists.newArrayList(); - measurementsToDelete.addAll(childSaved.getGearUseFeaturesMeasurement()); + if (!childToSave.isGearUseFeaturesMeasurementEmpty()) { - } - - List<GearUseFeaturesMeasurementSeine> measurementsNew = Lists.newArrayList(); + for (GearUseFeaturesMeasurementSeine measurementToSave : childToSave.getGearUseFeaturesMeasurement()) { - for (GearUseFeaturesMeasurementSeine measurementToSave : childToSave.getGearUseFeaturesMeasurement()) { + GearUseFeaturesMeasurementSeine measurementSaved; - GearUseFeaturesMeasurementSeine measurementSaved; + if (measurementToSave.getTopiaId() == null) { - if (measurementToSave.getTopiaId() == null) { + measurementSaved = dao.create(GearUseFeaturesMeasurementSeine.PROPERTY_GEAR_CARACTERISTIC, measurementToSave.getGearCaracteristic()); - measurementSaved = dao.create(); + measurementBinder.load(measurementToSave, measurementSaved, false); - measurementBinder.load(measurementToSave, measurementSaved, false); + } else { - } else { + measurementSaved = dao.findByTopiaId(measurementToSave.getTopiaId()); - measurementSaved = findByTopiaId(GearUseFeaturesMeasurementSeine.class, measurementToSave.getTopiaId()); + measurementBinder.load(measurementToSave, measurementSaved, true); - measurementBinder.load(measurementToSave, measurementSaved, true); + } - measurementsToDelete.remove(measurementSaved); + measurementsNew.add(measurementSaved); } - measurementsNew.add(measurementSaved); - } childSaved.clearGearUseFeaturesMeasurement(); childSaved.addAllGearUseFeaturesMeasurement(measurementsNew); - for (GearUseFeaturesMeasurementSeine toDelete : measurementsToDelete) { - - dao.delete(toDelete); - - } - } }); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm