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 dab956e10fcac06614610b846920af808c08ebc2 Merge: ed9282f 7d67bae Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Oct 28 16:48:11 2015 +0100 Merge branch 'feature/7616' into develop .../java/fr/ird/observe/ui/DecoratorService.java | 31 +- .../CatchLonglineContentTableUIInitializer.java | 4 +- .../impl/longline/CatchLonglineTableModel.java | 20 +- .../table/impl/longline/CatchLonglineUI.css | 2 - .../table/impl/longline/CatchLonglineUI.jaxx | 10 +- .../impl/longline/CatchLonglineUIHandler.java | 399 ++++++--------------- .../table/impl/longline/CatchLonglineUIModel.java | 47 +-- .../impl/longline/LonglinePositionHelper.java | 222 ++++++------ .../impl/longline/SizeMeasuresTableModel.java | 11 +- ...to-n1-update-catchLongline-error-validation.xml | 41 +++ ...CatchLonglineDto-n1-update-error-validation.xml | 175 +++++++++ ...tchLonglineDto-n1-update-warning-validation.xml | 63 ++++ .../v1/longline/BranchlineServiceController.java | 31 ++ .../SetLonglineCatchServiceController.java | 5 +- .../service/longline/BranchlineService.java | 27 ++ .../service/longline/SetLonglineCatchService.java | 3 +- .../fr/ird/observe/services/dto/ReferenceDto.java | 30 +- .../fr/ird/observe/services/dto/ReferenceDtos.java | 9 + .../observe/services/dto/longline/BasketDto.java | 8 + .../services/dto/longline/BranchlineDto.java | 9 + .../dto/longline/LonglinePositionAwareDto.java | 53 +++ .../main/xmi/observe-services-dto-longline.zargo | Bin 64399 -> 64814 bytes .../ird/observe/services/ObserveServiceTopia.java | 12 +- .../services/dto/ObserveDtosInitializer.java | 13 + .../services/entity/BasketEntitiesExtractor.java | 36 ++ .../entity/BranchlineEntitiesExtractor.java | 43 +++ .../{EntitiesSet.java => EntitiesExtractor.java} | 12 +- .../services/entity/EntitiesSetFactory.java | 224 +++++++----- .../services/entity/SectionEntitiesExtractor.java | 24 ++ ...sSet.java => SpeciesListEntitiesExtractor.java} | 10 +- ...java => SpeciesListOceanEntitiesExtractor.java} | 6 +- .../service/longline/BranchlineServiceTopia.java | 62 ++++ .../longline/SetLonglineCatchServiceTopia.java | 65 +++- 33 files changed, 1105 insertions(+), 602 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.