branch feature/7017 updated (45d847c -> 42d7e97)
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 45d847c correction de la validation des onglets (refs #7017) new 42d7e97 Capture : enregistrement de l'avançon, désactivation du champs "santé au rejet", Enregistrement des profondeur : erreur au changement de ligne, Estimation banc : affectation de la seine au estimation des banc avant l'enregistrement. The 1 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 42d7e978ba475482474f1bd82e39ea600a533be2 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue May 5 14:26:45 2015 +0200 Capture : enregistrement de l'avançon, désactivation du champs "santé au rejet", Enregistrement des profondeur : erreur au changement de ligne, Estimation banc : affectation de la seine au estimation des banc avant l'enregistrement. Summary of changes: .../ui/content/table/impl/longline/CatchLonglineUIHandler.java | 4 +++- .../ui/content/table/impl/longline/LonglinePositionHelper.java | 2 +- .../ui/content/table/impl/seine/SchoolEstimateUIHandler.java | 8 ++++++-- 3 files changed, 10 insertions(+), 4 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 42d7e978ba475482474f1bd82e39ea600a533be2 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue May 5 14:26:45 2015 +0200 Capture : enregistrement de l'avançon, désactivation du champs "santé au rejet", Enregistrement des profondeur : erreur au changement de ligne, Estimation banc : affectation de la seine au estimation des banc avant l'enregistrement. --- .../ui/content/table/impl/longline/CatchLonglineUIHandler.java | 4 +++- .../ui/content/table/impl/longline/LonglinePositionHelper.java | 2 +- .../ui/content/table/impl/seine/SchoolEstimateUIHandler.java | 8 ++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java index 024908d..3c9a6b2 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java @@ -501,6 +501,8 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C } reloadPropertyChangeListener(bean, CatchLongline.PROPERTY_CATCH_FATE_LONGLINE, catchFateChanged); + onCatchFateChanged(bean.getCatchFateLongline(), bean); + reloadPropertyChangeListener(bean, CatchLongline.PROPERTY_BRANCHLINE, branchlineChanged); reloadPropertyChangeListener(bean, CatchLongline.PROPERTY_DEPREDATED, depredatedChanged); @@ -586,7 +588,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C log.info("Saved modified branchline"); } - Branchline branchline = getTableEditBean().getBranchline(); + Branchline branchline = getUi().getBranchlineBean(); CatchLonglineService service = getService(CatchLonglineService.class); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/LonglinePositionHelper.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/LonglinePositionHelper.java index 69c4b5d..c94fe92 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/LonglinePositionHelper.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/LonglinePositionHelper.java @@ -316,7 +316,7 @@ public class LonglinePositionHelper<E extends LonglinePositionAware> { // un panier est selectionne - Basket newValueInUniverse = findInList(uiBasket.getData(), newValue.getTopiaId()); + Basket newValueInUniverse = findInList(basketUniverse, newValue.getTopiaId()); // on remplit uniquement les avançons des paniers List<Branchline> branchlines = newValueInUniverse.getBranchline(); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java index ec76626..f64a372 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java @@ -21,6 +21,7 @@ */ package fr.ird.observe.ui.content.table.impl.seine; +import com.google.common.collect.Lists; import fr.ird.observe.BinderService; import fr.ird.observe.ObserveConfig; import fr.ird.observe.db.constants.DataContextType; @@ -46,7 +47,6 @@ import javax.swing.JComponent; import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -158,7 +158,7 @@ public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeine, Sch } else { Species species = bean.getSpecies(); - availableSpecies= Collections.singletonList(species); + availableSpecies= Lists.newArrayList(species); requestFocus = getUi().getTotalWeight(); } @@ -173,6 +173,10 @@ public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeine, Sch @Override protected void doPersist(SetSeine editBean) { + for (SchoolEstimate schoolEstimate : editBean.getSchoolEstimate()) { + schoolEstimate.setSetSeine(editBean); + } + SchoolEstimateService service = getService(SchoolEstimateService.class); service.save(editBean); -- 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