branch develop updated (06aefae -> c46a071)
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 06aefae Livrable #8270 Merge branch 'feature/8270' into develop new c46a071 Amélioration du démarrage d'un chargement d'un trait 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 c46a07182cc094e977c6fb01566f6a9ba95e3bc6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 25 11:28:27 2016 +0200 Amélioration du démarrage d'un chargement d'un trait Summary of changes: .../content/actions/EditCatchesSupportAction.java | 42 +++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) -- 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 c46a07182cc094e977c6fb01566f6a9ba95e3bc6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 25 11:28:27 2016 +0200 Amélioration du démarrage d'un chargement d'un trait --- .../content/actions/EditCatchesSupportAction.java | 42 +++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) 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 6d19ec6..fef7a92 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 @@ -76,6 +76,24 @@ public abstract class EditCatchesSupportAction extends AbstractChangeScreenActio totalSteps += 5; } + // chargement des utilisateurs + totalSteps++; + + // chargement de la série de campagne + totalSteps++; + + // chargement de la campagne + totalSteps++; + + // chargement des navires + totalSteps++; + + // chargement des engins + totalSteps++; + + // chargement des caractéristiques + totalSteps++; + if (loadCruiseCache) { // Calcul des étapes (nb de traits dans la campagne) @@ -111,9 +129,31 @@ public abstract class EditCatchesSupportAction extends AbstractChangeScreenActio loadReferantials(false); } + ProgressionModel progressionModel = getProgressionModel(); + + progressionModel.increments("Chargement des utilisateurs"); + getDataContext().getPersons(); + + progressionModel.increments("Chargement de la série de campagne"); + getDataContext().getProgram(); + + progressionModel.increments("Chargement de la campagne"); + getDataContext().getCruise(); + + progressionModel.increments("Chargement des navires"); + getDataContext().getScientificVessels(); + getDataContext().getFishingVessels(); + + progressionModel.increments("Chargement des engins"); + getDataContext().getScientificGears(); + getDataContext().getFishingGears(); + + progressionModel.increments("Chargement des caractéristiques"); + getDataContext().getCaracteristics(); + if (loadCruiseCache) { - ProgressionModel progressionModel = getProgressionModel(); + CruiseCacheLoader cruiseCacheLoader = context.createCruiseCacheLoader(progressionModel); getDataContext().loadCruiseCache(cruiseCacheLoader); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm