This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 2107f8a Début de la mise en place de l'arbre de navigation Merge branch 'feature/7553' into develop new 9d449cb correction du remplissage des données referentielles des combo et listes new 35287ed correction de l'ouverture de l'écran de marée (refs #7586) new d4e5353 affichage de l'écran d'édition de marée quand on clique sur nouvelle marée (refs #7586) new fe0a577 chargement des triplonglines (refs #7586) new 54f7e07 fix decorator(refs #7586) new 65595be fix compilation new 2e27a48 Termine #7586 Rock'n Roll! Merge branch 'feature/7586' into develop The 7 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 2e27a48b00afa0384bde3a81e9fea65e8bca4557 Merge: 2107f8a 65595be Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 6 17:52:31 2015 +0200 Termine #7586 Rock'n Roll! Merge branch 'feature/7586' into develop commit 65595be4c187f300f9622c408d5149340939038a Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 6 16:33:11 2015 +0200 fix compilation commit 54f7e07ed265ede21edc01962a5e20616276cdc4 Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 6 16:00:38 2015 +0200 fix decorator(refs #7586) commit fe0a5771f418e9a28b35eb892b35da0054c6481a Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 6 15:44:22 2015 +0200 chargement des triplonglines (refs #7586) commit d4e5353cb86a56c20df54000b557914f2f3fdf52 Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 6 12:48:17 2015 +0200 affichage de l'écran d'édition de marée quand on clique sur nouvelle marée (refs #7586) commit 35287edf1e4391e355cfbbee40a67bb603dd0f1e Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 6 12:17:54 2015 +0200 correction de l'ouverture de l'écran de marée (refs #7586) commit 9d449cbd028240dbb2163f5dd79a0ec13c291f7a Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 5 17:03:15 2015 +0200 correction du remplissage des données referentielles des combo et listes Summary of changes: .../observe/ObserveSwingApplicationContext.java | 10 +- .../business/db/model/DataSelectionModel.java | 345 +++++++++++---------- .../java/fr/ird/observe/ui/DecoratorService.java | 123 ++++---- .../ird/observe/ui/content/ContentUIHandler.java | 11 +- .../observe/ui/content/ContentUIInitializer.java | 215 ++++++++----- .../ird/observe/ui/content/ContentUIManager.java | 16 +- .../fr/ird/observe/ui/content/ContentUIModel.java | 5 +- .../list/impl/longline/TripLonglinesUIHandler.java | 10 +- .../content/open/impl/longline/TripLonglineUI.css | 7 +- .../ui/content/open/impl/seine/TripSeineUI.css | 6 +- .../ui/storage/tabs/DataSelectionModel.java | 2 +- .../observe/ui/storage/tabs/RolesTableModel.java | 3 +- .../ui/storage/tabs/StorageTabUIHandler.java | 3 +- .../ui/tree/DataSelectionTreeSelectionModel.java | 14 +- .../loadors/ProgramLonglineNodeChildLoador.java | 22 +- .../observe-application-swing_en_GB.properties | 8 + .../observe-application-swing_es_ES.properties | 8 + .../observe-application-swing_fr_FR.properties | 16 +- .../resources/i18n/observe-swing_fr_FR.properties | 16 +- .../v1/longline/TripLonglineServiceController.java | 5 +- .../service/longline/TripLonglineService.java | 3 +- .../java/fr/ird/observe/services/dto/FormDto.java | 7 +- .../services/dto/referential/PersonDtos.java | 48 +++ .../services/dto/referential/ReferentialDtos.java | 40 +++ .../services/dto/ObserveDtosInitializer.java | 6 +- .../service/longline/TripLonglineServiceTopia.java | 29 +- 26 files changed, 587 insertions(+), 391 deletions(-) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/PersonDtos.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.