This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git 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 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 | 243 +++++++++++++++++++++ .../TripSeineDto-n1-create-warning-validation.xml | 54 +++++ .../TripSeineDto-n1-update-error-validation.xml | 206 +++++++++++++++++ .../TripSeineDto-n1-update-warning-validation.xml | 94 ++++++++ .../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, 807 insertions(+), 185 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.