This is an automated email from the git hooks/post-receive script. New change to branch feature/8255 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git omits 7533282 si on modifie la catégorie vrac/hors vrac, on met à jour le compte de lots vrac/hors vrac (fixes #8255) new d0bfe06 Déplacement du cache de haut niveau dans un paquetage plus adapté + amélioration code dans le cache (côté ui) new 2dad5f3 Revue de comment interroger le cache new 2488271 Utilisation d'un nouvel handler pour gérer la zone de notification new 9025fe4 Ajout d'états sur le cache d'ui new e7dec7b Revue de la zone de notification new 2ce988a Suppression des listeners sur le cache + revue du code du cache new 41059a9 Suppression du statut de la ligne d'une observation (cela pose des problème sur la sélection dans par exemple l'éditeur des code de prélèvement qui se déclanche avant que la ligne soit sélectionnée) new 48d0e06 Revue du modèle de la zone de notification et de son handler new e899b8a traduction perdue new af55cbb Renommage méthode + suppression méthode non utilisée new 7de63b3 Normalement on a le bon flow pour la rafraichissement de la zone de notification des prélèvements + nettoyage de code new d8e5c5f Retour sur develop, car déjà trop de modifications... mais non fini Merge branch 'feature/revue_algorithme' into develop new b65b154 si on modifie la catégorie vrac/hors vrac, on met à jour le compte de lots vrac/hors vrac (fixes #8255) 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 (7533282) \ N -- N -- N refs/heads/feature/8255 (b65b154) 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 13 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 b65b154735aac2c7deb1ab7c466f4e39d342a072 Author: Kevin Morin <morin@codelutin.com> Date: Tue Apr 19 10:28:01 2016 +0200 si on modifie la catégorie vrac/hors vrac, on met à jour le compte de lots vrac/hors vrac (fixes #8255) commit d8e5c5f190c3f7a934c278adce1ac24b30c46ffd Merge: 22912b8 7de63b3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 20 02:39:33 2016 +0200 Retour sur develop, car déjà trop de modifications... mais non fini Merge branch 'feature/revue_algorithme' into develop commit 7de63b3196d6cab28a601e6d1d7cfd88b589b0b6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 20 02:27:52 2016 +0200 Normalement on a le bon flow pour la rafraichissement de la zone de notification des prélèvements + nettoyage de code commit af55cbb697ba72eda6aafeef1e2a769230855b46 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 20 02:17:38 2016 +0200 Renommage méthode + suppression méthode non utilisée commit e899b8ab8b822120a6c46d62938d24f881c3ef9f Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 20 02:17:14 2016 +0200 traduction perdue commit 48d0e067104b56a4afa32d552e77d17f264dcf71 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 20 02:16:51 2016 +0200 Revue du modèle de la zone de notification et de son handler commit 41059a9cd2a86b5359d3715376f7899125a0aa23 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 20 02:15:11 2016 +0200 Suppression du statut de la ligne d'une observation (cela pose des problème sur la sélection dans par exemple l'éditeur des code de prélèvement qui se déclanche avant que la ligne soit sélectionnée) commit 2ce988a985c99d24a6a35772bd7dadb57a53b314 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 20 02:14:13 2016 +0200 Suppression des listeners sur le cache + revue du code du cache commit e7dec7b3385ffdb9537990bd65767a1ec9bf95bd Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 19 15:16:27 2016 +0200 Revue de la zone de notification commit 9025fe4882840061fa5b88291dc4a25a59f61d98 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 19 15:16:15 2016 +0200 Ajout d'états sur le cache d'ui commit 2488271da21803a1723b47c1f907c7963cad1749 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 19 10:53:45 2016 +0200 Utilisation d'un nouvel handler pour gérer la zone de notification commit 2dad5f37f58930d5fb512d9a4325c2b5304d647a Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 19 10:50:16 2016 +0200 Revue de comment interroger le cache commit d0bfe0616ac5a7dd3620d00d59de2c7a770511d3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 18 11:05:24 2016 +0200 Déplacement du cache de haut niveau dans un paquetage plus adapté + amélioration code dans le cache (côté ui) Summary of changes: .../ifremer/tutti/service/PersistenceService.java | 4 +- .../fr/ifremer/tutti/service/TuttiDataContext.java | 4 +- .../service/{sampling => cruise}/CruiseCache.java | 4 +- .../{sampling => cruise}/CruiseCacheAble.java | 2 +- .../{sampling => cruise}/CruiseCacheLoader.java | 4 +- .../cps/CalcifiedPiecesSamplingExportService.java | 2 +- ...cesSamplingAlgorithmEntryNotFoundException.java | 17 + .../service/sampling/CruiseSamplingCache.java | 611 ++++++++++----------- .../sampling/CruiseSamplingInternalCache.java | 147 ++--- .../IndividualObservationSamplingContext.java | 148 +++++ .../IndividualObservationSamplingStatus.java | 140 +++++ ...lObservationSamplingStatusExceptionSupport.java | 29 + .../tutti/service/sampling/SamplingCodeCache.java | 1 + .../tutti/service/sampling/SamplingEvent.java | 105 ---- .../tutti/service/sampling/SamplingListener.java | 39 -- ...NotDefinedOnIndividualObservationException.java | 17 + .../ZoneNotDefinedOnFishingOperationException.java | 17 + .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 2 +- .../content/actions/EditCatchesSupportAction.java | 2 +- .../CalcifiedPiecesSamplingReportAction.java | 2 +- .../SamplingCodeCellEditor.java | 2 +- .../IndividualObservationBatchTableHandler.java | 141 +---- .../IndividualObservationBatchUIModel.java | 7 + .../frequency/IndividualObservationUICache.java | 220 +++----- .../frequency/SamplingNotificationZoneHandler.java | 331 +++++++++++ .../frequency/SamplingNotificationZoneModel.java | 56 ++ .../frequency/SamplingNotificationZoneStatus.java | 15 + .../species/frequency/SpeciesFrequencyUI.jcss | 4 - .../frequency/SpeciesFrequencyUIHandler.java | 14 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 +- 31 files changed, 1252 insertions(+), 838 deletions(-) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{sampling => cruise}/CruiseCache.java (96%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{sampling => cruise}/CruiseCacheAble.java (97%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{sampling => cruise}/CruiseCacheLoader.java (97%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CalcifiedPiecesSamplingAlgorithmEntryNotFoundException.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/IndividualObservationSamplingContext.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/IndividualObservationSamplingStatus.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/IndividualObservationSamplingStatusExceptionSupport.java delete mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/SamplingEvent.java delete mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/SamplingListener.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/SizeNotDefinedOnIndividualObservationException.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/ZoneNotDefinedOnFishingOperationException.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SamplingNotificationZoneHandler.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SamplingNotificationZoneModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SamplingNotificationZoneStatus.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.