branch feature/7017 updated (f79c35b -> 2bbe067)
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 f79c35b - Amélioration du cache de services - Ajout API pour créer un modèle de sélection new 2bbe067 demander l'enregistrement du detail de l'avançon modifié avant l'enregistrement de la composition de la palangre 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 2bbe067e43f30144284409c45cab76e9682dae12 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon May 4 17:24:38 2015 +0200 demander l'enregistrement du detail de l'avançon modifié avant l'enregistrement de la composition de la palangre Summary of changes: .../LonglineDetailCompositionUIHandler.java | 33 ++++++++++++++++------ 1 file changed, 24 insertions(+), 9 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 2bbe067e43f30144284409c45cab76e9682dae12 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon May 4 17:24:38 2015 +0200 demander l'enregistrement du detail de l'avançon modifié avant l'enregistrement de la composition de la palangre --- .../LonglineDetailCompositionUIHandler.java | 33 ++++++++++++++++------ 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java index 9433d66..0a5416a 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java @@ -473,22 +473,37 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong @Override protected boolean doSave(SetLongline bean) { - SectionsTableModel sectionsTableModel = getSectionsTableModel(); - SectionWithTemplate selectedSection = sectionsTableModel.getSelectedRow(); + BranchlineUI branchlineDetailUI = getUi().getBranchlineDetailUI(); + + boolean continueSave = true; - if (selectedSection != null) { + if (getUi().getFishingOperationTabPane().getSelectedIndex() == 2) { - // flush selected section before save - flushSection(selectedSection); + BranchlineUIHandler branchlineUIHandler = branchlineDetailUI.getHandler(); + + continueSave = branchlineUIHandler.tryToQuit(); } - List<SectionWithTemplate> sections = sectionsTableModel.getNotEmptyData(); + if (continueSave) { - LonglineDetailCompositionService service = getService(LonglineDetailCompositionService.class); - service.save(bean, sections); + SectionsTableModel sectionsTableModel = getSectionsTableModel(); + SectionWithTemplate selectedSection = sectionsTableModel.getSelectedRow(); + + if (selectedSection != null) { + + // flush selected section before save + flushSection(selectedSection); + + } + + List<SectionWithTemplate> sections = sectionsTableModel.getNotEmptyData(); + + LonglineDetailCompositionService service = getService(LonglineDetailCompositionService.class); + service.save(bean, sections); + } - return true; + return continueSave; } -- 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