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

branch feature/7929_editeur_de_zone updated (3be1d33 -> 32a93e0)
by codelutin.com scm Feb. 3, 2016

Feb. 3, 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 3be1d33 - utilisation directement du modele du protocol - ajout d'une popup de menu pour surrpimer et renommer les zones (refs #7929) new 2beea6e activation ou non des boutons d'ajout et de suppresion des strates (refs #7929) new 32a93e0 desactivation des boutons d'ajout et de suppression des strates à l'ouverture de l'écran (refs #7929) 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 32a93e00588df1c459a0fbd82814edceccafcd39 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 2beea6ed016caa96d94ef027f6b44d5f6f1b926e 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) Summary of changes: .../swing/content/protocol/zones/ZoneEditorUI.jcss | 3 -- .../protocol/zones/ZoneEditorUIHandler.java | 58 ++++++++++++++++------ .../protocol/zones/actions/AddStratasAction.java | 5 ++ .../zones/actions/RemoveStratasAction.java | 1 + 4 files changed, 50 insertions(+), 17 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (6c0822a -> 3a73396)
by codelutin.com scm Feb. 3, 2016

Feb. 3, 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 6c0822a [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 320a3a0 Trim update url, because of haw theroy... (See #7946) adds 3a73396 Merge branch 'feature/7946' into 'develop' No new revisions were added by this update. Summary of changes: .../src/main/java/fr/ifremer/tutti/TuttiConfiguration.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7946 created (now 320a3a0)
by codelutin.com scm Feb. 3, 2016

Feb. 3, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/7946 in repository tutti. See http://git.codelutin.com/tutti.git at 320a3a0 Trim update url, because of haw theroy... (See #7946) This branch includes the following new commits: new 320a3a0 Trim update url, because of haw theroy... (See #7946) 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 320a3a0edbdaa9e8e878bfe23e08675a5a921bbb Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Feb 3 10:38:03 2016 +0100 Trim update url, because of haw theroy... (See #7946) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/7656 updated (7857694 -> a206acf)
by codelutin.com scm Feb. 3, 2016

Feb. 3, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/7656 in repository tutti. See http://git.codelutin.com/tutti.git from 7857694 Quelques modifications et mises à jour sur les spécifications (See #7656) new a206acf Ajout de toutes les requêtes manquantes dans les spécifications et nommage de le fichier de requêtes de l'application (See #7656) 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 a206acf33296c778f87dcada2719c184b1d4b82b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Feb 3 09:58:57 2016 +0100 Ajout de toutes les requêtes manquantes dans les spécifications et nommage de le fichier de requêtes de l'application (See #7656) Summary of changes: .../AllegroCampagne-Specifications.odt | Bin 996724 -> 1017160 bytes .../src/main/resources/queries-failsafe.hbm.xml | 82 +++++++++++++++------ 2 files changed, 61 insertions(+), 21 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/7656 updated (6c0822a -> 7857694)
by codelutin.com scm Feb. 2, 2016

Feb. 2, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/7656 in repository tutti. See http://git.codelutin.com/tutti.git from 6c0822a [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 7857694 Quelques modifications et mises à jour sur les spécifications (See #7656) 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 78576942712625319d8bde89ac1f65d39e25d107 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Feb 2 20:51:54 2016 +0100 Quelques modifications et mises à jour sur les spécifications (See #7656) Summary of changes: .../AllegroCampagne-Specifications.odt | Bin 982028 -> 996724 bytes 1 file 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 0

branch feature/7929_editeur_de_zone updated (38b5700 -> 3be1d33)
by codelutin.com scm Feb. 2, 2016

Feb. 2, 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 38b5700 - 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 b99cb29 tri des noeuds + i18n (refs #7929) new 6ca90c6 utilisation de fromEntity et toEntity au lieu de fromBean et toBean new 3be1d33 - utilisation directement du modele du protocol - ajout d'une popup de menu pour surrpimer et renommer les zones (refs #7929) 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 3be1d33a764b90698038151856df99fe3ec8f50f 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 6ca90c62a9ded86114ddad35c64fe7f696146291 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 b99cb2954d19ab03401aaff1bbab0ea0a75091c1 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Feb 2 14:36:07 2016 +0100 tri des noeuds + i18n (refs #7929) Summary of changes: .../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 +- .../content/protocol/EditProtocolUIHandler.java | 26 +-- .../content/protocol/EditProtocolUIModel.java | 179 +++++++++++++++++- .../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 | 17 +- .../swing/content/protocol/zones/ZoneEditorUI.jaxx | 18 +- .../swing/content/protocol/zones/ZoneEditorUI.jcss | 16 +- .../protocol/zones/ZoneEditorUIHandler.java | 207 +++++++++++---------- .../content/protocol/zones/ZoneEditorUIModel.java | 175 ----------------- .../protocol/zones/actions/AddStratasAction.java | 55 +++--- .../CollapseAvailableStratasTreeAction.java | 3 +- .../zones/actions/CollapseZonesTreeAction.java | 3 +- .../protocol/zones/actions/CreateZoneAction.java | 8 +- .../protocol/zones/actions/DeleteZoneAction.java | 26 ++- .../protocol/zones/actions/RenameZoneAction.java | 54 ++++++ .../protocol/zones/models/SubStrataUIModel.java | 6 +- .../zones/tree/AbstractZoneEditorTreeModel.java | 25 +++ .../protocol/zones/tree/StratasTreeModel.java | 30 +-- .../protocol/zones/tree/ZoneEditorNode.java | 19 ++ .../protocol/zones/tree/ZonesTreeModel.java | 34 +--- .../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 | 11 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 13 +- 42 files changed, 563 insertions(+), 442 deletions(-) delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZoneEditorUIModel.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/tree/AbstractZoneEditorTreeModel.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%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch feature/7656 created (now 6c0822a)
by codelutin.com scm Feb. 2, 2016

Feb. 2, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/7656 in repository tutti. See http://git.codelutin.com/tutti.git at 6c0822a [jgitflow-maven-plugin]Updating develop poms back to pre merge state 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 feature/7929_editeur_de_zone updated (0f29ae8 -> 38b5700)
by codelutin.com scm Feb. 1, 2016

Feb. 1, 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 0f29ae8 on pousse les zones dans le modele de protocole (peut etre faire l'inverse...) (refs #7929) new 38b5700 - 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) 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 38b5700dd45a62f7f04d121064d8d3ea053f2751 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) Summary of changes: .../content/protocol/EditProtocolUIHandler.java | 6 +++ .../swing/content/protocol/zones/ZoneEditorUI.jaxx | 1 + .../swing/content/protocol/zones/ZoneEditorUI.jcss | 7 ++- .../protocol/zones/ZoneEditorUIHandler.java | 30 ++++++++---- .../protocol/zones/actions/CreateZoneAction.java | 15 ++++++ .../protocol/zones/actions/DeleteZoneAction.java | 54 ++++++++++++++++++++++ .../protocol/zones/tree/StratasTreeModel.java | 14 ++++-- .../protocol/zones/tree/ZonesTreeModel.java | 14 +++--- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + 10 files changed, 120 insertions(+), 23 deletions(-) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/DeleteZoneAction.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/7929_editeur_de_zone updated (c009f80 -> 0f29ae8)
by codelutin.com scm Jan. 29, 2016

Jan. 29, 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 c009f80 ajout des listeners sur les strates et sous strates (refs #7929) new 00cd88d suprpession des sous strates d'une zone (refs #7929) new ede2fb2 ajout des icones + tri des noeuds dans les arbres (refs #7929) new 08c08a6 sauvegarde du protocol (refs #7929) new 0f29ae8 on pousse les zones dans le modele de protocole (peut etre faire l'inverse...) (refs #7929) The 4 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 0f29ae890ce61c4d136afcd6ad1091cf30cc4dfc 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 08c08a6124f05fd054c22bfaf8c38dcb359ac40e Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Jan 29 17:12:06 2016 +0100 sauvegarde du protocol (refs #7929) commit ede2fb2b8acf64ad94ad87819800cd4ebdd5b567 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 00cd88dd28c8eaee31674e1943eb332016214290 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) Summary of changes: .../entities/protocol/TuttiProtocols.java | 3 + .../service/ProtocolPersistenceServiceImpl.java | 47 ++++++++++ .../content/protocol/EditProtocolUIHandler.java | 10 ++- .../content/protocol/EditProtocolUIModel.java | 11 ++- .../protocol/actions/SaveProtocolAction.java | 12 ++- .../swing/content/protocol/zones/ZoneEditorUI.jaxx | 6 ++ .../swing/content/protocol/zones/ZoneEditorUI.jcss | 30 ++++++- .../protocol/zones/ZoneEditorUIHandler.java | 78 +++++++++++----- .../content/protocol/zones/ZoneEditorUIModel.java | 98 ++++++++++----------- .../protocol/zones/actions/AddStratasAction.java | 2 +- .../CollapseAvailableStratasTreeAction.java | 20 +++++ .../zones/actions/CollapseZonesTreeAction.java | 20 +++++ .../actions/ExpandAvailableStratasTreeAction.java | 21 +++++ .../zones/actions/ExpandZonesTreeAction.java | 21 +++++ .../zones/actions/RemoveStratasAction.java | 17 ++-- .../protocol/zones/models/StrataUIModel.java | 33 +++++++ .../protocol/zones/models/SubStrataUIModel.java | 14 +++ .../content/protocol/zones/models/ZoneUIModel.java | 50 +++++++++-- .../content/protocol/zones/tree/StrataNode.java | 5 +- .../protocol/zones/tree/StratasTreeModel.java | 44 ++------- .../content/protocol/zones/tree/SubStrataNode.java | 4 +- .../protocol/zones/tree/ZoneEditorNode.java | 33 +++++++ .../zones/tree/ZoneEditorTreeCellRenderer.java | 37 ++++---- .../content/protocol/zones/tree/ZoneNode.java | 5 +- .../protocol/zones/tree/ZonesTreeModel.java | 21 ++++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 2 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 3 - .../src/main/resources/icons/action-left.png | Bin 0 -> 345 bytes .../src/main/resources/icons/action-right.png | Bin 0 -> 349 bytes 29 files changed, 482 insertions(+), 165 deletions(-) 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/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/tree/ZoneEditorNode.java 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 4

branch feature/7929_editeur_de_zone updated (f259b29 -> c009f80)
by codelutin.com scm Jan. 28, 2016

Jan. 28, 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 f259b29 creation de zones + déplacement des noeuds (refs #7929) new 8f112f8 création des modeles de strates et sous strates (refs #7929) new c009f80 ajout des listeners sur les strates et sous strates (refs #7929) 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 c009f80feee094d357eee660e214f0fb57aed602 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 8f112f8d85b2647687b21892d79071535c7f4caf 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) Summary of changes: .../swing/content/protocol/zones/ZoneEditorUI.jaxx | 1 + .../protocol/zones/ZoneEditorUIHandler.java | 136 +++++++++++--- .../content/protocol/zones/ZoneEditorUIModel.java | 165 +++++++++-------- .../content/protocol/zones/ZonesTreeModel.java | 98 ---------- .../protocol/zones/actions/AddStratasAction.java | 51 ++++-- .../protocol/zones/actions/CreateZoneAction.java | 10 +- .../zones/actions/RemoveStratasAction.java | 58 +++++- .../protocol/zones/models/StrataUIModel.java | 192 ++++++++++++++++++++ .../protocol/zones/models/SubStrataUIModel.java | 108 +++++++++++ .../protocol/zones/{ => models}/ZoneUIModel.java | 44 ++++- .../content/protocol/zones/nodes/StrataNode.java | 20 -- .../protocol/zones/nodes/SubStrataNode.java | 20 -- .../content/protocol/zones/tree/StrataNode.java | 20 ++ .../zones/{ => tree}/StratasTreeModel.java | 75 +++++++- .../content/protocol/zones/tree/SubStrataNode.java | 20 ++ .../{ => tree}/ZoneEditorTreeCellRenderer.java | 16 +- .../protocol/zones/{nodes => tree}/ZoneNode.java | 4 +- .../protocol/zones/tree/ZonesTreeModel.java | 202 +++++++++++++++++++++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 +- 19 files changed, 955 insertions(+), 287 deletions(-) delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZonesTreeModel.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 rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/{ => models}/ZoneUIModel.java (69%) delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/nodes/StrataNode.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/nodes/SubStrataNode.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/StrataNode.java rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/{ => tree}/StratasTreeModel.java (57%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/SubStrataNode.java rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/{ => tree}/ZoneEditorTreeCellRenderer.java (70%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/{nodes => tree}/ZoneNode.java (69%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZonesTreeModel.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1