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

branch develop updated (84f2b2d -> 06d4652)
by codelutin.com scm 25 Apr '16

25 Apr '16

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 84f2b2d [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 9a9ad6f Ne pas supprimer-ajouter le sampling si on fait cela déjà au niveau des observations (See #8274) new 06d4652 Livrable #8274 Merge branch 'feature/8274' into develop 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 06d4652fcc8f9dcac1271082aad6c31751b1b6fa Merge: 84f2b2d 9a9ad6f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 25 13:27:17 2016 +0200 Livrable #8274 Merge branch 'feature/8274' into develop commit 9a9ad6f9b83ce34f77cde5315f8c39bb2198729d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 25 13:27:15 2016 +0200 Ne pas supprimer-ajouter le sampling si on fait cela déjà au niveau des observations (See #8274) Summary of changes: .../frequency/IndividualObservationToSamplingCacheEngine.java | 6 ------ 1 file changed, 6 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch release/4.5-rc-5 deleted (was 7b4b579)
by codelutin.com scm 25 Apr '16

25 Apr '16

This is an automated email from the git hooks/post-receive script. New change to branch release/4.5-rc-5 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git was 7b4b579 [jgitflow-maven-plugin]updating poms for branch'release/4.5-rc-5' with non-snapshot versions 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

annotated tag tutti-4.5-rc-5 created (now 7bf0af9)
by codelutin.com scm 25 Apr '16

25 Apr '16

This is an automated email from the git hooks/post-receive script. New change to annotated tag tutti-4.5-rc-5 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at 7bf0af9 (tag) tagging e228463a410b92b472319458c1ad8bf77db3be17 (commit) replaces tutti-4.5-rc-4 tagged by Maven Release on Mon Apr 25 11:39:33 2016 +0200 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 4.5-rc-5 ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch release/4.5-rc-5 updated (f73378a -> 7b4b579)
by codelutin.com scm 25 Apr '16

25 Apr '16

This is an automated email from the git hooks/post-receive script. New change to branch release/4.5-rc-5 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from f73378a [jgitflow-maven-plugin]updating poms for 4.5-rc-5 branch with snapshot versions adds b918c8a Ajout entete de licenses adds 7b4b579 [jgitflow-maven-plugin]updating poms for branch'release/4.5-rc-5' with non-snapshot versions No new revisions were added by this update. Summary of changes: pom.xml | 2 +- tutti-caliper/pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../persistence/dao/referential/pmfm/PmfmId2.java | 24 ++++++++++++++++++++++ .../src/main/java/fr/ifremer/tutti/util/Units.java | 24 ++++++++++++++++++++++ tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/cruise/CruiseCache.java | 24 ++++++++++++++++++++++ .../tutti/service/cruise/CruiseCacheAble.java | 24 ++++++++++++++++++++++ ...cesSamplingAlgorithmEntryNotFoundException.java | 24 ++++++++++++++++++++++ .../IndividualObservationSamplingCacheRequest.java | 24 ++++++++++++++++++++++ .../IndividualObservationSamplingContext.java | 24 ++++++++++++++++++++++ .../IndividualObservationSamplingStatus.java | 24 ++++++++++++++++++++++ ...lObservationSamplingStatusExceptionSupport.java | 24 ++++++++++++++++++++++ .../tutti/service/sampling/SamplingCodeCache.java | 24 ++++++++++++++++++++++ ...NotDefinedOnIndividualObservationException.java | 24 ++++++++++++++++++++++ .../ZoneNotDefinedOnFishingOperationException.java | 24 ++++++++++++++++++++++ tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../filtered-resources/tutti-help-fr.properties | 23 +++++++++++++++++++++ .../frequency/AverageWeightsHistogramHandler.java | 24 ++++++++++++++++++++++ .../frequency/AverageWeightsHistogramModel.java | 24 ++++++++++++++++++++++ .../frequency/FrequenciesHistogramHandler.java | 24 ++++++++++++++++++++++ .../frequency/FrequenciesHistogramModel.java | 24 ++++++++++++++++++++++ .../IndividualObservationBatchRowState.java | 24 ++++++++++++++++++++++ .../IndividualObservationBatchTableHandler.java | 24 ++++++++++++++++++++++ .../IndividualObservationBatchUIModel.java | 24 ++++++++++++++++++++++ .../IndividualObservationToFrequencyEngine.java | 24 ++++++++++++++++++++++ ...IndividualObservationToSamplingCacheEngine.java | 24 ++++++++++++++++++++++ .../species/frequency/SamplingCodeUICache.java | 24 ++++++++++++++++++++++ .../frequency/SamplingNotificationZoneHandler.java | 24 ++++++++++++++++++++++ .../frequency/SamplingNotificationZoneModel.java | 24 ++++++++++++++++++++++ .../frequency/SamplingNotificationZoneStatus.java | 24 ++++++++++++++++++++++ 34 files changed, 631 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (c46a071 -> 84f2b2d)
by codelutin.com scm 25 Apr '16

25 Apr '16

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 c46a071 Amélioration du démarrage d'un chargement d'un trait new 8feb4a7 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds f73378a [jgitflow-maven-plugin]updating poms for 4.5-rc-5 branch with snapshot versions new b918c8a Ajout entete de licenses new 7b4b579 [jgitflow-maven-plugin]updating poms for branch'release/4.5-rc-5' with non-snapshot versions new e228463 [jgitflow-maven-plugin]merging 'release/4.5-rc-5' into 'master' new f0a2e7d [jgitflow-maven-plugin]merging 'master' into 'develop' new 84f2b2d [jgitflow-maven-plugin]Updating develop poms back to pre merge state 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 84f2b2da66e3fd776562fb10f9bf950cc5cd8beb Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Apr 25 11:39:35 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit f0a2e7d18c5345e85ea76763ae061d5b5e65f5d4 Merge: 8feb4a7 e228463 Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Apr 25 11:39:35 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 8feb4a7ed0967709a37872f51086fa58133f8205 Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Apr 25 11:39:35 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit e228463a410b92b472319458c1ad8bf77db3be17 Merge: 517e6bc 7b4b579 Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Apr 25 11:39:33 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.5-rc-5' into 'master' commit 7b4b579caab012b2d6208632bbcbb24202adb12f Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Apr 25 11:36:05 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.5-rc-5' with non-snapshot versions commit b918c8a41ffda940a6338e8659b83d10bfcaaf9f Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Apr 25 11:35:53 2016 +0200 Ajout entete de licenses Summary of changes: .../persistence/dao/referential/pmfm/PmfmId2.java | 24 ++++++++++++++++++++++ .../src/main/java/fr/ifremer/tutti/util/Units.java | 24 ++++++++++++++++++++++ .../ifremer/tutti/service/cruise/CruiseCache.java | 24 ++++++++++++++++++++++ .../tutti/service/cruise/CruiseCacheAble.java | 24 ++++++++++++++++++++++ ...cesSamplingAlgorithmEntryNotFoundException.java | 24 ++++++++++++++++++++++ .../IndividualObservationSamplingCacheRequest.java | 24 ++++++++++++++++++++++ .../IndividualObservationSamplingContext.java | 24 ++++++++++++++++++++++ .../IndividualObservationSamplingStatus.java | 24 ++++++++++++++++++++++ ...lObservationSamplingStatusExceptionSupport.java | 24 ++++++++++++++++++++++ .../tutti/service/sampling/SamplingCodeCache.java | 24 ++++++++++++++++++++++ ...NotDefinedOnIndividualObservationException.java | 24 ++++++++++++++++++++++ .../ZoneNotDefinedOnFishingOperationException.java | 24 ++++++++++++++++++++++ .../filtered-resources/tutti-help-fr.properties | 23 +++++++++++++++++++++ .../frequency/AverageWeightsHistogramHandler.java | 24 ++++++++++++++++++++++ .../frequency/AverageWeightsHistogramModel.java | 24 ++++++++++++++++++++++ .../frequency/FrequenciesHistogramHandler.java | 24 ++++++++++++++++++++++ .../frequency/FrequenciesHistogramModel.java | 24 ++++++++++++++++++++++ .../IndividualObservationBatchRowState.java | 24 ++++++++++++++++++++++ .../IndividualObservationBatchTableHandler.java | 24 ++++++++++++++++++++++ .../IndividualObservationBatchUIModel.java | 24 ++++++++++++++++++++++ .../IndividualObservationToFrequencyEngine.java | 24 ++++++++++++++++++++++ ...IndividualObservationToSamplingCacheEngine.java | 24 ++++++++++++++++++++++ .../species/frequency/SamplingCodeUICache.java | 24 ++++++++++++++++++++++ .../frequency/SamplingNotificationZoneHandler.java | 24 ++++++++++++++++++++++ .../frequency/SamplingNotificationZoneModel.java | 24 ++++++++++++++++++++++ .../frequency/SamplingNotificationZoneStatus.java | 24 ++++++++++++++++++++++ 26 files changed, 623 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

branch master updated (517e6bc -> e228463)
by codelutin.com scm 25 Apr '16

25 Apr '16

This is an automated email from the git hooks/post-receive script. New change to branch master in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 517e6bc [jgitflow-maven-plugin]merging 'release/4.5-rc-4' into 'master' adds 8524787 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 0b8733f [jgitflow-maven-plugin]merging 'master' into 'develop' adds 57a0d4e [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds fa6a082 Ajout de logs adds 1cde50e Sur l'écran d'édition pas de validateur à enregistrer adds 2aad139 Quand on quitte un écran, on nettoye les validateurs adds 1d6b0ed Mauvais flow, c'est pas faute de l'avoir dit pleins de fois... adds 1a78521 Ajout d'une classe pour gérer les unités adds 138580c Correction de l'apgorithme de comparaision de poids adds 278f703 En avant la musique... création de modèles et controleurs... adds 9844616 Réécriture de la logique du mode de recopie + continue le nettoyage du code adds e2b4392 Correction de l'unité utilisée pour le graphique des poids moyens adds 1028129 Introduction modele pour la partie observations individuelles + du menache adds 9b9430d Livrable #8245 Merge branch 'feature/8245' into develop adds 46f455d Correction d'un fire data sur le table model, why ? (See #8257) adds 72ccffb Amélioration code : on arrête de faire dix milles trucs en même temps : j'en ai maaaaaaaaaaare adds cf65593 Livrable #8257 Merge branch 'feature/8257' into develop adds c80d374 ajout toString adds c0998d6 Revue de l'API de cache pour avoir un cache de haut niveau sur les cruise puis des caches dédiés adds dbdef2d Revue du chargement des caches de campagne adds abb60a4 Utilisation des caches de campagnes adds b0e531f Livrable #8256 Merge branch 'feature/8256' into develop adds ca6413e Bien reporter le poids de sous-échantillon après un import (See #8248) adds e010538 Correction du chargement de l'écran des mensurations si pas de méthode de mensuration trouvée adds 22912b8 Livrable #8248 Merge branch 'feature/8248' into develop adds d0bfe06 Déplacement du cache de haut niveau dans un paquetage plus adapté + amélioration code dans le cache (côté ui) adds 2dad5f3 Revue de comment interroger le cache adds 2488271 Utilisation d'un nouvel handler pour gérer la zone de notification adds 9025fe4 Ajout d'états sur le cache d'ui adds e7dec7b Revue de la zone de notification adds 2ce988a Suppression des listeners sur le cache + revue du code du cache adds 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) adds 48d0e06 Revue du modèle de la zone de notification et de son handler adds e899b8a traduction perdue adds af55cbb Renommage méthode + suppression méthode non utilisée adds 7de63b3 Normalement on a le bon flow pour la rafraichissement de la zone de notification des prélèvements + nettoyage de code adds d8e5c5f Retour sur develop, car déjà trop de modifications... mais non fini Merge branch 'feature/revue_algorithme' into develop adds b65b154 si on modifie la catégorie vrac/hors vrac, on met à jour le compte de lots vrac/hors vrac (fixes #8255) adds eba83d2 Merge branch 'feature/8255' into 'develop' adds 3de3001 Fix npe... Refs #8263 adds 3886a2d Livrable #8263 Merge branch 'feature/8263' into develop adds efe729c Ne pas tenter de supprimer des lots déjà supprimés (See #8261) adds 4807b51 Livrable #8261 Merge branch 'feature/8261' into develop adds f6c2f9d Correction lors de l'import des mensurations en multi-poste (See #8249) adds 7ed9bfc Livrable #8249 Merge branch 'feature/8249' into develop adds 3191b67 Changement du message lors de l'erreur d'un import (See #8247) adds 524e139 Livrable #8247 Merge branch 'feature/8247' into develop adds 41feecb Ne plus cacher le status dans la zone de notification adds 72ca87d Ne plus conserver les états dans le modèle de zone de notification + renommage propriété adds c74e5c1 Si un des max est atteint on ne propose plus de prélever adds 8cd62f9 Amélioration des logs sur le cache adds 5f9e52e Introduction d'une requète sur le cache d'échantillons + amélioration du cache adds c316995 Utilisation de la requete sur le cache d'échantillon + continue à simplifier et assainir le code adds bac64af Fin du ménage même s'il reste encore des choses à revoir... adds 50f07c7 Retour sur develop pour intégrer les autres tickets avant release Merge branch 'feature/8242' into develop adds e2b2a0e Clean code adds 29ac08e Compacter la table des observations individuelles à l'ouverture de l'écran (See #8202) adds 03a5c31 Livrable #8202 Merge branch 'feature/8202' into develop adds c47e59e Revue du changement de mode de recopie adds 2b893cc renommage des classes de l'ichtyometre en vue de l'ajout de module du pied à coulisse, pour eviter les confusions (refs #7459) adds 70c6707 creation du module pour le pied à coulisse (caliper) (refs #7459) adds 5c79f17 implem de la réception des données du pied a coulisse (refs #7459) adds fa669e5 ajout de la conf du port série du pied a coulisse (refs #7459) adds 0ad86dc ajout de la connexion au pied à coulisse depuis l'appli (refs #7459) adds 1961579 lecture des données reçues sur le pied à coulisse (refs #7459) adds 6607ccd modif de la conif de port série : nombre au lieu de faire une liste des ports dispo (refs #7459) adds 6500c3c affichage du port série écouté dans la barre de statut (refs #7459) adds b8e1fa0 modif de l'icone du pied à coulisse (fixes #7459) adds 151e005 Fix import from merge adds 593e87e Meilleur gestion des dépendences adds 9e61304 Pouvoir éditer des int dans l'éditeur de configuration adds c8b8e53 Reformat code adds 01a9569 Meilleure gestion de l'erreur de connection au pied à coulisse (See #7459) adds 26cfd5f Bien fermer la connection au pied à coulisse lorsque l'on ferme le contexte applicatif adds faa62fe Livrable #7459 Merge branch 'feature/7459' into develop adds f1d0845 libération de listeners quand on quitte l'écran adds b780b8e Le sexe a changé... adds 820b1e5 il se peut que ni la taille, ni le poids n'ai changé adds 02f97ea Gestion de la nullité du quota dans l'algorithme adds 342d5b9 Bien recalculer le cache des échantillons lors d'un import multi-poste adds 068770c Corrections et améliorations diverses sur l'écran des observations individuelles adds 5e7552f Suppression des bons lots adds 6e821cb Correction de la suppression d'une opération de pêche dans le cache des échantillons adds fba0a6a Mieux recharger l'opération dans le contexte de données adds 0b290b1 Ajout de plus de logs suite à la suppression d'une opération dans le cache adds 5dbc8d1 Ajout d'une méthode pour nettoyer les caches (supprimer les clefs vides) + afficher les caches adds 95043cf A la sauvegarde d'une opération, on doit rafraîchir le contexte de données adds 8a3df5d Envoyer un signal quand l'opération est rechargée adds 1f4faad Bien recharger l'opération de pêche lorsqu'elle change dans le contexte de données adds 30b65be Intrudcion PmfmId2 et renommahe de certainnes méthodes (See #8270) adds 06aefae Livrable #8270 Merge branch 'feature/8270' into develop adds c46a071 Amélioration du démarrage d'un chargement d'un trait adds f73378a [jgitflow-maven-plugin]updating poms for 4.5-rc-5 branch with snapshot versions adds b918c8a Ajout entete de licenses adds 7b4b579 [jgitflow-maven-plugin]updating poms for branch'release/4.5-rc-5' with non-snapshot versions adds e228463 [jgitflow-maven-plugin]merging 'release/4.5-rc-5' into 'master' No new revisions were added by this update. Summary of changes: pom.xml | 10 +- {tutti-ui-swing => tutti-caliper}/LICENSE.txt | 0 {tutti-ui-swing => tutti-caliper}/README.md | 0 {tutti-ui-swing-updater => tutti-caliper}/pom.xml | 80 +- .../caliper/feed/CaliperConnectionException.java | 15 +- .../tutti/caliper/feed/CaliperFeedReader.java | 206 +++ .../caliper/feed/event/CaliperFeedReaderEvent.java | 24 +- .../feed/event/CaliperFeedReaderListener.java | 14 +- .../record/CaliperFeedReaderMeasureRecord.java | 19 +- .../record/CaliperFeedReaderRecordFactory.java | 42 +- .../record/CaliperFeedReaderRecordSupport.java | 13 +- tutti-ichtyometer/pom.xml | 2 +- ...{FeedReader.java => IchtyometerFeedReader.java} | 46 +- ...rEvent.java => IchtyometerFeedReaderEvent.java} | 16 +- ...ner.java => IchtyometerFeedReaderListener.java} | 4 +- ...ava => IchtyometerFeedReaderMeasureRecord.java} | 4 +- ...ava => IchtyometerFeedReaderRecordFactory.java} | 26 +- ...ava => IchtyometerFeedReaderRecordSupport.java} | 4 +- ...> IchtyometerFeedReaderStylusMotionRecord.java} | 4 +- .../tutti/ichtyometer/tool/FeedReaderTool.java | 8 +- ...derTest.java => IchtyometerFeedReaderTest.java} | 10 +- tutti-persistence/pom.xml | 2 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 28 +- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 31 +- .../tutti/persistence/TuttiPersistenceImpl.java | 4 +- .../persistence/TuttiPersistenceNoDbImpl.java | 2 +- .../persistence/dao/referential/pmfm/PmfmId2.java | 192 +++ .../entities/data/FishingOperationBean.java | 14 +- .../entities/referential/TaxonCache.java | 3 + .../CaracteristicPersistenceService.java | 10 +- .../CaracteristicPersistenceServiceImpl.java | 15 +- .../java/fr/ifremer/tutti/type/WeightUnit.java | 15 +- .../main/java/fr/ifremer/tutti/util/Numbers.java | 14 +- .../protocol/Rtps.java => util/Units.java} | 17 +- .../i18n/tutti-persistence_en_GB.properties | 11 + .../i18n/tutti-persistence_fr_FR.properties | 16 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/PersistenceService.java | 141 +- .../fr/ifremer/tutti/service/TuttiDataContext.java | 224 ++- .../catches/multipost/MultiPostImportService.java | 20 +- .../ifremer/tutti/service/cruise/CruiseCache.java | 167 +++ .../tutti/service/cruise/CruiseCacheAble.java | 70 + .../tutti/service/cruise/CruiseCacheLoader.java | 151 ++ .../cps/CalcifiedPiecesSamplingExportService.java | 39 +- ...esSamplingAlgorithmEntryNotFoundException.java} | 18 +- .../service/sampling/CruiseSamplingCache.java | 985 ++++++------- .../sampling/CruiseSamplingCacheLoader.java | 156 --- .../sampling/CruiseSamplingInternalCache.java | 223 ++- .../IndividualObservationSamplingCacheRequest.java | 128 ++ .../IndividualObservationSamplingContext.java | 172 +++ .../IndividualObservationSamplingStatus.java | 216 +++ ...ObservationSamplingStatusExceptionSupport.java} | 29 +- .../tutti/service/sampling/SamplingCodeCache.java | 138 ++ .../tutti/service/sampling/SamplingEvent.java | 105 -- ...otDefinedOnIndividualObservationException.java} | 18 +- ...ZoneNotDefinedOnFishingOperationException.java} | 18 +- .../resources/i18n/tutti-service_en_GB.properties | 127 -- .../resources/i18n/tutti-service_fr_FR.properties | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 7 +- .../filtered-resources/tutti-help-fr.properties | 5 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 54 +- .../fr/ifremer/tutti/ui/swing/content/MainUI.jaxx | 3 + .../fr/ifremer/tutti/ui/swing/content/MainUI.jcss | 30 + .../tutti/ui/swing/content/MainUIHandler.java | 31 +- .../content/actions/ConnectCaliperAction.java | 74 + .../content/actions/ConnectIchtyometerAction.java | 6 +- ...terAction.java => DisconnectCaliperAction.java} | 22 +- .../actions/DisconnectIchtyometerAction.java | 4 +- .../content/actions/EditCatchesSupportAction.java | 66 +- .../swing/content/config/TuttiConfigUIHandler.java | 58 +- .../content/cruise/actions/SaveCruiseAction.java | 7 +- .../CalcifiedPiecesSamplingReportAction.java | 30 +- .../accidental/AccidentalBatchUIHandler.java | 2 +- .../SamplingCodeCellEditor.java | 40 +- .../catches/species/BenthosBatchUISupportImpl.java | 10 + .../species/EditSpeciesBatchPanelUIHandler.java | 19 +- .../catches/species/SpeciesBatchUISupportImpl.java | 9 + .../species/SpeciesOrBenthosBatchUISupport.java | 3 + .../create/CreateSpeciesBatchUIHandler.java | 2 + .../catches/species/edit/SpeciesBatchRowModel.java | 2 +- .../species/edit/SpeciesBatchUIHandler.java | 3 +- .../ChangeSpeciesBatchSampleCategoryAction.java | 22 +- .../edit/actions/RemoveSpeciesBatchAction.java | 14 +- .../edit/actions/RemoveSpeciesSubBatchAction.java | 6 +- .../frequency/AverageWeightsHistogramHandler.java | 180 +++ .../frequency/AverageWeightsHistogramModel.java | 141 ++ .../frequency/FrequenciesHistogramHandler.java | 188 +++ .../frequency/FrequenciesHistogramModel.java | 131 ++ .../IndividualObservationBatchRowModel.java | 53 +- .../IndividualObservationBatchRowState.java | 119 ++ .../IndividualObservationBatchTableHandler.java | 667 +++++++++ .../IndividualObservationBatchTableModel.java | 174 ++- .../IndividualObservationBatchUIModel.java | 301 ++++ .../IndividualObservationToFrequencyEngine.java | 260 ++++ ...IndividualObservationToSamplingCacheEngine.java | 143 ++ .../frequency/IndividualObservationUICache.java | 493 ++----- .../species/frequency/SamplingCodeUICache.java | 254 ++++ .../frequency/SamplingNotificationZoneHandler.java | 447 ++++++ .../frequency/SamplingNotificationZoneModel.java | 71 + .../SamplingNotificationZoneStatus.java} | 35 +- .../frequency/SpeciesFrequencyCellComponent.java | 12 +- .../frequency/SpeciesFrequencyLogRowModel.java | 1 - .../frequency/SpeciesFrequencyRowModel.java | 4 + .../frequency/SpeciesFrequencyTableModel.java | 518 ++++--- .../species/frequency/SpeciesFrequencyUI.jaxx | 8 +- .../species/frequency/SpeciesFrequencyUI.jcss | 4 - .../frequency/SpeciesFrequencyUIHandler.java | 1450 ++++++-------------- .../species/frequency/SpeciesFrequencyUIModel.java | 639 +++------ .../actions/ApplySpeciesFrequencyRafaleAction.java | 81 +- .../actions/CancelEditSpeciesFrequencyAction.java | 18 +- .../frequency/actions/DeleteSampleCodeAction.java | 4 +- .../DeleteSpeciesFrequencyLogRowAction.java | 2 +- .../frequency/actions/EditSampleCodeAction.java | 71 +- .../GenerateSpeciesFrequencyLengthStepsAction.java | 59 +- .../ImportMultiPostSpeciesSupportAction.java | 96 +- .../frequency/actions/RemoveObservationAction.java | 26 +- .../actions/ResetSpeciesFrequencyAction.java | 13 +- .../species/split/SplitSpeciesBatchUIHandler.java | 2 + .../actions/SaveFishingOperationAction.java | 102 +- .../content/protocol/EditProtocolUIModel.java | 4 +- .../protocol/actions/SaveProtocolAction.java | 6 +- .../ifremer/tutti/ui/swing/util/SoundEngine.java | 18 +- .../util/table/AbstractTuttiTableUIModel.java | 14 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 59 +- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 49 +- .../main/resources/icons/action-caliper-down.png | Bin 0 -> 426 bytes .../src/main/resources/icons/action-caliper-up.png | Bin 0 -> 436 bytes .../fr/ifremer/tutti/ui/swing/SoundUtilTest.java | 19 +- 130 files changed, 7353 insertions(+), 4186 deletions(-) copy {tutti-ui-swing => tutti-caliper}/LICENSE.txt (100%) copy {tutti-ui-swing => tutti-caliper}/README.md (100%) copy {tutti-ui-swing-updater => tutti-caliper}/pom.xml (51%) copy tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/SamplingListener.java => tutti-caliper/src/main/java/fr/ifremer/tutti/caliper/feed/CaliperConnectionException.java (76%) create mode 100644 tutti-caliper/src/main/java/fr/ifremer/tutti/caliper/feed/CaliperFeedReader.java copy tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/event/FeedReaderEvent.java => tutti-caliper/src/main/java/fr/ifremer/tutti/caliper/feed/event/CaliperFeedReaderEvent.java (61%) copy tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/event/FeedReaderListener.java => tutti-caliper/src/main/java/fr/ifremer/tutti/caliper/feed/event/CaliperFeedReaderListener.java (76%) copy tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderMeasureRecord.java => tutti-caliper/src/main/java/fr/ifremer/tutti/caliper/feed/record/CaliperFeedReaderMeasureRecord.java (78%) copy tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderRecordFactory.java => tutti-caliper/src/main/java/fr/ifremer/tutti/caliper/feed/record/CaliperFeedReaderRecordFactory.java (51%) copy tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderRecordSupport.java => tutti-caliper/src/main/java/fr/ifremer/tutti/caliper/feed/record/CaliperFeedReaderRecordSupport.java (82%) rename tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/{FeedReader.java => IchtyometerFeedReader.java} (73%) rename tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/event/{FeedReaderEvent.java => IchtyometerFeedReaderEvent.java} (66%) rename tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/event/{FeedReaderListener.java => IchtyometerFeedReaderListener.java} (89%) rename tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/{FeedReaderMeasureRecord.java => IchtyometerFeedReaderMeasureRecord.java} (93%) rename tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/{FeedReaderRecordFactory.java => IchtyometerFeedReaderRecordFactory.java} (65%) rename tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/{FeedReaderRecordSupport.java => IchtyometerFeedReaderRecordSupport.java} (91%) rename tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/{FeedReaderStylusMotionRecord.java => IchtyometerFeedReaderStylusMotionRecord.java} (92%) rename tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/{FeedReaderTest.java => IchtyometerFeedReaderTest.java} (81%) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/dao/referential/pmfm/PmfmId2.java copy tutti-persistence/src/main/java/fr/ifremer/tutti/{persistence/entities/protocol/Rtps.java => util/Units.java} (76%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/cruise/CruiseCache.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/cruise/CruiseCacheAble.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/cruise/CruiseCacheLoader.java copy tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/{SamplingListener.java => CalcifiedPiecesSamplingAlgorithmEntryNotFoundException.java} (62%) delete mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingCacheLoader.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/IndividualObservationSamplingCacheRequest.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 copy tutti-service/src/main/java/fr/ifremer/tutti/service/{operationimport/ImportFromColumnFileInvalidRowException.java => sampling/IndividualObservationSamplingStatusExceptionSupport.java} (53%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/SamplingCodeCache.java delete mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/SamplingEvent.java copy tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/{SamplingListener.java => SizeNotDefinedOnIndividualObservationException.java} (65%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/{SamplingListener.java => ZoneNotDefinedOnFishingOperationException.java} (64%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ConnectCaliperAction.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/{DisconnectIchtyometerAction.java => DisconnectCaliperAction.java} (65%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/AverageWeightsHistogramHandler.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/AverageWeightsHistogramModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/FrequenciesHistogramHandler.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/FrequenciesHistogramModel.java rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{individualobservation => species/frequency}/IndividualObservationBatchRowModel.java (92%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationBatchRowState.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationBatchTableHandler.java rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{individualobservation => species/frequency}/IndividualObservationBatchTableModel.java (63%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationBatchUIModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationToFrequencyEngine.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationToSamplingCacheEngine.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SamplingCodeUICache.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 copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{edit/actions/ImportPupitriPopupCancelAction.java => frequency/SamplingNotificationZoneStatus.java} (54%) create mode 100644 tutti-ui-swing/src/main/resources/icons/action-caliper-down.png create mode 100644 tutti-ui-swing/src/main/resources/icons/action-caliper-up.png -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

[ANN] - Tutti 4.5-rc-5 released
by codelutin.com Release Notification 25 Apr '16

25 Apr '16

The Tutti team is pleased to announce the tutti-4.5-rc-5 release! Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques. Documentation of the project can be found here: http://tutti.codelutin.com Changes ------- Changes in this version include: New features: o Mise en place des bon pmfms Issue: 8270. Thanks to Tony Chemit. Resolved by tchemit. Fixed Bugs: o [TECHN] sur campagne nouvelle, à la première création d'un trait, enregistrement impossible (bouton enregistrer n es'active pas) Issue: 8240. Thanks to Vincent BADTS. Resolved by tchemit. o [ALGORITHME] l'algo demande de toujours prélever Issue: 8243. Thanks to Vincent BADTS. Resolved by tchemit. o [ERGO] touche entrée ou flêches comportement bizarre sur tableau mensurations Issue: 8257. Thanks to Vincent BADTS. Resolved by vbadts. o [OBSERVATIONS INDIVIDUELLES] le code prélèvement ne s'incrémente pas si l'algo de prelèvement n'est pas activé Issue: 8256. Thanks to Vincent BADTS. Resolved by tchemit. o [OBSERVATIONS INDIVIDUELLES] "poids total" dans mensuration supprimer à l'import des observations individuelles Issue: 8248. Thanks to Vincent BADTS. Resolved by tchemit. o [CAPTURE] si modification Hors Vrac en Vrac dans écran espèce, il ne met pas à jour le nombre de taxon dans l'onglet résumé Issue: 8255. Thanks to Vincent BADTS. Resolved by tchemit. o [IMPORT] j'importe des lots + mensurations + observations indiv depuis l'écran espèces. j'ouvre l'écran mensuration du lot importé, je suis en mode tout, mais le tableau des mesnurations est vide Issue: 8249. Thanks to Vincent BADTS. Resolved by tchemit. o [OBSERVATIONS INDIVIDUELLES] j'ai supprimé les lignes non valides pour pouvoir enregsitrer en mode tout mais visiblement il n'a pas détecté la suppression des lignes Issue: 8245. Thanks to Vincent BADTS. Resolved by tchemit. o [OBSERVATIONS INDIVIDUELLES] le message d'ereur doit être modifié si on essaye d'importer des observations individuelles provenants d'un autre trait ou si la catégorisation ne match pas Issue: 8247. Thanks to Vincent BADTS. Resolved by tchemit. o [OBSERVATIONS INDIVIDUELLES] je n'arrive pas à supprimer des observations individuelles Issue: 8246. Thanks to Vincent BADTS. Resolved by tchemit. o [CAPTURE] erreur en voulant supprimer des lots sur onglet espèces après import bigfin Issue: 8261. Thanks to Vincent BADTS. Resolved by tchemit. o [REFERENTIEL] disparition d'un PSFM dans l'onglet maturité Issue: 8264. Thanks to Vincent BADTS. Resolved by tchemit. o [PROTOCOLE] impossible de créer un protocole sans échelle de maturité Issue: 8263. Thanks to Vincent BADTS. Resolved by tchemit. o [TECHN] erreur en installant un nouveau tutti Issue: 8266. Thanks to Vincent BADTS. Resolved by tchemit. o [CAMPAGNE] erreur en voulant modifier le navire de la campagne Issue: 8260. Thanks to Vincent BADTS. Resolved by tchemit. o [ERGO] non conservation des choix d'organisation des écrans quand on navigue dans les différents écrans Issue: 8202. Thanks to Vincent BADTS. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: https://forge.codelutin.com/projects/tutti/files * tutti-ichtyometer-4.5-rc-5-tools.zip - https://forge.codelutin.com/attachments/download/3896 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Tutti team

1 0

branch release/4.5-rc-5 created (now f73378a)
by codelutin.com scm 25 Apr '16

25 Apr '16

This is an automated email from the git hooks/post-receive script. New change to branch release/4.5-rc-5 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at f73378a [jgitflow-maven-plugin]updating poms for 4.5-rc-5 branch with snapshot versions This branch includes the following new commits: new f73378a [jgitflow-maven-plugin]updating poms for 4.5-rc-5 branch with snapshot versions 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 f73378a97aaa6aebd99fc7adab678645b9fbe907 Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Apr 25 11:29:41 2016 +0200 [jgitflow-maven-plugin]updating poms for 4.5-rc-5 branch with snapshot versions -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (06aefae -> c46a071)
by codelutin.com scm 25 Apr '16

25 Apr '16

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(a)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(a)codelutin.com>.

1 1

branch develop updated (1f4faad -> 06aefae)
by codelutin.com scm 25 Apr '16

25 Apr '16

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 1f4faad Bien recharger l'opération de pêche lorsqu'elle change dans le contexte de données new 30b65be Intrudcion PmfmId2 et renommahe de certainnes méthodes (See #8270) new 06aefae Livrable #8270 Merge branch 'feature/8270' into develop 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 06aefae6b9904ebb306be25083a360c27d15de1b Merge: 1f4faad 30b65be Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 25 10:17:59 2016 +0200 Livrable #8270 Merge branch 'feature/8270' into develop commit 30b65be57dcc05c15c8c28babe0f3e3a3da7c217 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 25 10:17:55 2016 +0200 Intrudcion PmfmId2 et renommahe de certainnes méthodes (See #8270) Summary of changes: .../tutti/persistence/TuttiPersistenceImpl.java | 4 +- .../persistence/TuttiPersistenceNoDbImpl.java | 2 +- .../persistence/dao/referential/pmfm/PmfmId2.java | 168 +++++++++++++++++++++ .../CaracteristicPersistenceService.java | 10 +- .../CaracteristicPersistenceServiceImpl.java | 15 +- .../i18n/tutti-persistence_en_GB.properties | 3 + .../i18n/tutti-persistence_fr_FR.properties | 3 + .../ifremer/tutti/service/PersistenceService.java | 4 +- .../fr/ifremer/tutti/service/TuttiDataContext.java | 2 +- 9 files changed, 190 insertions(+), 21 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/dao/referential/pmfm/PmfmId2.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2