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

branch develop-4.4.x updated (5257452 -> 110648c)
by codelutin.com scm Feb. 8, 2016

Feb. 8, 2016

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 5257452 Passage sur une branche de maintenance new 561738d Correction de la taille des boutons (See #7971) new f035b1e Correction d'un binding qui ne fonctionnait plus... new 110648c Fixes #7971 Merge branch 'feature/7971' into develop-4.4.x The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 110648c628355da0c5ec373f8c1d6bcb6d969e50 Merge: 5257452 f035b1e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Feb 8 16:51:00 2016 +0100 Fixes #7971 Merge branch 'feature/7971' into develop-4.4.x commit f035b1e44aa2801621255efe5545c97d0dd0be8e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Feb 8 16:49:26 2016 +0100 Correction d'un binding qui ne fonctionnait plus... commit 561738d6ba3bbbc32e62705f9183ca99c7a64829 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Feb 8 16:39:21 2016 +0100 Correction de la taille des boutons (See #7971) Summary of changes: .../ifremer/tutti/ui/swing/content/report/ReportUI.jaxx | 15 +++++++++++++-- .../ifremer/tutti/ui/swing/content/report/ReportUI.jcss | 4 ++-- 2 files changed, 15 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch master-4.4.x created (now 1c18a9e)
by codelutin.com scm Feb. 8, 2016

Feb. 8, 2016

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 at 1c18a9e [jgitflow-maven-plugin]merging 'release/4.4' into 'master' 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 develop-4.4.x created (now 5257452)
by codelutin.com scm Feb. 8, 2016

Feb. 8, 2016

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 at 5257452 Passage sur une branche de maintenance This branch includes the following new commits: new 5257452 Passage sur une branche de maintenance 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 5257452a0c29bb5bf7c62aae977122b04d069b7b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Feb 8 16:18:36 2016 +0100 Passage sur une branche de maintenance -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/7930 updated (b2d9145 -> bda70af)
by codelutin.com scm Feb. 8, 2016

Feb. 8, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/7930 in repository tutti. See http://git.codelutin.com/tutti.git discards b2d9145 combo de selection de l'espece + ajout de lignes dans le tableau + possibilité de splitter une ligne (refs #7930) discards 883d7c6 creation de l'onglet d'edition de l'algo de prelevement de pieces calcifiees (refs #7930) 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 71fc127 creation de l'onglet d'edition de l'algo de prelevement de pieces calcifiees (refs #7930) adds 0cd8d57 combo de selection de l'espece + ajout de lignes dans le tableau + possibilité de splitter une ligne (refs #7930) adds bda70af Fin de merge depuis develop 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 (b2d9145) \ N -- N -- N refs/heads/feature/7930 (bda70af) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. No new revisions were added by this update. Summary of changes: pom.xml | 2 - .../AllegroCampagne-Specifications.odt | Bin 982028 -> 1039537 bytes .../AllegroCampagne-Specifications.pdf | Bin 1776041 -> 1880559 bytes .../tutti/persistence/TuttiPersistenceImpl.java | 5 + .../persistence/TuttiPersistenceNoDbImpl.java | 5 + .../entities/protocol/TuttiProtocols.java | 3 + .../service/ProtocolPersistenceServiceImpl.java | 47 +++ .../referential/LocationPersistenceService.java | 10 + .../LocationPersistenceServiceImpl.java | 38 ++ .../src/main/resources/queries-failsafe.hbm.xml | 82 +++- .../src/main/xmi/tutti-persistence.zargo | Bin 59366 -> 60851 bytes .../ifremer/tutti/service/PersistenceService.java | 5 + .../swing/content/cruise/EditCruiseUIHandler.java | 2 +- .../content/cruise/actions/SaveCruiseAction.java | 4 +- .../accidental/AccidentalBatchUIHandler.java | 2 +- .../catches/benthos/BenthosBatchUIHandler.java | 4 +- .../IndividualObservationBatchUIHandler.java | 2 +- .../marinelitter/MarineLitterBatchUIHandler.java | 2 +- .../catches/species/SpeciesBatchUIHandler.java | 4 +- .../actions/EditFishingOperationAction.java | 4 +- .../actions/SaveFishingOperationAction.java | 2 +- .../content/program/EditProgramUIHandler.java | 2 +- .../content/program/actions/SaveProgramAction.java | 2 +- .../ui/swing/content/protocol/EditProtocolUI.jaxx | 8 +- .../content/protocol/EditProtocolUIHandler.java | 15 +- .../content/protocol/EditProtocolUIModel.java | 232 +++++++++++ .../actions/ExportProtocolBenthosAction.java | 2 +- .../actions/ExportProtocolCaracteristicAction.java | 2 +- .../actions/ExportProtocolSpeciesAction.java | 2 +- .../actions/ImportProtocolBenthosAction.java | 2 +- .../actions/ImportProtocolCaracteristicAction.java | 4 +- .../actions/ImportProtocolSpeciesAction.java | 2 +- .../protocol/actions/SaveProtocolAction.java | 15 +- .../content/protocol/rtp/RtpEditorUIModel.java | 4 +- .../swing/content/protocol/zones/ZoneEditorUI.jaxx | 87 +++++ .../swing/content/protocol/zones/ZoneEditorUI.jcss | 65 ++++ .../protocol/zones/ZoneEditorUIHandler.java | 427 +++++++++++++++++++++ .../protocol/zones/actions/AddStratasAction.java | 84 ++++ .../CollapseAvailableStratasTreeAction.java | 21 + .../zones/actions/CollapseZonesTreeAction.java | 21 + .../protocol/zones/actions/CreateZoneAction.java | 51 +++ .../protocol/zones/actions/DeleteZoneAction.java | 50 +++ .../actions/ExpandAvailableStratasTreeAction.java | 21 + .../zones/actions/ExpandZonesTreeAction.java | 21 + .../zones/actions/RemoveStratasAction.java | 91 +++++ .../protocol/zones/actions/RenameZoneAction.java | 54 +++ .../protocol/zones/models/StrataUIModel.java | 225 +++++++++++ .../protocol/zones/models/SubStrataUIModel.java | 122 ++++++ .../content/protocol/zones/models/ZoneUIModel.java | 204 ++++++++++ .../zones/tree/AbstractZoneEditorTreeModel.java | 25 ++ .../content/protocol/zones/tree/StrataNode.java | 19 + .../protocol/zones/tree/StratasTreeModel.java | 134 +++++++ .../content/protocol/zones/tree/SubStrataNode.java | 18 + .../protocol/zones/tree/ZoneEditorNode.java | 52 +++ .../zones/tree/ZoneEditorTreeCellRenderer.java | 30 ++ .../content/protocol/zones/tree/ZoneNode.java | 19 + .../protocol/zones/tree/ZonesTreeModel.java | 206 ++++++++++ .../report/actions/GenerateReportAction.java | 2 +- .../actions/EditCruiseInValidationUIAction.java | 2 +- .../EditFishingOperationInValidationUIAction.java | 4 +- .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 15 + .../EditProtocolUIModel-error-validation.xml} | 13 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 21 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 18 +- .../src/main/resources/icons/action-left.png | Bin 0 -> 345 bytes .../src/main/resources/icons/action-right.png | Bin 0 -> 349 bytes 66 files changed, 2566 insertions(+), 71 deletions(-) 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 create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/CollapseAvailableStratasTreeAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/CollapseZonesTreeAction.java 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 create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/ExpandAvailableStratasTreeAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/ExpandZonesTreeAction.java 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 create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/AbstractZoneEditorTreeModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/StrataNode.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/StratasTreeModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/SubStrataNode.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorNode.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorTreeCellRenderer.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneNode.java 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} (85%) 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 (17b3ba9 -> 2ab86d0)
by codelutin.com scm Feb. 6, 2016

Feb. 6, 2016

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 17b3ba9 Finalisation spécifications 0.7 new 9e12ae7 use java 1.8 new f9805f5 ajout des zones au protocole (refs #7929) new db167a0 ajout de l'onglet d'édition des zone (refs #7929) new d2472af mise a jour suite aux modifs du modele + appel des oncloseui des sous-ui (refs #7929) new faa68be noeuds + renderer + modeles d'arbre + modele de zone (refs #7929) new 4bc97c5 creation de zones + déplacement des noeuds (refs #7929) new 4bfd27e création des modeles de strates et sous strates (refs #7929) new 44cb2a5 ajout des listeners sur les strates et sous strates (refs #7929) new a72750c suprpession des sous strates d'une zone (refs #7929) new 43a38d2 ajout des icones + tri des noeuds dans les arbres (refs #7929) new 4d395fa sauvegarde du protocol (refs #7929) new 35f03ac on pousse les zones dans le modele de protocole (peut etre faire l'inverse...) (refs #7929) new 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) new 5763e70 tri des noeuds + i18n (refs #7929) new b42e6c6 utilisation de fromEntity et toEntity au lieu de fromBean et toBean new 8c086d3 - utilisation directement du modele du protocol - ajout d'une popup de menu pour surrpimer et renommer les zones (refs #7929) new 48df60e activation ou non des boutons d'ajout et de suppresion des strates (refs #7929) new 0d628cb desactivation des boutons d'ajout et de suppression des strates à l'ouverture de l'écran (refs #7929) new 5927e49 Merge de modèle new a219dd7 ajout des libellé sur les racines des arbres (refs #7929) new ccbed17 inversion des 2 arbres (refs #7929) new 132e60c expand nodes when children are inserted (refs #7929) new 793f199 Pouvoir ajouter/supprimer en utilisant un double click ou la touche entrée (See #7929) new 2ab86d0 Fixes #7929 Merge branch 'feature/7929_editeur_de_zone' into develop The 24 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 2ab86d0de8299a0ec2b199f6c7a8ddb134c8bd03 Merge: 17b3ba9 793f199 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Feb 6 09:21:08 2016 +0100 Fixes #7929 Merge branch 'feature/7929_editeur_de_zone' into develop commit 793f199fe5247dcdd4cbb6e7f2674dfbfe56c176 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Feb 6 09:19:36 2016 +0100 Pouvoir ajouter/supprimer en utilisant un double click ou la touche entrée (See #7929) commit 132e60cb42f2db6b6cb4086a5340fe9f9c48fc83 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Feb 5 15:43:20 2016 +0100 expand nodes when children are inserted (refs #7929) commit ccbed1721184adc51202de636a038a823df880bb Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Feb 5 15:33:23 2016 +0100 inversion des 2 arbres (refs #7929) commit a219dd72a675aec4a3f88437d25dd3ef875edfb1 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Feb 4 11:34:16 2016 +0100 ajout des libellé sur les racines des arbres (refs #7929) commit 5927e497326c185f33840031d9ea4e133a1d4b3b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Feb 4 09:08:18 2016 +0100 Merge de modèle commit 0d628cb994d0557176f1065caa038a9b4171c499 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Feb 3 11:05:50 2016 +0100 desactivation des boutons d'ajout et de suppression des strates à l'ouverture de l'écran (refs #7929) commit 48df60ecb8d5f66c6f4912bf424243e3835b211c Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Feb 3 10:46:33 2016 +0100 activation ou non des boutons d'ajout et de suppresion des strates (refs #7929) commit 8c086d37c8320d5eb03fd5d0d36555b0fccba8f1 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Feb 2 19:10:52 2016 +0100 - utilisation directement du modele du protocol - ajout d'une popup de menu pour surrpimer et renommer les zones (refs #7929) commit b42e6c6d2f29046d3eb20d6736cda10a6c946cf6 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Feb 2 15:54:09 2016 +0100 utilisation de fromEntity et toEntity au lieu de fromBean et toBean commit 5763e70102e6218084f3192c26dac5927af67658 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Feb 2 14:36:07 2016 +0100 tri des noeuds + i18n (refs #7929) commit 7c0bfbe6fbb8d94cf3cdb4592b06808db75549f5 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Feb 1 19:09:05 2016 +0100 - 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) commit 35f03ac9ed0dcb37cf155396ffc41c49764a061c Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Jan 29 17:35:38 2016 +0100 on pousse les zones dans le modele de protocole (peut etre faire l'inverse...) (refs #7929) commit 4d395fa2c6a50cea4b95e5eea6cf2fd583c3ef7c Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Jan 29 17:12:06 2016 +0100 sauvegarde du protocol (refs #7929) commit 43a38d26a59759d313d85f6cba8202d9b74c89fd Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Jan 29 14:49:39 2016 +0100 ajout des icones + tri des noeuds dans les arbres (refs #7929) commit a72750ccea2dcc1da9e79a35a0e636592728c70d Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Jan 29 11:34:43 2016 +0100 suprpession des sous strates d'une zone (refs #7929) commit 44cb2a5ea518820c395cc232250c12a12810022c Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Jan 28 19:22:03 2016 +0100 ajout des listeners sur les strates et sous strates (refs #7929) commit 4bfd27e712ea4d7c72f54fb63843a6c26f0586fd Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Jan 28 19:21:56 2016 +0100 création des modeles de strates et sous strates (refs #7929) commit 4bc97c5f99e3e0678b11c0b455b4d76b31d525cd Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Jan 27 18:39:17 2016 +0100 creation de zones + déplacement des noeuds (refs #7929) commit faa68bee7b8fb9c037eaad079911c16e373c3a47 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Jan 27 18:38:05 2016 +0100 noeuds + renderer + modeles d'arbre + modele de zone (refs #7929) commit d2472af25bcbbb4fd6bd2a7f04ae6b2e66830d13 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Jan 27 18:37:01 2016 +0100 mise a jour suite aux modifs du modele + appel des oncloseui des sous-ui (refs #7929) commit db167a01f090815ae1a8ac537ec4e756955ef0ea Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Jan 25 11:23:25 2016 +0100 ajout de l'onglet d'édition des zone (refs #7929) commit f9805f5ea351bc39c1684c58d2624d77a4ceab7b Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Jan 25 11:22:53 2016 +0100 ajout des zones au protocole (refs #7929) commit 9e12ae72edb675ee012be8afc5727fbeb42f32ea Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Jan 25 11:22:00 2016 +0100 use java 1.8 Summary of changes: pom.xml | 2 + .../tutti/persistence/TuttiPersistenceImpl.java | 5 + .../persistence/TuttiPersistenceNoDbImpl.java | 5 + .../entities/protocol/TuttiProtocols.java | 3 + .../service/ProtocolPersistenceServiceImpl.java | 47 +++ .../referential/LocationPersistenceService.java | 10 + .../LocationPersistenceServiceImpl.java | 38 ++ .../src/main/xmi/tutti-persistence.zargo | Bin 59366 -> 60851 bytes .../ifremer/tutti/service/PersistenceService.java | 5 + .../swing/content/cruise/EditCruiseUIHandler.java | 2 +- .../content/cruise/actions/SaveCruiseAction.java | 4 +- .../accidental/AccidentalBatchUIHandler.java | 2 +- .../catches/benthos/BenthosBatchUIHandler.java | 4 +- .../IndividualObservationBatchUIHandler.java | 2 +- .../marinelitter/MarineLitterBatchUIHandler.java | 2 +- .../catches/species/SpeciesBatchUIHandler.java | 4 +- .../actions/EditFishingOperationAction.java | 4 +- .../actions/SaveFishingOperationAction.java | 2 +- .../content/program/EditProgramUIHandler.java | 2 +- .../content/program/actions/SaveProgramAction.java | 2 +- .../ui/swing/content/protocol/EditProtocolUI.jaxx | 5 + .../content/protocol/EditProtocolUIHandler.java | 15 +- .../content/protocol/EditProtocolUIModel.java | 232 +++++++++++ .../actions/ExportProtocolBenthosAction.java | 2 +- .../actions/ExportProtocolCaracteristicAction.java | 2 +- .../actions/ExportProtocolSpeciesAction.java | 2 +- .../actions/ImportProtocolBenthosAction.java | 2 +- .../actions/ImportProtocolCaracteristicAction.java | 4 +- .../actions/ImportProtocolSpeciesAction.java | 2 +- .../protocol/actions/SaveProtocolAction.java | 15 +- .../content/protocol/rtp/RtpEditorUIModel.java | 4 +- .../swing/content/protocol/zones/ZoneEditorUI.jaxx | 87 +++++ .../swing/content/protocol/zones/ZoneEditorUI.jcss | 65 ++++ .../protocol/zones/ZoneEditorUIHandler.java | 427 +++++++++++++++++++++ .../protocol/zones/actions/AddStratasAction.java | 84 ++++ .../CollapseAvailableStratasTreeAction.java | 21 + .../zones/actions/CollapseZonesTreeAction.java | 21 + .../protocol/zones/actions/CreateZoneAction.java | 51 +++ .../protocol/zones/actions/DeleteZoneAction.java | 50 +++ .../actions/ExpandAvailableStratasTreeAction.java | 21 + .../zones/actions/ExpandZonesTreeAction.java | 21 + .../zones/actions/RemoveStratasAction.java | 91 +++++ .../protocol/zones/actions/RenameZoneAction.java | 54 +++ .../protocol/zones/models/StrataUIModel.java | 225 +++++++++++ .../protocol/zones/models/SubStrataUIModel.java | 122 ++++++ .../content/protocol/zones/models/ZoneUIModel.java | 204 ++++++++++ .../zones/tree/AbstractZoneEditorTreeModel.java | 25 ++ .../content/protocol/zones/tree/StrataNode.java | 19 + .../protocol/zones/tree/StratasTreeModel.java | 134 +++++++ .../content/protocol/zones/tree/SubStrataNode.java | 18 + .../protocol/zones/tree/ZoneEditorNode.java | 52 +++ .../zones/tree/ZoneEditorTreeCellRenderer.java | 30 ++ .../content/protocol/zones/tree/ZoneNode.java | 19 + .../protocol/zones/tree/ZonesTreeModel.java | 206 ++++++++++ .../report/actions/GenerateReportAction.java | 2 +- .../actions/EditCruiseInValidationUIAction.java | 2 +- .../EditFishingOperationInValidationUIAction.java | 4 +- .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 15 + .../EditProtocolUIModel-error-validation.xml} | 13 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 21 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 18 +- .../src/main/resources/icons/action-left.png | Bin 0 -> 345 bytes .../src/main/resources/icons/action-right.png | Bin 0 -> 349 bytes 63 files changed, 2508 insertions(+), 44 deletions(-) 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 create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/CollapseAvailableStratasTreeAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/CollapseZonesTreeAction.java 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 create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/ExpandAvailableStratasTreeAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/ExpandZonesTreeAction.java 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 create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/AbstractZoneEditorTreeModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/StrataNode.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/StratasTreeModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/SubStrataNode.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorNode.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorTreeCellRenderer.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneNode.java 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} (85%) 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 24

branch feature/7929_editeur_de_zone deleted (was 1c6671f)
by codelutin.com scm Feb. 6, 2016

Feb. 6, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/7929_editeur_de_zone in repository tutti. See http://git.codelutin.com/tutti.git was 1c6671f Pouvoir ajouter/supprimer en utilisant un double click ou la touche entrée (See #7929) The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7929_editeur_de_zone updated (661c69a -> 1c6671f)
by codelutin.com scm Feb. 6, 2016

Feb. 6, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/7929_editeur_de_zone in repository tutti. See http://git.codelutin.com/tutti.git from 661c69a expand nodes when children are inserted (refs #7929) adds 1c6671f Pouvoir ajouter/supprimer en utilisant un double click ou la touche entrée (See #7929) No new revisions were added by this update. Summary of changes: .../swing/content/protocol/zones/ZoneEditorUI.jaxx | 7 +- .../protocol/zones/ZoneEditorUIHandler.java | 153 ++++++++++++--------- .../protocol/zones/actions/AddStratasAction.java | 4 +- .../zones/actions/RemoveStratasAction.java | 51 ++++--- 4 files changed, 125 insertions(+), 90 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7929_editeur_de_zone updated (d31f938 -> 661c69a)
by codelutin.com scm Feb. 5, 2016

Feb. 5, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/7929_editeur_de_zone in repository tutti. See http://git.codelutin.com/tutti.git from d31f938 ajout des libellé sur les racines des arbres (refs #7929) adds c526b5f inversion des 2 arbres (refs #7929) adds 661c69a expand nodes when children are inserted (refs #7929) No new revisions were added by this update. Summary of changes: .../swing/content/protocol/zones/ZoneEditorUI.jaxx | 40 +++++++++-------- .../swing/content/protocol/zones/ZoneEditorUI.jcss | 4 +- .../protocol/zones/ZoneEditorUIHandler.java | 52 ++++++++++++++++++---- .../protocol/zones/actions/AddStratasAction.java | 6 --- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + 5 files changed, 67 insertions(+), 36 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7930 updated (883d7c6 -> b2d9145)
by codelutin.com scm Feb. 5, 2016

Feb. 5, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/7930 in repository tutti. See http://git.codelutin.com/tutti.git from 883d7c6 creation de l'onglet d'edition de l'algo de prelevement de pieces calcifiees (refs #7930) new b2d9145 combo de selection de l'espece + ajout de lignes dans le tableau + possibilité de splitter une ligne (refs #7930) 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 b2d9145b0d53fa6c115127a2e93b328fcb70993f Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Feb 5 14:09:11 2016 +0100 combo de selection de l'espece + ajout de lignes dans le tableau + possibilité de splitter une ligne (refs #7930) Summary of changes: pom.xml | 4 + .../fr/ifremer/tutti/service/DecoratorService.java | 39 +++++++ .../resources/i18n/tutti-service_en_GB.properties | 4 + .../resources/i18n/tutti-service_fr_FR.properties | 4 + .../content/protocol/EditProtocolUIModel.java | 15 +++ .../CalcifiedPiecesSamplingEditorRowModel.java | 20 +++- .../CalcifiedPiecesSamplingEditorTableModel.java | 25 +++++ .../CalcifiedPiecesSamplingEditorUI.jaxx | 7 +- .../CalcifiedPiecesSamplingEditorUI.jcss | 20 ++++ .../CalcifiedPiecesSamplingEditorUIHandler.java | 113 +++++++++++++++++++++ .../actions/AddSpeciesAction.java | 25 +++++ .../actions/SplitSpeciesAction.java | 60 +++++++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 4 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 4 + 14 files changed, 339 insertions(+), 5 deletions(-) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/SplitSpeciesAction.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (37f2cd2 -> 17b3ba9)
by codelutin.com scm Feb. 5, 2016

Feb. 5, 2016

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 37f2cd2 Version 0.7 des spécifications new 17b3ba9 Finalisation spécifications 0.7 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 17b3ba9b0327aca2b045ddc24d1842fd1773627a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Feb 5 08:07:44 2016 +0100 Finalisation spécifications 0.7 Summary of changes: .../AllegroCampagne-Specifications.odt | Bin 1173303 -> 1039537 bytes .../AllegroCampagne-Specifications.pdf | Bin 1902859 -> 1880559 bytes 2 files changed, 0 insertions(+), 0 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1