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

branch master updated (1c18a9e -> 43e9096)
by codelutin.com scm 25 Feb '16

25 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch master in repository tutti. See http://git.codelutin.com/tutti.git from 1c18a9e [jgitflow-maven-plugin]merging 'release/4.4' into 'master' adds 98595e5 [jgitflow-maven-plugin]updating poms for 4.5-SNAPSHOT development adds 17ca764 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 517f70b [jgitflow-maven-plugin]merging 'master' into 'develop' adds 833a487 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 3f9804c Mise à jour du README.txt adds 563275f Move to https adds 3183565 Quelques modifications et mises à jour sur les spécifications (See #7656) adds 3360e0b Ajout de toutes les requêtes manquantes dans les spécifications et nommage de le fichier de requêtes de l'application (See #7656) adds 371252b Ajout de la nouvelle option de configuration de lecture d'unité dans les specs (See #7656) adds f8377e1 Merge branch 'feature/7656' into 'develop' adds 37f2cd2 Version 0.7 des spécifications adds 17b3ba9 Finalisation spécifications 0.7 adds 9e12ae7 use java 1.8 adds f9805f5 ajout des zones au protocole (refs #7929) adds db167a0 ajout de l'onglet d'édition des zone (refs #7929) adds d2472af mise a jour suite aux modifs du modele + appel des oncloseui des sous-ui (refs #7929) adds faa68be noeuds + renderer + modeles d'arbre + modele de zone (refs #7929) adds 4bc97c5 creation de zones + déplacement des noeuds (refs #7929) adds 4bfd27e création des modeles de strates et sous strates (refs #7929) adds 44cb2a5 ajout des listeners sur les strates et sous strates (refs #7929) adds a72750c suprpession des sous strates d'une zone (refs #7929) adds 43a38d2 ajout des icones + tri des noeuds dans les arbres (refs #7929) adds 4d395fa sauvegarde du protocol (refs #7929) adds 35f03ac on pousse les zones dans le modele de protocole (peut etre faire l'inverse...) (refs #7929) adds 7c0bfbe - ajout de la suppression de zone - probleme de rechargement de l'arbre quand on cache la racine - sélection de la zone créée (refs #7929) adds 5763e70 tri des noeuds + i18n (refs #7929) adds b42e6c6 utilisation de fromEntity et toEntity au lieu de fromBean et toBean adds 8c086d3 - utilisation directement du modele du protocol - ajout d'une popup de menu pour surrpimer et renommer les zones (refs #7929) adds 48df60e activation ou non des boutons d'ajout et de suppresion des strates (refs #7929) adds 0d628cb desactivation des boutons d'ajout et de suppression des strates à l'ouverture de l'écran (refs #7929) adds 5927e49 Merge de modèle adds a219dd7 ajout des libellé sur les racines des arbres (refs #7929) adds ccbed17 inversion des 2 arbres (refs #7929) adds 132e60c expand nodes when children are inserted (refs #7929) adds 793f199 Pouvoir ajouter/supprimer en utilisant un double click ou la touche entrée (See #7929) adds 2ab86d0 Fixes #7929 Merge branch 'feature/7929_editeur_de_zone' into develop adds 9c8dc7b Correction de la taille des boutons (See #7971) adds 46082fc Correction d'un binding qui ne fonctionnait plus... adds 88ff745 on ne fait pas la valeur absolue de la coordonnées (fixes #7984) adds 98ff50b Fixes #7984 Merge branch 'feature/7984' into develop adds 61f7549 ajout d'un event quand une ligne est sauvée, pour mettre à jour la liste des validations quand on modifie une ligne (fixes #7972) adds 59151a3 le BatchSavedEvent étend EventObject refs #7972 adds 0a35f40 Surcharge de la méthode getSource adds 146fa6f Et les listeners doivent étendre EventListener... adds fd17dbf Fixes #7972 Merge branch 'feature/7972' into develop adds 5d7769f creation de l'onglet d'edition de l'algo de prelevement de pieces calcifiees (refs #7930) adds 23661cf combo de selection de l'espece + ajout de lignes dans le tableau + possibilité de splitter une ligne (refs #7930) adds fe785f8 Fin de merge depuis develop adds b6d0e4c Ajout de la propriété programId sur le modèle d'un protocole (sert à filtrer les protocole d'une série de campagne) adds c153564 Ajout d'une méthode de persistence pour ne récupérer que les protocoles d'une série de campagne adds 384ff90 Filtrer les protocoles par série de campagne adds 6d43c7a Charger le modèle des strates dispnibles plus haut + ne pas reproposer à la sélection des strates et sous-strates déjà dans le protocole adds 4f565d3 Ajout d'une propriété pour utiliser le prélèvement des pièces calcifiées, et utilisation dans l'éditeur de protocole adds a82e69b - ajout des lignes mature et immatue si la case maturité est cochee - renderer des maturités - cellule de min size 0 non editable - ajout de la suppression des lignes d'une espèce refs #7930 adds ad17e2a - ajout de la suppression d'une ligne - activation/descativation des menus - validation de ce que l'utilisateur entre comme taille minimale dans la popup refs #7930 adds 403709b fix build (refs #7930) adds e63dfae - symbole infini au lieu de null - validation de la taille minquand on clique sur entrée refs #7930 adds d81f2e5 ajout des libellés des menus refs #7930 adds 57296e7 - ajout des autres colonnes - modification de la taille max de la ligne précédente quand on modifie la taille min refs #7930 adds fb4a47a test de la nouvelle valeur de min size refs #7930 adds 3aaa5b7 - modification de la prise en compte du sexe pour toutes les lignes d'une meme espece - correction du tri des espèces refs #7930 adds c9daf39 - persistence - chargement des lignes existantes - chargement de la combo des especes avec les especes du protocole (especes et benthos) refs #7930 adds 273bcf8 - ajout des listener à l'initialisation de la liste des lignes - ajout de la modif du model quand on modifie une ligne refs #7930 adds 4bffb23 suppression des lignes des expèces supprimés depuis les onglets especes et benthos fixes #7930 adds 83955d6 erreur lors du premier ajout dans la liste (refs #7930) adds b786a8b suppressiondans la combo des espèces déjà présentes dans le tableau (refs #7930) adds 5b79421 decoration de l'intervalle(refs #7930) adds f4296c9 message de confirmation de suppression d'une espèce du protocole si elle est dans le tableau (refs #7930) adds a03682d correction de la validité de la taille min (refs #7930) adds 0b4774a NPE lors de la création d'un nouveau protocol adds ae3f589 Meilleure chargement de la liste des espèces pour l'onglet des pièces calcifiées + lambda power adds 51a31e3 ajout de l'import export (refs #7930) adds 08f99eb Fixes #7930 Merge branch 'feature/7930' into develop adds 4ff1062 Simplification du code de calcul du raising factor final adds e5b5506 Ajout d'un test pour vérifier le calcul du raising factor final adds b68bfe7 Ajout méthode pour récupérer la dernière catégorie renseignée adds 8521235 Utilisation des bonnes catégories pour compléter le sampleWeight (utilisé pour le calcul du raising factor final) adds 1fe175a Fixes #7992 Merge branch 'feature/7992_erreur_calcul_coef_final' into develop adds fad5ce9 Utilisation des bonnes catégories pour compléter le sampleWeight (utilisé pour le calcul du raising factor final) adds c413e57 on ne pousse que les heures et les minutes quand on appelle set...Time (fixes #7996) adds 36d483b Fixes #7996 Merge branch 'feature/7996' into develop adds 39656ac Use pom 7-SNAPSHOT adds 463a07a Début de correction mais il me faut une confirmation de Vincent sur le sujet adds c796f8c Fix test values adds dee8e16 Ajout de nouveaux tests sur le calcul du RF final adds 3f598ad Bien tenir compte de la sous fraction dans le cas de mensurations s'il y a un sous-échantillonage (See #8014) adds f5449e2 Merge branch 'feature/8014' into 'develop' adds 85b0363 Use codelutinpom 7 adds caa6781 Do not use https for project url adds ca7d26b Mise à jour du guide utilisateur adds 27ed7e0 3. ajouter colonne « observations individuelles ». Cette case ne peut être cochée que si « méthode de mensuration » est renseignée refs #8013 adds 1e2aa09 4. ajouter colonne « maturité » et pour chaque taxon proposer liste psfm pour pointer sur l'échelle de maturité adaptée au taxon refs #8013 adds ddf9722 - suppression des colonnes dénombrement et pièces caclifiées - ajout de la colonne type de piece calcifiée refs #8013 adds 2381cf1 wording (refs #8013) adds 523e218 migration du protocole (refs #8013) adds c6bba11 cocher maturité dans l'éditeur de pieces calcifiées si l'espèce sélectionnée a un pmfm de maturité (refs #8013) adds 87cb8c1 Il faut n'autoriser que les taxons dont on a une méthode de mensuration renseigner et du coup il faut aussi demander une confirmation à l'utilisateur si il veut supprimer la méthode de mensuration dans l'onglet espèces (ou benthos) car cela va supprimer des lignes dans l'onglet algo (refs #8013) adds 1a9cd1e ajout du highlighter sur la table des cps (refs #8013) adds 9e44081 coorection de la validité des lignes (refs #8013) adds 370751c test que l'espèce a une méthode de mensuration à l'import de l'algo de pieces calcifiees (refs #8013) adds 883d2f9 modif du nom par défaut des fichiers d'export (refs #8013) adds ad65665 - correction de l'import / export - correction des tests (fixes #8013) adds f3d31f7 wording adds 7d8e1ee correction de la version courante du protocole (fixes #8013) adds ede141d Changement de l'ordre des colonnes dans l'onglet espèces et benthos adds 295d098 Ajout de méthode withXXX sur SpeciesProtocol + bien modifier le modèle global lors d'une modification du tableau des espèces des pièces calcifiées adds 041d0ec Wording toi même! adds a0118c9 Suppression des annotation de génération sur du code non généré adds f5ccf41 Fixes #8013 Merge branch 'feature/8013' into develop adds 7ef3920 Correction du poids total espèce vivant non détaillé trié non exporté (see #8022) adds dbdd317 Correction du poids total espèce vrac non exporté (see #8022) adds 441e785 fixes #8022 Merge branch 'feature/8022' into develop adds 6d7f9a0 [jgitflow-maven-plugin]updating poms for 4.5-alpha-1 branch with snapshot versions adds 809bcd9 Add missing license headers adds 1ef3936 [jgitflow-maven-plugin]updating poms for branch'release/4.5-alpha-1' with non-snapshot versions adds 43e9096 [jgitflow-maven-plugin]merging 'release/4.5-alpha-1' into 'master' No new revisions were added by this update. Summary of changes: .gitignore | 12 +- README.txt => README.md | 4 +- pom.xml | 9 +- .../AllegroCampagne-Specifications.odt | Bin 982028 -> 1039537 bytes .../AllegroCampagne-Specifications.pdf | Bin 1776041 -> 1880559 bytes src/site/site_fr.xml | 2 + .../README.txt => tutti-ichtyometer/README.md | 0 tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/{README.txt => README.md} | 0 tutti-persistence/pom.xml | 2 +- .../tutti/persistence/TuttiPersistenceImpl.java | 10 + .../persistence/TuttiPersistenceNoDbImpl.java | 10 + .../entities/protocol/SpeciesProtocolBean.java | 14 + .../entities/protocol/TuttiProtocols.java | 120 +++- .../entities/protocol/v1/SpeciesProtocol1.java | 5 +- .../entities/protocol/v1/SpeciesProtocolBean1.java | 5 +- .../entities/protocol/v1/TuttiProtocol1.java | 4 +- .../entities/protocol/v1/TuttiProtocolBean1.java | 4 +- .../entities/protocol/v2/TuttiProtocol2.java | 4 +- .../entities/protocol/v2/TuttiProtocolBean2.java | 2 - .../entities/protocol/v3/SpeciesProtocol3.java | 172 ++++++ .../entities/protocol/v3/SpeciesProtocolBean3.java | 233 ++++---- .../entities/protocol/v3/TuttiProtocol3.java | 260 +++++++++ .../entities/protocol/v3/TuttiProtocolBean3.java | 620 +++++++++++++++++++++ .../service/ProtocolPersistenceService.java | 7 + .../service/ProtocolPersistenceServiceImpl.java | 66 +++ .../referential/LocationPersistenceService.java | 10 + .../LocationPersistenceServiceImpl.java | 38 ++ .../main/java/fr/ifremer/tutti/util/Numbers.java | 5 +- .../src/main/resources/queries-failsafe.hbm.xml | 82 ++- .../src/main/xmi/tutti-persistence.zargo | Bin 59366 -> 62284 bytes .../entities/protocol/TuttiProtocolsTest.java | 20 - .../ProtocolPersistenceServiceReadTest.java | 6 - .../ProtocolPersistenceServiceWriteTest.java | 9 +- .../README.txt => tutti-report-generator/README.md | 0 tutti-report-generator/pom.xml | 2 +- tutti-service/{README.txt => README.md} | 0 tutti-service/pom.xml | 2 +- .../fr/ifremer/tutti/service/DecoratorService.java | 37 ++ .../ifremer/tutti/service/PersistenceService.java | 10 + .../catches/ValidateCruiseOperationsService.java | 4 +- .../csv/AbstractTuttiImportExportModel.java | 4 + .../tutti/service/genericformat/csv/CatchRow.java | 21 + .../service/genericformat/csv/OperationRow.java | 6 +- .../producer/CsvProducerForCatch.java | 73 ++- .../protocol/CalcifiedPiecesSamplingRow.java | 136 +++++ .../protocol/CalcifiedPiecesSamplingRowModel.java | 94 ++++ .../protocol/ProtocolImportExportService.java | 157 ++++++ .../ifremer/tutti/service/protocol/SpeciesRow.java | 16 - .../tutti/service/protocol/SpeciesRowModel.java | 18 +- .../resources/i18n/tutti-service_en_GB.properties | 10 + .../resources/i18n/tutti-service_fr_FR.properties | 9 + .../GenericFormatExportServiceAno7992Test.java | 217 ++++++++ .../protocol/ProtocolImportExportServiceTest.java | 52 +- .../resources/genericFormat/ano7992.tuttiProtocol | 249 +++++++++ .../README.txt => tutti-ui-swing-updater/README.md | 0 tutti-ui-swing-updater/pom.xml | 2 +- .../README.txt => tutti-ui-swing/README.md | 0 tutti-ui-swing/pom.xml | 2 +- .../filtered-resources/tutti-help-fr.properties | 7 +- .../help/Guide_utilisation_Allegro_Campagne.pdf | Bin 1996569 -> 1988880 bytes .../swing/content/cruise/EditCruiseUIHandler.java | 2 +- .../content/cruise/actions/SaveCruiseAction.java | 4 +- .../ui/swing/content/home/SelectCruiseUI.jcss | 4 + .../swing/content/home/SelectCruiseUIHandler.java | 25 +- .../operation/EditFishingOperationUIHandler.java | 2 +- .../operation/EditFishingOperationUIModel.java | 20 +- .../catches/AbstractTuttiBatchTableUIHandler.java | 25 +- .../content/operation/catches/BatchSavedEvent.java | 47 +- .../operation/catches/BatchSavedListener.java | 18 +- .../accidental/AccidentalBatchUIHandler.java | 3 +- .../catches/benthos/BenthosBatchUIHandler.java | 6 +- .../create/CreateBenthosBatchUIHandler.java | 2 +- .../IndividualObservationBatchUIHandler.java | 3 +- .../marinelitter/MarineLitterBatchUIHandler.java | 4 +- .../catches/species/SpeciesBatchUIHandler.java | 6 +- .../create/CreateSpeciesBatchUIHandler.java | 2 +- .../actions/EditFishingOperationAction.java | 4 +- .../actions/SaveFishingOperationAction.java | 2 +- .../content/program/EditProgramUIHandler.java | 2 +- .../content/program/actions/SaveProgramAction.java | 2 +- .../protocol/EditProtocolSpeciesRowModel.java | 174 +++++- .../protocol/EditProtocolSpeciesTableModel.java | 27 +- .../ui/swing/content/protocol/EditProtocolUI.jaxx | 18 + .../ui/swing/content/protocol/EditProtocolUI.jcss | 11 + .../content/protocol/EditProtocolUIHandler.java | 607 +++++++++++++------- .../content/protocol/EditProtocolUIModel.java | 342 ++++++++++++ .../protocol/actions/AddBenthosProtocolAction.java | 4 +- .../protocol/actions/AddSpeciesProtocolAction.java | 6 +- .../actions/ExportAllCaracteristicAction.java | 2 +- .../actions/ExportProtocolBenthosAction.java | 4 +- .../actions/ExportProtocolCaracteristicAction.java | 4 +- .../actions/ExportProtocolSpeciesAction.java | 4 +- .../protocol/actions/ExportPupitriAction.java | 2 +- .../actions/ImportProtocolBenthosAction.java | 36 +- .../actions/ImportProtocolCaracteristicAction.java | 4 +- .../actions/ImportProtocolSpeciesAction.java | 36 +- .../actions/RemoveBenthosProtocolAction.java | 86 ++- .../actions/RemoveSpeciesProtocolAction.java | 89 ++- .../protocol/actions/SaveProtocolAction.java | 57 +- .../CalcifiedPiecesSamplingEditorRowModel.java | 235 ++++++++ .../CalcifiedPiecesSamplingEditorTableModel.java | 153 +++++ .../CalcifiedPiecesSamplingEditorUI.jaxx | 89 +++ .../CalcifiedPiecesSamplingEditorUI.jcss | 64 +++ .../CalcifiedPiecesSamplingEditorUIHandler.java | 364 ++++++++++++ .../calcifiedpiecessampling/MinSizePopupUI.jaxx} | 31 +- .../calcifiedpiecessampling/MinSizePopupUI.jcss} | 39 +- .../MinSizePopupUIHandler.java | 104 ++++ .../MinSizePopupUIModel.java | 76 +++ .../actions/AddSpeciesAction.java | 95 ++++ .../actions/DeleteRowAction.java | 97 ++++ .../actions/DeleteSpeciesAction.java | 95 ++++ .../actions/ExportProtocolCpsAction.java} | 69 +-- .../actions/ImportProtocolCpsAction.java | 180 ++++++ .../actions/SplitSpeciesAction.java | 91 +++ .../content/protocol/rtp/RtpEditorUIModel.java | 6 +- .../swing/content/protocol/zones/ZoneEditorUI.jaxx | 110 ++++ .../swing/content/protocol/zones/ZoneEditorUI.jcss | 65 +++ .../protocol/zones/ZoneEditorUIHandler.java | 416 ++++++++++++++ .../protocol/zones/actions/AddStratasAction.java | 108 ++++ .../CollapseAvailableStratasTreeAction.java} | 25 +- .../actions/CollapseZonesTreeAction.java} | 25 +- .../protocol/zones/actions/CreateZoneAction.java | 75 +++ .../protocol/zones/actions/DeleteZoneAction.java | 74 +++ .../actions/ExpandAvailableStratasTreeAction.java} | 25 +- .../actions/ExpandZonesTreeAction.java} | 25 +- .../zones/actions/RemoveStratasAction.java | 115 ++++ .../protocol/zones/actions/RenameZoneAction.java | 78 +++ .../protocol/zones/models/StrataUIModel.java | 249 +++++++++ .../protocol/zones/models/SubStrataUIModel.java | 146 +++++ .../content/protocol/zones/models/ZoneUIModel.java | 228 ++++++++ .../zones/tree/AbstractZoneEditorTreeModel.java | 40 +- .../content/protocol/zones/tree/StrataNode.java | 36 +- .../protocol/zones/tree/StratasTreeModel.java | 158 ++++++ .../content/protocol/zones/tree/SubStrataNode.java | 35 +- .../protocol/zones/tree/ZoneEditorNode.java | 76 +++ .../zones/tree/ZoneEditorTreeCellRenderer.java} | 39 +- .../content/protocol/zones/tree/ZoneNode.java | 23 +- .../protocol/zones/tree/ZonesTreeModel.java | 229 ++++++++ .../tutti/ui/swing/content/report/ReportUI.jaxx | 15 +- .../tutti/ui/swing/content/report/ReportUI.jcss | 4 +- .../report/actions/GenerateReportAction.java | 2 +- .../actions/EditCruiseInValidationUIAction.java | 2 +- .../EditFishingOperationInValidationUIAction.java | 55 +- .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 15 + .../EditProtocolUIModel-error-validation.xml} | 13 +- .../MinSizePopupUIModel-error-validation.xml} | 25 +- .../rtp/RtpEditorUIModel-error-validation.xml | 2 - .../resources/i18n/tutti-ui-swing_en_GB.properties | 93 ++++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 90 ++- .../icons/{fatal.png => action-delete2.png} | Bin .../src/main/resources/icons/action-left.png | Bin 0 -> 345 bytes .../src/main/resources/icons/action-right.png | Bin 0 -> 349 bytes 153 files changed, 8064 insertions(+), 1001 deletions(-) rename README.txt => README.md (89%) rename tutti-ui-swing/README.txt => tutti-ichtyometer/README.md (100%) rename tutti-persistence/{README.txt => README.md} (100%) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v3/SpeciesProtocol3.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java => tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v3/SpeciesProtocolBean3.java (50%) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v3/TuttiProtocol3.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v3/TuttiProtocolBean3.java rename tutti-ui-swing-updater/README.txt => tutti-report-generator/README.md (100%) rename tutti-service/{README.txt => README.md} (100%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CalcifiedPiecesSamplingRow.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CalcifiedPiecesSamplingRowModel.java create mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceAno7992Test.java create mode 100644 tutti-service/src/test/resources/genericFormat/ano7992.tuttiProtocol rename tutti-report-generator/README.txt => tutti-ui-swing-updater/README.md (100%) rename tutti-ichtyometer/README.txt => tutti-ui-swing/README.md (100%) copy tutti-persistence/src/main/java/fr/ifremer/tutti/util/BeepFrequency.java => tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/BatchSavedEvent.java (56%) copy tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/Rtps.java => tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/BatchSavedListener.java (73%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorRowModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorTableModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorUI.jaxx create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorUI.jcss create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorUIHandler.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{operation/catches/species/ImportPupitriMelagWeightPopupUI.jaxx => protocol/calcifiedpiecessampling/MinSizePopupUI.jaxx} (59%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/{util/auth/LoginUI.jcss => content/protocol/calcifiedpiecessampling/MinSizePopupUI.jcss} (62%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/MinSizePopupUIHandler.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/MinSizePopupUIModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/AddSpeciesAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/DeleteRowAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/DeleteSpeciesAction.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/{actions/ExportProtocolSpeciesAction.java => calcifiedpiecessampling/actions/ExportProtocolCpsAction.java} (53%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/ImportProtocolCpsAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/SplitSpeciesAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZoneEditorUI.jaxx create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZoneEditorUI.jcss create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZoneEditorUIHandler.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/AddStratasAction.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/{rtp/actions/CloseRtpAction.java => zones/actions/CollapseAvailableStratasTreeAction.java} (60%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/{rtp/actions/CloseRtpAction.java => zones/actions/CollapseZonesTreeAction.java} (61%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/CreateZoneAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/DeleteZoneAction.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/{rtp/actions/CloseRtpAction.java => zones/actions/ExpandAvailableStratasTreeAction.java} (61%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/{rtp/actions/CloseRtpAction.java => zones/actions/ExpandZonesTreeAction.java} (63%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/RemoveStratasAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/RenameZoneAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/models/StrataUIModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/models/SubStrataUIModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/models/ZoneUIModel.java copy tutti-persistence/src/main/java/fr/ifremer/tutti/util/BeepFrequency.java => tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/AbstractZoneEditorTreeModel.java (54%) copy tutti-persistence/src/main/java/fr/ifremer/tutti/util/BeepFrequency.java => tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/StrataNode.java (64%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/StratasTreeModel.java copy tutti-persistence/src/main/java/fr/ifremer/tutti/util/BeepFrequency.java => tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/SubStrataNode.java (64%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorNode.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/{util/auth/actions/LoginCancelAction.java => content/protocol/zones/tree/ZoneEditorTreeCellRenderer.java} (52%) copy tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/Rtps.java => tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneNode.java (65%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZonesTreeModel.java copy tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/{home/SelectCruiseUIModel-error-validation.xml => protocol/EditProtocolUIModel-error-validation.xml} (83%) copy tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/{referential/replace/AbstractReplaceTemporaryUIModel-error-validation.xml => protocol/calcifiedpiecessampling/MinSizePopupUIModel-error-validation.xml} (70%) copy tutti-ui-swing/src/main/resources/icons/{fatal.png => action-delete2.png} (100%) create mode 100644 tutti-ui-swing/src/main/resources/icons/action-left.png create mode 100644 tutti-ui-swing/src/main/resources/icons/action-right.png -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (441e785 -> d65d8e3)
by codelutin.com scm 25 Feb '16

25 Feb '16

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 441e785 fixes #8022 Merge branch 'feature/8022' into develop new dc9b003 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 6d7f9a0 [jgitflow-maven-plugin]updating poms for 4.5-alpha-1 branch with snapshot versions new 809bcd9 Add missing license headers new 1ef3936 [jgitflow-maven-plugin]updating poms for branch'release/4.5-alpha-1' with non-snapshot versions new 43e9096 [jgitflow-maven-plugin]merging 'release/4.5-alpha-1' into 'master' new 0882928 [jgitflow-maven-plugin]merging 'master' into 'develop' new d65d8e3 [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 d65d8e3cf39c7bda28dfd8aac59e66adce13e4d8 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Feb 25 18:13:31 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 0882928d03c7e733643af51f3a0dc9de68354ad7 Merge: dc9b003 43e9096 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Feb 25 18:13:30 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit dc9b0033187265743c5c449bc58727e1ea0e3c68 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Feb 25 18:13:30 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 43e9096e7d7c7b828df8b61e566f072a3d126e27 Merge: 1c18a9e 1ef3936 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Feb 25 18:13:23 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.5-alpha-1' into 'master' commit 1ef393655bb4a77a27cd81f7ae34337e4ac03eab Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Feb 25 18:10:35 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.5-alpha-1' with non-snapshot versions commit 809bcd9084e03030160c702538d07575cae75317 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Feb 25 18:10:24 2016 +0100 Add missing license headers Summary of changes: .../entities/protocol/v3/SpeciesProtocol3.java | 24 ++++++++++++++++++++++ .../entities/protocol/v3/SpeciesProtocolBean3.java | 24 ++++++++++++++++++++++ .../entities/protocol/v3/TuttiProtocol3.java | 24 ++++++++++++++++++++++ .../entities/protocol/v3/TuttiProtocolBean3.java | 24 ++++++++++++++++++++++ .../protocol/CalcifiedPiecesSamplingRow.java | 24 ++++++++++++++++++++++ .../protocol/CalcifiedPiecesSamplingRowModel.java | 24 ++++++++++++++++++++++ .../filtered-resources/tutti-help-fr.properties | 23 +++++++++++++++++++++ .../content/operation/catches/BatchSavedEvent.java | 24 ++++++++++++++++++++++ .../operation/catches/BatchSavedListener.java | 24 ++++++++++++++++++++++ .../CalcifiedPiecesSamplingEditorRowModel.java | 24 ++++++++++++++++++++++ .../CalcifiedPiecesSamplingEditorTableModel.java | 24 ++++++++++++++++++++++ .../CalcifiedPiecesSamplingEditorUI.jaxx | 23 +++++++++++++++++++++ .../CalcifiedPiecesSamplingEditorUIHandler.java | 24 ++++++++++++++++++++++ .../MinSizePopupUIModel.java | 24 ++++++++++++++++++++++ .../actions/AddSpeciesAction.java | 24 ++++++++++++++++++++++ .../actions/DeleteRowAction.java | 24 ++++++++++++++++++++++ .../actions/DeleteSpeciesAction.java | 24 ++++++++++++++++++++++ .../actions/SplitSpeciesAction.java | 24 ++++++++++++++++++++++ .../swing/content/protocol/zones/ZoneEditorUI.jaxx | 23 +++++++++++++++++++++ .../protocol/zones/ZoneEditorUIHandler.java | 24 ++++++++++++++++++++++ .../protocol/zones/actions/AddStratasAction.java | 24 ++++++++++++++++++++++ .../CollapseAvailableStratasTreeAction.java | 24 ++++++++++++++++++++++ .../zones/actions/CollapseZonesTreeAction.java | 24 ++++++++++++++++++++++ .../protocol/zones/actions/CreateZoneAction.java | 24 ++++++++++++++++++++++ .../protocol/zones/actions/DeleteZoneAction.java | 24 ++++++++++++++++++++++ .../actions/ExpandAvailableStratasTreeAction.java | 24 ++++++++++++++++++++++ .../zones/actions/ExpandZonesTreeAction.java | 24 ++++++++++++++++++++++ .../zones/actions/RemoveStratasAction.java | 24 ++++++++++++++++++++++ .../protocol/zones/actions/RenameZoneAction.java | 24 ++++++++++++++++++++++ .../protocol/zones/models/StrataUIModel.java | 24 ++++++++++++++++++++++ .../protocol/zones/models/SubStrataUIModel.java | 24 ++++++++++++++++++++++ .../content/protocol/zones/models/ZoneUIModel.java | 24 ++++++++++++++++++++++ .../zones/tree/AbstractZoneEditorTreeModel.java | 24 ++++++++++++++++++++++ .../content/protocol/zones/tree/StrataNode.java | 24 ++++++++++++++++++++++ .../protocol/zones/tree/StratasTreeModel.java | 24 ++++++++++++++++++++++ .../content/protocol/zones/tree/SubStrataNode.java | 24 ++++++++++++++++++++++ .../protocol/zones/tree/ZoneEditorNode.java | 24 ++++++++++++++++++++++ .../zones/tree/ZoneEditorTreeCellRenderer.java | 24 ++++++++++++++++++++++ .../content/protocol/zones/tree/ZoneNode.java | 24 ++++++++++++++++++++++ .../protocol/zones/tree/ZonesTreeModel.java | 24 ++++++++++++++++++++++ .../MinSizePopupUIModel-error-validation.xml | 23 +++++++++++++++++++++ 41 files changed, 980 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

[ANN] - Tutti 4.5-alpha-1 released
by codelutin.com Release Notification 25 Feb '16

25 Feb '16

The Tutti team is pleased to announce the tutti-4.5-alpha-1 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 Éditeur de l'algorithme de pièces calcifiées Issue: 7930. Thanks to Tony Chemit. Resolved by kmorin. o Éditeur de zones dans le protocole pour l'algorithme des pièces calcifiées à prélever Issue: 7929. Thanks to Tony Chemit. Resolved by vbadts. o [PROTOCOL] Filtrage des protocoles sur une séire de campagne Issue: 7969. Thanks to Tony Chemit. Resolved by tchemit. o [OBSERVATIONS INDIVIDUELLES] Impacts sur le protocole Issue: 8013. Thanks to Kevin Morin. Resolved by kmorin. Downloads --------- For a manual installation, you can download files here: https://forge.codelutin.com/projects/tutti/files * tutti-ichtyometer-4.5-alpha-1-tools.zip - https://forge.codelutin.com/attachments/download/3729 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-alpha-1 created (now 6d7f9a0)
by codelutin.com scm 25 Feb '16

25 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch release/4.5-alpha-1 in repository tutti. See http://git.codelutin.com/tutti.git at 6d7f9a0 [jgitflow-maven-plugin]updating poms for 4.5-alpha-1 branch with snapshot versions This branch includes the following new commits: new 6d7f9a0 [jgitflow-maven-plugin]updating poms for 4.5-alpha-1 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 6d7f9a0dbd79dc918c6261637af71a48c9e06ed0 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Feb 25 18:04:53 2016 +0100 [jgitflow-maven-plugin]updating poms for 4.5-alpha-1 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-4.4.x updated (ef96b93 -> d9886ac)
by codelutin.com scm 25 Feb '16

25 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch develop-4.4.x in repository tutti. See http://git.codelutin.com/tutti.git from ef96b93 [jgitflow-maven-plugin]updating poms for 4.4.6-SNAPSHOT development new 23517c0 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds bae199b [jgitflow-maven-plugin]updating poms for 4.4.5 branch with snapshot versions new ddab752 [jgitflow-maven-plugin]updating poms for branch'release/4.4.5' with non-snapshot versions new c7deaa0 [jgitflow-maven-plugin]merging 'release/4.4.5' into 'master-4.4.x' new 9bfaf6c [jgitflow-maven-plugin]merging 'master-4.4.x' into 'develop-4.4.x' new d9886ac [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 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 d9886ac408a98d2ee2809b9ea63573caa48a8e44 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Feb 25 17:55:34 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 9bfaf6ca126824bff7cdf075b1a5d62ed0ae3f0d Merge: 23517c0 c7deaa0 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Feb 25 17:55:33 2016 +0100 [jgitflow-maven-plugin]merging 'master-4.4.x' into 'develop-4.4.x' commit 23517c0be183e2feb1038c5c745c554548a7172a Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Feb 25 17:55:33 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit c7deaa00bc675fbeca4de8a1e480172211b35920 Merge: ee08be8 ddab752 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Feb 25 17:55:29 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.4.5' into 'master-4.4.x' commit ddab75286c8a7abcd0068a7372eaf01e752148aa Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Feb 25 17:52:27 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.4.5' with non-snapshot versions Summary of changes: -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 5

branch release/4.4.5 deleted (was ddab752)
by codelutin.com scm 25 Feb '16

25 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch release/4.4.5 in repository tutti. See http://git.codelutin.com/tutti.git was ddab752 [jgitflow-maven-plugin]updating poms for branch'release/4.4.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.4.5 created (now 6ba31a6)
by codelutin.com scm 25 Feb '16

25 Feb '16

This is an automated email from the git hooks/post-receive script. New change to annotated tag tutti-4.4.5 in repository tutti. See http://git.codelutin.com/tutti.git at 6ba31a6 (tag) tagging c7deaa00bc675fbeca4de8a1e480172211b35920 (commit) replaces tutti-4.4.4 tagged by Maven Release on Thu Feb 25 17:55:31 2016 +0100 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 4.4.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.4.5 updated (bae199b -> ddab752)
by codelutin.com scm 25 Feb '16

25 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch release/4.4.5 in repository tutti. See http://git.codelutin.com/tutti.git from bae199b [jgitflow-maven-plugin]updating poms for 4.4.5 branch with snapshot versions adds ddab752 [jgitflow-maven-plugin]updating poms for branch'release/4.4.5' with non-snapshot versions No new revisions were added by this update. Summary of changes: pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch master-4.4.x updated (ee08be8 -> c7deaa0)
by codelutin.com scm 25 Feb '16

25 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch master-4.4.x in repository tutti. See http://git.codelutin.com/tutti.git from ee08be8 [jgitflow-maven-plugin]merging 'release/4.4.4' into 'master-4.4.x' adds 4e86308 [jgitflow-maven-plugin]updating poms for 4.4.5-SNAPSHOT development adds 18211db [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds b0e2e37 [jgitflow-maven-plugin]merging 'master-4.4.x' into 'develop-4.4.x' adds b02f421 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds a0a623a Do not use https for project url adds 996f721 Correction du poids total espèce vivant non détaillé trié non exporté (see #8022) adds 23fc0c1 Correction du poids total espèce vrac non exporté (see #8022) adds b02a811 Fixes #8022 Merge branch 'feature/8022' into develop-4.4.x adds ef96b93 [jgitflow-maven-plugin]updating poms for 4.4.6-SNAPSHOT development adds bae199b [jgitflow-maven-plugin]updating poms for 4.4.5 branch with snapshot versions adds ddab752 [jgitflow-maven-plugin]updating poms for branch'release/4.4.5' with non-snapshot versions adds c7deaa0 [jgitflow-maven-plugin]merging 'release/4.4.5' into 'master-4.4.x' No new revisions were added by this update. Summary of changes: pom.xml | 4 ++-- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../tutti/service/genericformat/csv/OperationRow.java | 6 +++--- .../genericformat/GenericFormatExportServiceAno7992Test.java | 12 +++++++++++- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 9 files changed, 22 insertions(+), 12 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

[ANN] - Tutti 4.4.5 released
by codelutin.com Release Notification 25 Feb '16

25 Feb '16

The Tutti team is pleased to announce the tutti-4.4.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: Fixed Bugs: o [EXPORT GENERIQUE] Table opération 4 colonnes non calculées Issue: 8022. Thanks to Anne-Sophie Cornou. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: https://forge.codelutin.com/projects/tutti/files * tutti-ichtyometer-4.4.5-tools.zip - https://forge.codelutin.com/attachments/download/3728 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Tutti team

1 0