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@codelutin.com>.