April 2016 - Tutti-commits - mailman.cloud.codelutin.com

branch feature/8157 deleted (was 684e7ba)
by codelutin.com scm April 12, 2016

April 12, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8157 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git was 684e7ba Le sexe peut être null This change permanently discards the following revisions: discards 684e7ba Le sexe peut être null -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/8157 updated (6fa51c5 -> 684e7ba)
by codelutin.com scm April 12, 2016

April 12, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8157 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 6fa51c5 - finalement, on ne permet pas de code prélèvement si pas de taille - on remplace le code campagne par le code ruben s'iln 'y en a pas - dans le prefixe, on met ~ au lieu de # quand il n'y a pas de code (fixes #8157) adds a44c7eb Livrable #8157 Merge branch 'feature/8157' into develop adds 796926f ajout du nombre d'observations dans l'export + on n'exporte pas les lignes sans obs ni prelevements (refs #8157) adds 4d9cc98 Improve code adds 3ac965d Livrable #8157 Merge branch 'feature/8157-2' into develop adds 6c57296 on demande au cache le résumé de prélèvement pour la ligne sélectionnée (s'il n'y a qu'une ligne sélectionnée) (fixes #8203) adds c961117 correction (pas d'incrément, on récupère juste le nombre d'observations) (fixes #8203) adds 597b1e3 - flag pour ne pas effacer le message de prélèvement en cas d'ajout en rafale - on n'efface pas le résumé des prelevements quand on modifie les lignes (refs #8203) adds 0e34ab5 on demande au cache le résumé de prélèvement pour la ligne sélectionnée (s'il n'y a qu'une ligne sélectionnée) (fixes #8203) adds ff5f44e correction (pas d'incrément, on récupère juste le nombre d'observations) (fixes #8203) adds 7a08a7e Fix merge adds 985fc53 - on cache le message de prélèvement avant de créer une ligen en rafale - on cache le résumé quand aucune ligne n'est sélectionnée refs #8203 adds de6697e flag pour ne pas afficher les notifs quand on charge le lot ou qu'on reset (refs #8203) adds 780e9e2 on n'affiche pas le bandeau de prélèvement si on ne peut pas afficher les notifs (fixes #8203) adds 3cccfa4 Livrable #8203 Merge branch 'feature/8203' into develop adds a13e8d5 desactivation de la table des obs indiv si pas de methode de mensuration adds ed4b64a [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 6f3a114 [jgitflow-maven-plugin]updating poms for 4.5-rc-2 branch with snapshot versions adds f91e460 Add license headers adds 92d6e9a [jgitflow-maven-plugin]updating poms for branch'release/4.5-rc-2' with non-snapshot versions adds e8d61cd [jgitflow-maven-plugin]merging 'release/4.5-rc-2' into 'master' adds a87a0f3 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 24c70e7 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 5e82412 le poids rtp etait calculé meme quand le poids etait recopié depuis les observations individuelles (fixes #8225) adds 074584b Merge branch 'feature/8225' into 'develop' adds fd87d89 on supprime la colonne de maturité en fermant l'ui, pour avoir les même colonnes qu'à la création de l'écran (important pour la swing session) (fixes #8202) adds d8e19d2 Livrable #8202 Merge branch 'feature/8202' into develop adds bdb3c79 ajout d'une precondition pour eviter de decrementer une valeur à 0 (refs #8231) adds 1b40311 on ne stocke pas la caracteristique de maturité sur la ligne, on la passe à la méthode get (comme pour le sex) (refs #8231) adds 9dc3492 stockage de la caractéristique de maturité et de sexe sur le modèle (fixes #8231) adds c9dcaca Amélioration du code adds 1c4a770 livrable #8231 Merge branch 'feature/8231' into develop adds 34abc60 grand nettoyage de printemps + fixes #8232 adds 203236b Livrable #8232 Merge branch 'feature/8232' into develop adds e4156a9 Ajout étape lors du chargement de la saisie des captures adds aad91f9 Ne pas changer de ligne en appuyant sur Entrée dans le tableau des observations individuelles (See #8230) adds 0a3db77 Livrable #8230 Merge branch 'feature/8230' into develop adds dd3e083 bien remplir le benthos avec le... benthos (See #8234) + nettoyage code adds 3227fb7 Livrable #8234 Merge branch 'feature/8234' into develop adds 0c1b909 Ajout toString to Caracteristic adds 26cc892 Bien conserver l'ordre sur les caractéristiques (see #8233) adds a700d11 Mettre à jour l'ordre des caractéristiques sur les actions ↑ et ↓ (See #8233) adds c21a13e Livrable #8233 Merge branch 'feature/8233' into develop adds 2ced35f Vérifier qu'on peut quitter l'écran des mensurations si on tente de quitter l'opération en cours (uniquement sur les actions de changement d'opération) (see #8221) adds 9a32cf3 Livrable #8221 Merge branch 'feature/8221' into develop adds e2b48fc Suppression du veto sur le changement de screen (cela n'intervient pas au bon moment et il y a déjà une API pour gérer ça) (See #8190) adds a22c103 Livrable #8190 Merge branch 'feature/8190' into develop adds 74e40d3 Utilisation du bon identifiant pour supprimer un lot (See #8136) adds 4705d3f Ajout toString sur SampleData adds c09526f On ne peut supprimer que des observations qui ont une taille adds d7ebcc4 Livrable #8136 Merge branch 'feature/8136' into develop adds e47e9ad Ne pas tenir compte de l'algorithme si 1/n vaut 0 ou à sexer mais observation sans sexe (See #8228) adds 20e2e77 Ne pas utiliser d'optional à tout bout de champ (IndividualObservationUICache#samplingCache) adds efb7f63 Ne pas utiliser d'optional à tout bout de champ maturityQualitativeValue adds 988efaf Ne pas utiliser d'optional à tout bout de champ zone adds 8bccbbc Ne pas utiliser d'optional à tout bout de champ adds b2025da Ne pas utiliser d'optional à tout bout de champ (maturityColumnId) + meilleure gestion generics adds dd2d7b6 Fix npe quand recopie poids + suppression méthode inutile adds 0a7c166 Revue du code du cache et de l'export des pièces calcifiées adds 665a7a5 Ne plus utiliser des optional à tout bout de champs :( adds 7415cb5 Livrable #8228 Merge branch 'feature/8228' into develop new 684e7ba Le sexe peut être null 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 684e7ba206cdfb3d67c2d0d4d6e52bb59232f9de Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 12 12:46:08 2016 +0200 Le sexe peut être null Summary of changes: .../entities/referential/CaracteristicBean.java | 21 + .../ifremer/tutti/service/PersistenceService.java | 6 +- .../cps/CalcifiedPiecesSamplingExportService.java | 24 + .../service/export/cps/SamplingNumberRowModel.java | 36 +- .../tutti/service/sampling/CacheExtractedKey.java | 32 +- .../service/sampling/CruiseSamplingCache.java | 810 +++++++++++++-------- .../sampling/CruiseSamplingCacheLoader.java | 21 +- .../sampling/CruiseSamplingInternalCache.java | 70 +- .../tutti/service/sampling/SamplingEvent.java | 7 +- .../tutti/service/sampling/SamplingListener.java | 2 +- .../resources/i18n/tutti-service_en_GB.properties | 1 + .../resources/i18n/tutti-service_fr_FR.properties | 1 + .../filtered-resources/tutti-help-fr.properties | 23 + .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 23 +- .../tutti/ui/swing/content/MainUIHandler.java | 56 +- .../content/actions/EditCatchesSupportAction.java | 8 +- .../CalcifiedPiecesSamplingReportAction.java | 24 + .../catches/actions/ComputeBatchWeightsAction.java | 35 +- .../IndividualObservationBatchRowModel.java | 53 +- .../IndividualObservationBatchTableModel.java | 69 +- .../species/EditSpeciesBatchPanelUIHandler.java | 2 +- .../frequency/IndividualObservationUICache.java | 272 ++++--- .../frequency/SpeciesFrequencyTableModel.java | 167 +++++ .../species/frequency/SpeciesFrequencyUI.jcss | 2 +- .../frequency/SpeciesFrequencyUIHandler.java | 327 ++++----- .../species/frequency/SpeciesFrequencyUIModel.java | 114 ++- .../actions/ApplySpeciesFrequencyRafaleAction.java | 11 +- .../actions/CancelEditSpeciesFrequencyAction.java | 2 + .../frequency/actions/RemoveObservationAction.java | 27 +- .../actions/ResetSpeciesFrequencyAction.java | 4 + .../actions/EditFishingOperationAction.java | 31 + .../content/protocol/EditProtocolUIHandler.java | 11 + .../content/protocol/EditProtocolUIModel.java | 6 +- .../MoveDownCaracteristicMappingAction.java | 8 +- .../actions/MoveUpCaracteristicMappingAction.java | 8 +- .../swing/util/WideDataBeanFilterableComboBox.java | 24 + .../util/table/AbstractTuttiTableUIHandler.java | 109 +-- .../util/table/CaracteristicColumnIdentifier.java | 4 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 2 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 4 +- 40 files changed, 1552 insertions(+), 905 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/CaracteristicBean.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (d7ebcc4 -> 7415cb5)
by codelutin.com scm April 12, 2016

April 12, 2016

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 d7ebcc4 Livrable #8136 Merge branch 'feature/8136' into develop adds e47e9ad Ne pas tenir compte de l'algorithme si 1/n vaut 0 ou à sexer mais observation sans sexe (See #8228) adds 20e2e77 Ne pas utiliser d'optional à tout bout de champ (IndividualObservationUICache#samplingCache) adds efb7f63 Ne pas utiliser d'optional à tout bout de champ maturityQualitativeValue adds 988efaf Ne pas utiliser d'optional à tout bout de champ zone adds 8bccbbc Ne pas utiliser d'optional à tout bout de champ adds b2025da Ne pas utiliser d'optional à tout bout de champ (maturityColumnId) + meilleure gestion generics adds dd2d7b6 Fix npe quand recopie poids + suppression méthode inutile adds 0a7c166 Revue du code du cache et de l'export des pièces calcifiées adds 665a7a5 Ne plus utiliser des optional à tout bout de champs :( new 7415cb5 Livrable #8228 Merge branch 'feature/8228' into develop 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 7415cb547b95eedcea033cf84e7cd1dad7f5866a Merge: d7ebcc4 665a7a5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 12 12:42:51 2016 +0200 Livrable #8228 Merge branch 'feature/8228' into develop Summary of changes: .../ifremer/tutti/service/PersistenceService.java | 2 +- .../service/export/cps/SamplingNumberRowModel.java | 13 +- .../tutti/service/sampling/CacheExtractedKey.java | 18 +- .../service/sampling/CruiseSamplingCache.java | 780 ++++++++++++--------- .../sampling/CruiseSamplingCacheLoader.java | 21 +- .../sampling/CruiseSamplingInternalCache.java | 9 +- .../tutti/service/sampling/SamplingEvent.java | 7 +- .../IndividualObservationBatchTableModel.java | 5 +- .../species/EditSpeciesBatchPanelUIHandler.java | 2 +- .../frequency/IndividualObservationUICache.java | 147 ++-- .../frequency/SpeciesFrequencyUIHandler.java | 83 +-- .../species/frequency/SpeciesFrequencyUIModel.java | 13 +- .../util/table/CaracteristicColumnIdentifier.java | 4 +- 13 files changed, 604 insertions(+), 500 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8228 deleted (was 665a7a5)
by codelutin.com scm April 12, 2016

April 12, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8228 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git was 665a7a5 Ne plus utiliser des optional à tout bout de champs :( 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/8228 updated (0a7c166 -> 665a7a5)
by codelutin.com scm April 12, 2016

April 12, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8228 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 0a7c166 Revue du code du cache et de l'export des pièces calcifiées new 665a7a5 Ne plus utiliser des optional à tout bout de champs :( 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 665a7a5620bfc1ccd1267a15748d9c43c914f603 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 12 12:42:38 2016 +0200 Ne plus utiliser des optional à tout bout de champs :( Summary of changes: .../frequency/IndividualObservationUICache.java | 25 +++++++++++----------- .../frequency/SpeciesFrequencyUIHandler.java | 12 ++++++----- 2 files changed, 19 insertions(+), 18 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8228 updated (dd2d7b6 -> 0a7c166)
by codelutin.com scm April 12, 2016

April 12, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8228 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from dd2d7b6 Fix npe quand recopie poids + suppression méthode inutile new 0a7c166 Revue du code du cache et de l'export des pièces calcifiées 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 0a7c16644010ec2f880ee263739ea18d63a465f9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 12 12:28:35 2016 +0200 Revue du code du cache et de l'export des pièces calcifiées Summary of changes: .../service/export/cps/SamplingNumberRowModel.java | 13 +- .../tutti/service/sampling/CacheExtractedKey.java | 18 +- .../service/sampling/CruiseSamplingCache.java | 816 ++++++++++++--------- .../sampling/CruiseSamplingCacheLoader.java | 16 +- .../sampling/CruiseSamplingInternalCache.java | 9 +- 5 files changed, 476 insertions(+), 396 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8228 updated (acf08b3 -> dd2d7b6)
by codelutin.com scm April 12, 2016

April 12, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8228 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git omits acf08b3 Fix npe quand recopie poids + suppression méthode inutile omits 31626fa Ne pas utiliser d'optional à tout bout de champ (maturityColumnId) + meilleure gestion generics omits b7e2fc7 Ne pas utiliser d'optional à tout bout de champ omits 347a4fa Ne pas utiliser d'optional à tout bout de champ zone omits 8776b3b Ne pas utiliser d'optional à tout bout de champ maturityQualitativeValue omits e2a1d8a Ne pas utiliser d'optional à tout bout de champ (IndividualObservationUICache#samplingCache) omits 1d55529 Ne pas tenir compte de l'algorithme si 1/n vaut 0 ou à sexer mais observation sans sexe (See #8228) adds 74e40d3 Utilisation du bon identifiant pour supprimer un lot (See #8136) adds 4705d3f Ajout toString sur SampleData adds c09526f On ne peut supprimer que des observations qui ont une taille adds d7ebcc4 Livrable #8136 Merge branch 'feature/8136' into develop new e47e9ad Ne pas tenir compte de l'algorithme si 1/n vaut 0 ou à sexer mais observation sans sexe (See #8228) new 20e2e77 Ne pas utiliser d'optional à tout bout de champ (IndividualObservationUICache#samplingCache) new efb7f63 Ne pas utiliser d'optional à tout bout de champ maturityQualitativeValue new 988efaf Ne pas utiliser d'optional à tout bout de champ zone new 8bccbbc Ne pas utiliser d'optional à tout bout de champ new b2025da Ne pas utiliser d'optional à tout bout de champ (maturityColumnId) + meilleure gestion generics new dd2d7b6 Fix npe quand recopie poids + suppression méthode inutile 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 (acf08b3) \ N -- N -- N refs/heads/feature/8228 (dd2d7b6) 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. The 7 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 dd2d7b6cbadd7bf52bcbc01daa02322c6cbb3f8c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 12 06:11:03 2016 +0200 Fix npe quand recopie poids + suppression méthode inutile commit b2025da20da8529095c09cbe432928383890e338 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 12 03:31:02 2016 +0200 Ne pas utiliser d'optional à tout bout de champ (maturityColumnId) + meilleure gestion generics commit 8bccbbc737559f9d5bd4659b4ec0d81cf5c3398d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 12 03:22:14 2016 +0200 Ne pas utiliser d'optional à tout bout de champ commit 988efaf87ec30a64db2771a1b5fb83d3c7cf4b04 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 12 03:15:53 2016 +0200 Ne pas utiliser d'optional à tout bout de champ zone commit efb7f6354b81827ebaefaf5d3f28b6b54b68b46e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 12 03:04:02 2016 +0200 Ne pas utiliser d'optional à tout bout de champ maturityQualitativeValue commit 20e2e7787b22fcc745fd7c6a08814f5145a8ad41 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 12 02:52:11 2016 +0200 Ne pas utiliser d'optional à tout bout de champ (IndividualObservationUICache#samplingCache) commit e47e9ad5a2e0981485b0a350e9c0e464a8c09aa5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 12 02:47:53 2016 +0200 Ne pas tenir compte de l'algorithme si 1/n vaut 0 ou à sexer mais observation sans sexe (See #8228) Summary of changes: .../main/java/fr/ifremer/tutti/service/PersistenceService.java | 4 ++-- .../fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java | 4 ++-- .../tutti/service/sampling/CruiseSamplingInternalCache.java | 8 ++++++++ 3 files changed, 12 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 7

branch develop updated (a22c103 -> d7ebcc4)
by codelutin.com scm April 12, 2016

April 12, 2016

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 a22c103 Livrable #8190 Merge branch 'feature/8190' into develop new 74e40d3 Utilisation du bon identifiant pour supprimer un lot (See #8136) new 4705d3f Ajout toString sur SampleData new c09526f On ne peut supprimer que des observations qui ont une taille new d7ebcc4 Livrable #8136 Merge branch 'feature/8136' into develop The 4 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 d7ebcc4f08d0a53f07fe5c28c77d22d9b7a47c6e Merge: a22c103 c09526f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 12 07:09:08 2016 +0200 Livrable #8136 Merge branch 'feature/8136' into develop commit c09526f04d915ed6c3fda1c2461ae65b29a6efa8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 12 06:59:53 2016 +0200 On ne peut supprimer que des observations qui ont une taille commit 4705d3f8bfdf4eea32e38ff54155b5c7514c873f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 12 06:59:17 2016 +0200 Ajout toString sur SampleData commit 74e40d319b1fb95df74e3073ebecdd28456dbcb9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 12 06:58:27 2016 +0200 Utilisation du bon identifiant pour supprimer un lot (See #8136) Summary of changes: .../main/java/fr/ifremer/tutti/service/PersistenceService.java | 4 ++-- .../fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java | 4 ++-- .../tutti/service/sampling/CruiseSamplingInternalCache.java | 8 ++++++++ 3 files changed, 12 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch feature/8228 updated (31626fa -> acf08b3)
by codelutin.com scm April 12, 2016

April 12, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8228 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 31626fa Ne pas utiliser d'optional à tout bout de champ (maturityColumnId) + meilleure gestion generics new acf08b3 Fix npe quand recopie poids + suppression méthode inutile 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 acf08b39a69c8b984634c48c771782e3df363839 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 12 06:11:03 2016 +0200 Fix npe quand recopie poids + suppression méthode inutile Summary of changes: .../catches/species/frequency/SpeciesFrequencyUIHandler.java | 8 ++++---- .../catches/species/frequency/SpeciesFrequencyUIModel.java | 4 ---- 2 files changed, 4 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8228 updated (b615d8b -> 31626fa)
by codelutin.com scm April 12, 2016

April 12, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8228 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git omits b615d8b Ne pas utiliser d'optional à tout bout de champ (maturityColumnId) + meilleure gestion generics omits 826db36 Ne pas utiliser d'optional à tout bout de champ omits 0ce26f4 Ne pas utiliser d'optional à tout bout de champ zone omits e3ed1d7 Ne pas utiliser d'optional à tout bout de champ maturityQualitativeValue omits 7eed651 Ne pas utiliser d'optional à tout bout de champ (IndividualObservationUICache#samplingCache) omits 9199b1e Ne pas tenir compte de l'algorithme si 1/n vaut 0 ou à sexer mais observation sans sexe (See #8228) adds dd3e083 bien remplir le benthos avec le... benthos (See #8234) + nettoyage code adds 3227fb7 Livrable #8234 Merge branch 'feature/8234' into develop adds 0c1b909 Ajout toString to Caracteristic adds 26cc892 Bien conserver l'ordre sur les caractéristiques (see #8233) adds a700d11 Mettre à jour l'ordre des caractéristiques sur les actions ↑ et ↓ (See #8233) adds c21a13e Livrable #8233 Merge branch 'feature/8233' into develop adds 2ced35f Vérifier qu'on peut quitter l'écran des mensurations si on tente de quitter l'opération en cours (uniquement sur les actions de changement d'opération) (see #8221) adds 9a32cf3 Livrable #8221 Merge branch 'feature/8221' into develop adds e2b48fc Suppression du veto sur le changement de screen (cela n'intervient pas au bon moment et il y a déjà une API pour gérer ça) (See #8190) adds a22c103 Livrable #8190 Merge branch 'feature/8190' into develop new 1d55529 Ne pas tenir compte de l'algorithme si 1/n vaut 0 ou à sexer mais observation sans sexe (See #8228) new e2a1d8a Ne pas utiliser d'optional à tout bout de champ (IndividualObservationUICache#samplingCache) new 8776b3b Ne pas utiliser d'optional à tout bout de champ maturityQualitativeValue new 347a4fa Ne pas utiliser d'optional à tout bout de champ zone new b7e2fc7 Ne pas utiliser d'optional à tout bout de champ new 31626fa Ne pas utiliser d'optional à tout bout de champ (maturityColumnId) + meilleure gestion generics 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 (b615d8b) \ N -- N -- N refs/heads/feature/8228 (31626fa) 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. The 6 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 31626fad429660297ac14697db091aa3a3ee3a36 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 12 03:31:02 2016 +0200 Ne pas utiliser d'optional à tout bout de champ (maturityColumnId) + meilleure gestion generics commit b7e2fc78af4dc9412470fd7dde8f57201b212915 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 12 03:22:14 2016 +0200 Ne pas utiliser d'optional à tout bout de champ commit 347a4faabe72a31bde5fa33b67f2b7582036d6a8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 12 03:15:53 2016 +0200 Ne pas utiliser d'optional à tout bout de champ zone commit 8776b3b4321823a63670ba0580206b86e424d14e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 12 03:04:02 2016 +0200 Ne pas utiliser d'optional à tout bout de champ maturityQualitativeValue commit e2a1d8ad4c5c9e5fa8ea8ae9b6c3b4933356f6a6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 12 02:52:11 2016 +0200 Ne pas utiliser d'optional à tout bout de champ (IndividualObservationUICache#samplingCache) commit 1d555292a11f47709e3af0cc1f50f0a97162318e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 12 02:47:53 2016 +0200 Ne pas tenir compte de l'algorithme si 1/n vaut 0 ou à sexer mais observation sans sexe (See #8228) Summary of changes: .../entities/referential/CaracteristicBean.java | 21 ++++++++ .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 23 ++------- .../tutti/ui/swing/content/MainUIHandler.java | 56 ++++++++++------------ .../catches/actions/ComputeBatchWeightsAction.java | 35 +------------- .../frequency/SpeciesFrequencyUIHandler.java | 22 +-------- .../actions/EditFishingOperationAction.java | 31 ++++++++++++ .../content/protocol/EditProtocolUIHandler.java | 11 +++++ .../content/protocol/EditProtocolUIModel.java | 6 +-- .../MoveDownCaracteristicMappingAction.java | 8 ++-- .../actions/MoveUpCaracteristicMappingAction.java | 8 ++-- 10 files changed, 108 insertions(+), 113 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/CaracteristicBean.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6