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 bb70759 Merge branch 'feature/7613' into develop new 5cb90e6 migration de la composition globale de la ligne (refs #7614) new 38188f5 enregistrement des collections de references : new a58716a ajout des validateurs (refs #7614) new 02cb1b3 Merge branch 'feature/7614' into develop 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 02cb1b31b3620d67852b54e7cd78e6acb99b71e8 Merge: bb70759 a58716a Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Oct 23 10:05:34 2015 +0200 Merge branch 'feature/7614' into develop commit a58716a6738cbcafe80aa4ff0202face8eb621e2 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Oct 23 10:04:03 2015 +0200 ajout des validateurs (refs #7614) commit 38188f54bb7f275e97f0214d83161b52d8f3c451 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Oct 23 09:45:02 2015 +0200 enregistrement des collections de references : commit 5cb90e690f27b086b8ebda25b133d6e302492917 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Oct 23 09:43:56 2015 +0200 migration de la composition globale de la ligne (refs #7614) Summary of changes: .../impl/longline/LonglineGlobalCompositionUI.css | 6 +- .../impl/longline/LonglineGlobalCompositionUI.jaxx | 11 +-- .../LonglineGlobalCompositionUIHandler.java | 92 ++++++++++++--------- .../longline/LonglineGlobalCompositionUIModel.java | 6 +- .../table/impl/longline/BaitsCompositionUI.css | 2 +- .../table/impl/longline/BaitsCompositionUI.jaxx | 4 +- .../impl/longline/BaitsCompositionUIHandler.java | 31 ++----- .../impl/longline/BaitsCompositionUIModel.java | 38 +++++---- .../impl/longline/BranchlinesCompositionUI.css | 3 +- .../impl/longline/BranchlinesCompositionUI.jaxx | 4 +- .../longline/BranchlinesCompositionUIHandler.java | 45 ++++------ .../longline/BranchlinesCompositionUIModel.java | 25 +++++- .../impl/longline/FloatlinesCompositionUI.css | 2 +- .../impl/longline/FloatlinesCompositionUI.jaxx | 17 ++-- .../longline/FloatlinesCompositionUIHandler.java | 50 ++++------- .../longline/FloatlinesCompositionUIModel.java | 34 ++++++-- .../table/impl/longline/HooksCompositionUI.css | 3 +- .../table/impl/longline/HooksCompositionUI.jaxx | 23 +++--- .../impl/longline/HooksCompositionUIHandler.java | 51 ++++-------- .../impl/longline/HooksCompositionUIModel.java | 34 ++++++-- ...tsCompositionDto-n1-update-error-validation.xml | 0 ...esCompositionDto-n1-update-error-validation.xml | 0 ...esCompositionDto-n1-update-error-validation.xml | 0 ...ksCompositionDto-n1-update-error-validation.xml | 0 ...n1-update-baitsComposition-error-validation.xml | 0 ...ate-branchlinesComposition-error-validation.xml | 0 ...date-floatlinesComposition-error-validation.xml | 0 ...1-update-globalComposition-error-validation.xml | 0 ...n1-update-hooksComposition-error-validation.xml | 0 ...LonglineGlobalCompositionServiceController.java | 3 +- .../SetLonglineGlobalCompositionService.java | 3 +- .../longline/SetLonglineGlobalCompositionDto.java | 90 ++++++++++++++++++++ .../main/xmi/observe-services-dto-longline.zargo | Bin 63139 -> 63218 bytes .../services/builder/DtoToEntityBuilder.java | 8 +- .../services/dto/ObserveDtosInitializer.java | 1 + .../SetLonglineGlobalCompositionServiceTopia.java | 6 +- 36 files changed, 348 insertions(+), 244 deletions(-) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/BaitsComposition-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/BaitsCompositionDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/BranchlinesComposition-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/BranchlinesCompositionDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/FloatlinesComposition-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/FloatlinesCompositionDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/HooksComposition-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/HooksCompositionDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-baitsComposition-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-n1-update-baitsComposition-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-branchlinesComposition-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-n1-update-branchlinesComposition-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-floatlinesComposition-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-n1-update-floatlinesComposition-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-globalComposition-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-n1-update-globalComposition-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-hooksComposition-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-n1-update-hooksComposition-error-validation.xml (100%) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.