This is an automated email from the git hooks/post-receive script. New commit to branch feature/7590-verfiEcranDesEquipementsDUneMarée in repository tutti. See http://git.codelutin.com/tutti.git commit ac6c1e3ec5041585f0f820d0df398b5e08f13bed Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Mar 3 10:23:16 2016 +0100 charger les caractéristique dans le bean d'edition avant la mis a jour du bean du tableau --- .../impl/longline/GearUseFeaturesLonglineTableModel.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineTableModel.java index 571789c..bc2c615 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineTableModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineTableModel.java @@ -22,6 +22,7 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ +import com.google.common.collect.Sets; import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto; import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDtos; import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDto; @@ -77,21 +78,20 @@ public class GearUseFeaturesLonglineTableModel extends ContentTableModel<TripLon @Override public void updateRowFromEditBean() { - super.updateRowFromEditBean(); - GearUseFeaturesLonglineUIModel model = getModel(); int editingRow = getSelectedRow(); GearUseFeaturesLonglineDto rowBean = getRowBean(); GearUseFeaturesMeasurementLonglinesTableModel measurementsTableModel = model.getMeasurementsTableModel(); + List<GearUseFeaturesMeasurementLonglineDto> measurements; + if (rowBean.getId() == null && CollectionUtils.isEmpty(measurementsTableModel.getCacheForRow(editingRow))) { // new gear usage, add default measurements ReferentialReference<GearDto> gear = rowBean.getGear(); - List<GearUseFeaturesMeasurementLonglineDto> measurements = - gearUseFeaturesLonglineUIHandler.getDefaultGearUseFeaturesMeasurementLongline(gear.getId()); + measurements = gearUseFeaturesLonglineUIHandler.getDefaultGearUseFeaturesMeasurementLongline(gear.getId()); if (log.isInfoEnabled()) { log.info("Create mode, use default measurements: " + measurements.size()); } @@ -105,9 +105,13 @@ public class GearUseFeaturesLonglineTableModel extends ContentTableModel<TripLon // 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>.