This is an automated email from the git hooks/post-receive script. New commit to branch feature/7616-VerifEcranCaptures in repository tutti. See http://git.codelutin.com/tutti.git commit abd56b58bc972e3988b8796530c54e52f3b51b6d Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Mar 11 16:09:05 2016 +0100 correction du binding des tailles et des poids (see #7616). --- .../impl/longline/CatchLonglineTableModel.java | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineTableModel.java index 6b12d37..b400b17 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineTableModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineTableModel.java @@ -25,12 +25,15 @@ package fr.ird.observe.ui.content.table.impl.longline; import fr.ird.observe.services.dto.longline.CatchLonglineDto; import fr.ird.observe.services.dto.longline.CatchLonglineDtos; import fr.ird.observe.services.dto.longline.SetLonglineCatchDto; +import fr.ird.observe.services.dto.longline.SizeMeasureDto; +import fr.ird.observe.services.dto.longline.WeightMeasureDto; import fr.ird.observe.ui.content.table.ContentTableMeta; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ObserveContentTableUI; import java.util.Collection; import java.util.List; +import java.util.stream.Collectors; /** * Created on 12/4/14. @@ -68,16 +71,31 @@ public class CatchLonglineTableModel extends ContentTableModel<SetLonglineCatchD @Override public void updateRowFromEditBean() { - super.updateRowFromEditBean(); - // store sizes and weights for the selected row int editingRow = getSelectedRow(); CatchLonglineUIModel model = getModel(); + model.getSizeMeasuresTableModel().storeInCacheForRow(editingRow); + + List<SizeMeasureDto> sizeMeasures = model.getSizeMeasuresTableModel().getData().stream() + .filter(sizeMeasureDto -> sizeMeasureDto.getSizeMeasureType() != null) + .collect(Collectors.toList()); + + getRowBean().setSizeMeasure(sizeMeasures); + model.getWeightMeasuresTableModel().storeInCacheForRow(editingRow); + List<WeightMeasureDto> weightMeasures = model.getWeightMeasuresTableModel().getData().stream() + .filter(weightMeasureDto -> weightMeasureDto.getWeightMeasureType() != null) + .collect(Collectors.toList()); + + getRowBean().setWeightMeasure(weightMeasures); + + super.updateRowFromEditBean(); + + } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.