December 2015 - Tutti-commits - mailman.cloud.codelutin.com

02/03: Correction de l'action de création de lot et continuer (See #7625)
by codelutin.com scm 18 Dec '15

18 Dec '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 6804e922af8a114b5303ca4d7a96492fa727228b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Dec 18 09:12:11 2015 +0100 Correction de l'action de création de lot et continuer (See #7625) --- .../benthos/create/actions/CreateBenthosBatchAndContinueAction.java | 3 +-- .../species/create/actions/CreateSpeciesBatchAndContinueAction.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/actions/CreateBenthosBatchAndContinueAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/actions/CreateBenthosBatchAndContinueAction.java index c1d8203..98ce721 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/actions/CreateBenthosBatchAndContinueAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/actions/CreateBenthosBatchAndContinueAction.java @@ -45,7 +45,7 @@ public class CreateBenthosBatchAndContinueAction extends SimpleActionSupport<Cre private static final long serialVersionUID = 1L; public CreateBenthosBatchAndContinueAction(CreateBenthosBatchUI ui) { - super(ui); + super(ui, true); } @Override @@ -62,6 +62,5 @@ public class CreateBenthosBatchAndContinueAction extends SimpleActionSupport<Cre // re-open this screen ui.getHandler().openUI(benthosTabContent.getModel()); - } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/actions/CreateSpeciesBatchAndContinueAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/actions/CreateSpeciesBatchAndContinueAction.java index b12e3da..e761c1f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/actions/CreateSpeciesBatchAndContinueAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/actions/CreateSpeciesBatchAndContinueAction.java @@ -45,7 +45,7 @@ public class CreateSpeciesBatchAndContinueAction extends SimpleActionSupport<Cre private static final long serialVersionUID = 1L; public CreateSpeciesBatchAndContinueAction(CreateSpeciesBatchUI ui) { - super(ui); + super(ui, true); } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (27a5138 -> e512c52)
by codelutin.com scm 18 Dec '15

18 Dec '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 27a5138 Correction de l'export du modèle de catégorisation (Fixes #7585) new f739328 Ajout d'un drapeau pour jouer l'action plus par le thread swing (See #7625) new 6804e92 Correction de l'action de création de lot et continuer (See #7625) new e512c52 [CAPTURE] Alt + C écran figé et création du même lot plusieurs fois (Fixes #7625). Merge branch 'feature/7625_probleme_sur_action_de_creation_de_lot' into develop The 3 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 e512c52a828021d11b7a52ce357efe874d64c1d0 Merge: 27a5138 6804e92 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Dec 18 09:12:16 2015 +0100 [CAPTURE] Alt + C écran figé et création du même lot plusieurs fois (Fixes #7625). Merge branch 'feature/7625_probleme_sur_action_de_creation_de_lot' into develop commit 6804e922af8a114b5303ca4d7a96492fa727228b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Dec 18 09:12:11 2015 +0100 Correction de l'action de création de lot et continuer (See #7625) commit f739328869b77812dc18488761e6cf648e4c8ac1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Dec 18 09:11:51 2015 +0100 Ajout d'un drapeau pour jouer l'action plus par le thread swing (See #7625) Summary of changes: .../CreateBenthosBatchAndContinueAction.java | 3 +-- .../CreateSpeciesBatchAndContinueAction.java | 2 +- .../ui/swing/util/actions/SimpleActionSupport.java | 28 +++++++++++++++++++++- 3 files changed, 29 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (c52a9a6 -> 27a5138)
by codelutin.com scm 18 Dec '15

18 Dec '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from c52a9a6 Fixes #7720. Merge branch 'feature/7720' into develop new 27a5138 Correction de l'export du modèle de catégorisation (Fixes #7585) 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 27a51382557ae6bf3dc0d1ce394f76cc45ab1c1e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Dec 18 08:41:21 2015 +0100 Correction de l'export du modèle de catégorisation (Fixes #7585) Summary of changes: .../service/genericformat/GenericFormatExportService.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (6cf93ac -> c52a9a6)
by codelutin.com scm 18 Dec '15

18 Dec '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 6cf93ac Utilisation de codelutinpom 5-rc-2 + configuration du site new 103ac56 vérification que le poids d'un lot n'est pas 0 lors de l'élévation (refs #7720) new c54d6de Amélioration du test de vérification du poids à zéro (See #7720) new c52a9a6 Fixes #7720. Merge branch 'feature/7720' into develop The 3 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 c52a9a607e4a196412ddaa186f59c250058220d2 Merge: 6cf93ac c54d6de Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Dec 18 08:18:00 2015 +0100 Fixes #7720. Merge branch 'feature/7720' into develop commit c54d6de97d2561cfd2795c9726a2592f1f1ecd47 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Dec 18 08:16:51 2015 +0100 Amélioration du test de vérification du poids à zéro (See #7720) commit 103ac56b040d122f68a9bfbd244c22bfb768d5c1 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Dec 17 17:56:51 2015 +0100 vérification que le poids d'un lot n'est pas 0 lors de l'élévation (refs #7720) Summary of changes: .../src/main/java/fr/ifremer/tutti/util/Weights.java | 8 ++++++++ .../fr/ifremer/tutti/service/catches/WeightComputingService.java | 7 ++++--- .../src/main/resources/i18n/tutti-service_fr_FR.properties | 4 ++-- 3 files changed, 14 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch feature/7720 deleted (was 379ffa2)
by codelutin.com scm 18 Dec '15

18 Dec '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7720 in repository tutti. See http://git.codelutin.com/tutti.git was 379ffa2 Amélioration du test de vérification du poids à zéro (See #7720) The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7720 updated (7a3d854 -> 379ffa2)
by codelutin.com scm 18 Dec '15

18 Dec '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7720 in repository tutti. See http://git.codelutin.com/tutti.git from 7a3d854 vérification que le poids d'un lot n'est pas 0 lors de l'élévation (refs #7720) adds a5b4fb0 L'espèce sélectionnée dans la popup n'est pas sélectionnée dans la liste déroulante. Je n'arrive pas à reproduire l'erreur, mais je suppose que ca vient du fait qu'on n'est pas dans le thread swing quand on modifie le modèle. (refs #7626) adds 916c5f2 fields in protected + code format adds f0b95cd Merge branch 'feature/7626' into 'develop' (Fixes #7626). adds 116c8e1 vérification qu'il y a des traits avant d'en sélectionner un (fixes #7631) adds 6817516 Merge branch 'feature/7631_2' into 'develop' adds e7ae806 Correction de la librairie hsqldb à utiliser pour démarrer la console et la gui adds caef859 creation de la tache de modification des taxon dans les batchs (refs #6714) adds 449dc19 mise à jour des taxons référents dans les batchs (refs #6714) adds cc4b060 ajout de logs (fixes #6714) adds dca46cb update javadoc adds 014df80 requetes en constantes (refs #6714) adds 1457821 deplacement declaration logger adds 11caef5 modif visibilité méthode adds dc932b4 Fixes #6714 Merge branch 'feature/6714' into develop adds 6ee1dab Utilisation de codelutinpom 5-rc-2 + configuration du site adds 379ffa2 Amélioration du test de vérification du poids à zéro (See #7720) No new revisions were added by this update. Summary of changes: pom.xml | 5 +- src/site/site_fr.xml | 17 +-- tutti-persistence/README.txt | 4 +- .../service/TuttiPersistenceServiceLocator.java | 2 +- .../referential/synchro/ReferentialUpdateTask.java | 22 ++++ ...aceReferenceTaxonReferentialUpdateTaskImpl.java | 76 ++++++++++++++ .../TuttiReferentialSynchroServiceImpl.java | 116 +++++++++++++++++++++ .../main/java/fr/ifremer/tutti/util/Weights.java | 4 +- ...rvice.referential.synchro.ReferentialUpdateTask | 1 + .../service/catches/WeightComputingService.java | 6 +- .../TuttiReferentialSynchronizeService.java | 4 +- .../content/home/actions/EditCatchesAction.java | 6 +- .../SelectSpeciesForBenthosBatchAction.java | 20 +++- .../SelectSpeciesForSpeciesBatchAction.java | 19 +++- 14 files changed, 278 insertions(+), 24 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/synchro/ReferentialUpdateTask.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/synchro/ReplaceReferenceTaxonReferentialUpdateTaskImpl.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/synchro/TuttiReferentialSynchroServiceImpl.java create mode 100644 tutti-persistence/src/main/resources/META-INF/services/fr.ifremer.tutti.persistence.service.referential.synchro.ReferentialUpdateTask -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (15ab1c8 -> 6cf93ac)
by codelutin.com scm 17 Dec '15

17 Dec '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 15ab1c8 Merge branch 'feature/7631_2' into 'develop' adds 981415f Correction de la librairie hsqldb à utiliser pour démarrer la console et la gui adds 2384348 creation de la tache de modification des taxon dans les batchs (refs #6714) adds 8ac5cb2 mise à jour des taxons référents dans les batchs (refs #6714) adds 1077b75 ajout de logs (fixes #6714) adds 1ea8a9c update javadoc adds 9eac8d2 requetes en constantes (refs #6714) adds 9deb783 deplacement declaration logger adds f014f96 modif visibilité méthode new b2624b8 Fixes #6714 Merge branch 'feature/6714' into develop new 6cf93ac Utilisation de codelutinpom 5-rc-2 + configuration du site The 2 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 6cf93ac424c93ce50a074310c8cc321c557acd2f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Dec 17 22:34:03 2015 +0100 Utilisation de codelutinpom 5-rc-2 + configuration du site commit b2624b81682dad6b521c204c2d19e6e41b32cf7c Merge: 981415f f014f96 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Dec 17 21:22:59 2015 +0100 Fixes #6714 Merge branch 'feature/6714' into develop Summary of changes: pom.xml | 5 +- src/site/site_fr.xml | 17 +-- tutti-persistence/README.txt | 4 +- .../service/TuttiPersistenceServiceLocator.java | 2 +- .../referential/synchro/ReferentialUpdateTask.java | 22 ++++ ...aceReferenceTaxonReferentialUpdateTaskImpl.java | 76 ++++++++++++++ .../TuttiReferentialSynchroServiceImpl.java | 116 +++++++++++++++++++++ ...rvice.referential.synchro.ReferentialUpdateTask | 1 + .../TuttiReferentialSynchronizeService.java | 4 +- 9 files changed, 234 insertions(+), 13 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/synchro/ReferentialUpdateTask.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/synchro/ReplaceReferenceTaxonReferentialUpdateTaskImpl.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/synchro/TuttiReferentialSynchroServiceImpl.java create mode 100644 tutti-persistence/src/main/resources/META-INF/services/fr.ifremer.tutti.persistence.service.referential.synchro.ReferentialUpdateTask -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

01/02: Fixes #6714 Merge branch 'feature/6714' into develop
by codelutin.com scm 17 Dec '15

17 Dec '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit b2624b81682dad6b521c204c2d19e6e41b32cf7c Merge: 981415f f014f96 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Dec 17 21:22:59 2015 +0100 Fixes #6714 Merge branch 'feature/6714' into develop .../service/TuttiPersistenceServiceLocator.java | 2 +- .../referential/synchro/ReferentialUpdateTask.java | 22 ++++ ...aceReferenceTaxonReferentialUpdateTaskImpl.java | 76 ++++++++++++++ .../TuttiReferentialSynchroServiceImpl.java | 116 +++++++++++++++++++++ ...rvice.referential.synchro.ReferentialUpdateTask | 1 + .../TuttiReferentialSynchronizeService.java | 4 +- 6 files changed, 218 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/6714 deleted (was f014f96)
by codelutin.com scm 17 Dec '15

17 Dec '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/6714 in repository tutti. See http://git.codelutin.com/tutti.git was f014f96 modif visibilité méthode The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/6714 updated (b0fe28a -> f014f96)
by codelutin.com scm 17 Dec '15

17 Dec '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/6714 in repository tutti. See http://git.codelutin.com/tutti.git discards b0fe28a modif visibilité méthode discards 02aee02 deplacement declaration logger discards 4c94e8d requetes en constantes (refs #6714) discards 8ccca87 update javadoc discards 9469344 ajout de logs (fixes #6714) discards 33559fb mise à jour des taxons référents dans les batchs (refs #6714) discards 04a00a9 creation de la tache de modification des taxon dans les batchs (refs #6714) adds 485af12 vérification qu'il y a des traits avant d'en sélectionner un (fixes #7631) adds 15ab1c8 Merge branch 'feature/7631_2' into 'develop' adds 981415f Correction de la librairie hsqldb à utiliser pour démarrer la console et la gui adds 2384348 creation de la tache de modification des taxon dans les batchs (refs #6714) adds 8ac5cb2 mise à jour des taxons référents dans les batchs (refs #6714) adds 1077b75 ajout de logs (fixes #6714) adds 1ea8a9c update javadoc adds 9eac8d2 requetes en constantes (refs #6714) adds 9deb783 deplacement declaration logger adds f014f96 modif visibilité méthode This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (b0fe28a) \ N -- N -- N refs/heads/feature/6714 (f014f96) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. No new revisions were added by this update. Summary of changes: tutti-persistence/README.txt | 4 ++-- .../tutti/ui/swing/content/home/actions/EditCatchesAction.java | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0