branch develop updated (203236b -> e4156a9)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 203236b Livrable #8232 Merge branch 'feature/8232' into develop new e4156a9 Ajout étape lors du chargement de la saisie des captures 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 e4156a9c7b81bc52de256313d5bc58b5adff4cc0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 03:16:38 2016 +0200 Ajout étape lors du chargement de la saisie des captures Summary of changes: .../tutti/ui/swing/content/actions/EditCatchesSupportAction.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit e4156a9c7b81bc52de256313d5bc58b5adff4cc0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 03:16:38 2016 +0200 Ajout étape lors du chargement de la saisie des captures --- .../tutti/ui/swing/content/actions/EditCatchesSupportAction.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/EditCatchesSupportAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/EditCatchesSupportAction.java index 48cc937..ff4a976 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/EditCatchesSupportAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/EditCatchesSupportAction.java @@ -80,7 +80,7 @@ public abstract class EditCatchesSupportAction extends AbstractChangeScreenActio // Calcul des étapes (nb de traits dans la campagne) long cruiseFishingOperationIds = getDataContext().getCruiseFishingOperationIds().stream().count(); - totalSteps += cruiseFishingOperationIds; + totalSteps += cruiseFishingOperationIds + 1; if (log.isInfoEnabled()) { log.info("Found " + cruiseFishingOperationIds + " fishing operations to load in sampling cache."); @@ -111,9 +111,13 @@ public abstract class EditCatchesSupportAction extends AbstractChangeScreenActio } if (loadSamplingCache) { - CruiseSamplingCacheLoader cruiseSamplingCacheLoader = new CruiseSamplingCacheLoader(getContext().getPersistenceService(), getContext().getDecoratorService(), getProgressionModel()); + ProgressionModel progressionModel = getProgressionModel(); + + CruiseSamplingCacheLoader cruiseSamplingCacheLoader = new CruiseSamplingCacheLoader(getContext().getPersistenceService(), getContext().getDecoratorService(), progressionModel); getDataContext().loadCruiseSamplingCache(cruiseSamplingCacheLoader); + progressionModel.increments("Chargement de l'interface graphique"); + } super.doAction(); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm