This is an automated email from the git hooks/post-receive script. New commit to branch feature/7589-PSverfiEcranDesEquipementsDUneMarée in repository tutti. See http://git.codelutin.com/tutti.git commit ec1f52fd4056fa2f85ab4301f385b72cede0fafc Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Mar 3 10:49:09 2016 +0100 charger les caractéristique dans le bean d'edition avant la mis a jour du bean du tableau --- .../table/impl/seine/GearUseFeaturesSeineTableModel.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineTableModel.java index eaf1a34..a585b3e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineTableModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineTableModel.java @@ -22,6 +22,7 @@ package fr.ird.observe.ui.content.table.impl.seine; * #L% */ +import com.google.common.collect.Sets; import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; @@ -77,21 +78,20 @@ public class GearUseFeaturesSeineTableModel extends ContentTableModel<TripSeineG @Override public void updateRowFromEditBean() { - super.updateRowFromEditBean(); - GearUseFeaturesSeineUIModel model = getModel(); int editingRow = getSelectedRow(); GearUseFeaturesSeineDto rowBean = getRowBean(); GearUseFeaturesMeasurementSeinesTableModel measurementsTableModel = model.getMeasurementsTableModel(); + List<GearUseFeaturesMeasurementSeineDto> measurements; + if (rowBean.getId() == null && CollectionUtils.isEmpty(measurementsTableModel.getCacheForRow(editingRow))) { // new gear usage, add default measurements ReferentialReference<GearDto> gear = rowBean.getGear(); - List<GearUseFeaturesMeasurementSeineDto> measurements = - gearUseFeaturesSeineUIHandler.getDefaultGearUseFeaturesMeasurementSeine(gear.getId()); + measurements = gearUseFeaturesSeineUIHandler.getDefaultGearUseFeaturesMeasurementSeine(gear.getId()); if (log.isInfoEnabled()) { log.info("Create mode, use default measurements: " + measurements.size()); } @@ -106,8 +106,14 @@ public class GearUseFeaturesSeineTableModel extends ContentTableModel<TripSeineG // store current measurements for the selected row measurementsTableModel.storeInCacheForRow(editingRow); + measurements = measurementsTableModel.getData(); } + rowBean.setGearUseFeaturesMeasurement(Sets.newLinkedHashSet(measurements)); + + super.updateRowFromEditBean(); + + } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.