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 2e27a48 Termine #7586 Rock'n Roll! Merge branch 'feature/7586' into develop new d30781b début de migration de l'ecran (refs #7587) new 3b53dd5 début de migration de l'ecran (refs #7587) new c064c65 Renommage de ObserveValidator en ObserveSwingValidator new 5b96fb0 correction de la validation + ajout des routes dans le DTO de trip seine (refs #7587) new 4aff5ad correction de la validation + ajout des routes dans le DTO de trip seine (refs #7587) new cf7321f correction de la validation + ajout des routes dans le DTO de trip seine (refs #7587) new 5877b30 adpatation des la carte + petite rose de vents (refs #7587) new 1dcdd98 calcule de la nouvelle position de la marée (refs #7587) new 3531dda dans le service save remonter l'id et le lastUpdate dans un SaveResultDto (refs #7587). new 83e27fc créer une methode de service pour recupérer la position d'une marée seine dans un programe (refs #7587). new 4a27493 Merge branch 'feature/7587' into develop The 11 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 4a2749384cc381b22f80c773dc474af711c50682 Merge: 2e27a48 83e27fc Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Oct 7 09:32:46 2015 +0200 Merge branch 'feature/7587' into develop commit 83e27fcbced876ae0bb7e22363349220dc5b11a5 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Oct 7 09:17:06 2015 +0200 créer une methode de service pour recupérer la position d'une marée seine dans un programe (refs #7587). commit 3531ddadf20bac1886cf96b05788a40cc22feb04 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Oct 7 09:04:11 2015 +0200 dans le service save remonter l'id et le lastUpdate dans un SaveResultDto (refs #7587). commit 1dcdd98999735fea3540642e97b77b89a8c81970 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Oct 6 16:58:55 2015 +0200 calcule de la nouvelle position de la marée (refs #7587) commit 5877b30ad3962342c7ac63d04c077ff66696349a Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Oct 6 16:14:01 2015 +0200 adpatation des la carte + petite rose de vents (refs #7587) commit cf7321f225db9a07eda65c911af24af97eaeab1d Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Oct 6 15:29:53 2015 +0200 correction de la validation + ajout des routes dans le DTO de trip seine (refs #7587) commit 4aff5ada12c0fd11df98225ff3f26991cb7a8435 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Oct 6 14:30:12 2015 +0200 correction de la validation + ajout des routes dans le DTO de trip seine (refs #7587) commit 5b96fb0ab86d8f010a689134e59d85875c7df468 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Oct 6 14:26:13 2015 +0200 correction de la validation + ajout des routes dans le DTO de trip seine (refs #7587) commit c064c6599dc2dc017083085a56e173205bfeff6d Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 6 11:57:41 2015 +0200 Renommage de ObserveValidator en ObserveSwingValidator commit 3b53dd5c6ff1f7f17cc892ae622109baba72a16b Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Oct 6 11:24:49 2015 +0200 début de migration de l'ecran (refs #7587) commit d30781b8df6c5c6801079373b8ea6b3768f12eae Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Oct 5 18:21:33 2015 +0200 début de migration de l'ecran (refs #7587) Summary of changes: observe-application-swing/pom.xml | 2 +- .../observe/ObserveSwingApplicationContext.java | 4 +- .../business/ObserveApplicationContext.java | 4 +- ...veValidator.java => ObserveSwingValidator.java} | 26 +++--- .../business/validation/ValidationContext.java | 2 +- .../ird/observe/ui/content/ContentUIHandler.java | 6 +- .../observe/ui/content/ContentUIInitializer.java | 27 +++++-- .../ird/observe/ui/content/ObserveContentUI.java | 3 +- .../ui/content/open/ContentOpenableUIHandler.java | 61 +++++++------- .../impl/longline/ActivityLonglineUIHandler.java | 7 +- .../open/impl/longline/TripLonglineUIHandler.java | 10 ++- .../open/impl/seine/ActivitySeineUIHandler.java | 8 ++ .../ui/content/open/impl/seine/RouteUIHandler.java | 6 ++ .../ui/content/open/impl/seine/TripSeineUI.jaxx | 4 +- .../open/impl/seine/TripSeineUIHandler.java | 90 +++++---------------- .../content/open/impl/seine/TripSeineUIModel.java | 10 +-- .../content/table/impl/seine/NonTargetCatchUI.jaxx | 2 +- .../java/fr/ird/observe/ui/tree/TripSeineNode.java | 2 +- .../observe/ui/util/tripMap/ObserveMapPane.java | 40 ++++++--- .../ui/util/tripMap/TripMapContentBuilder.java | 17 ++-- .../observe/ui/util/tripMap/TripMapUIHandler.java | 23 +++--- .../TripSeineDto-n1-create-error-validation.xml | 0 .../TripSeineDto-n1-create-warning-validation.xml | 0 .../TripSeineDto-n1-update-error-validation.xml | 0 .../TripSeineDto-n1-update-warning-validation.xml | 2 +- .../v1/seine/TripSeineServiceController.java | 8 +- .../services/service/seine/TripSeineService.java | 7 +- .../src/main/xmi/observe-services-dto-common.zargo | Bin 41878 -> 42247 bytes .../main/xmi/observe-services-dto-seine.properties | 1 + .../src/main/xmi/observe-services-dto-seine.zargo | Bin 59029 -> 59456 bytes .../services/dto/ObserveDtosInitializer.java | 8 +- .../service/seine/TripSeineServiceTopia.java | 12 ++- .../service/seine/TripSeineServiceTopiaTest.java | 5 +- 33 files changed, 211 insertions(+), 186 deletions(-) rename observe-application-swing/src/main/java/fr/ird/observe/business/validation/{ObserveValidator.java => ObserveSwingValidator.java} (88%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-create-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-create-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-n1-update-warning-validation.xml (99%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.