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 ed9282f migration de la composition detaillée de la ligne (refs #7615) new 5c8e4c5 migration des captures de palangre (refs #7616) new 03685b9 ajout des validateurs (refs #7616) new 7d67bae correction des tableau de poids et de tailles (refs #7616) new dab956e Merge branch 'feature/7616' 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 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 commit 7d67baefbf677f36475f2b3160c46fbbee59b8db Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Oct 28 16:47:50 2015 +0100 correction des tableau de poids et de tailles (refs #7616) commit 03685b9f52ddb82329a1e8a6929ef7b175fb581e Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Oct 28 15:56:18 2015 +0100 ajout des validateurs (refs #7616) commit 5c8e4c50696f111398dd954d747c8d5717d39e20 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Oct 28 15:42:52 2015 +0100 migration des captures de palangre (refs #7616) Summary of changes: .../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 | 0 ...CatchLonglineDto-n1-update-error-validation.xml | 0 ...tchLonglineDto-n1-update-warning-validation.xml | 0 .../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 | 21 +- .../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, 782 insertions(+), 614 deletions(-) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/Branchline-n1-update-catchLongline-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-n1-update-catchLongline-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/CatchLongline-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/CatchLonglineDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/CatchLongline-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/CatchLonglineDto-n1-update-warning-validation.xml (100%) create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/BranchlineServiceController.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/longline/BranchlineService.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/BasketDto.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/BranchlineDto.java copy observe-application-swing/src/main/java/fr/ird/observe/business/LonglinePositionAware.java => observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/LonglinePositionAwareDto.java (69%) create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/entity/BasketEntitiesExtractor.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/entity/BranchlineEntitiesExtractor.java rename observe-services-topia/src/main/java/fr/ird/observe/services/entity/{EntitiesSet.java => EntitiesExtractor.java} (73%) create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/entity/SectionEntitiesExtractor.java rename observe-services-topia/src/main/java/fr/ird/observe/services/entity/{SpeciesListEntitiesSet.java => SpeciesListEntitiesExtractor.java} (74%) rename observe-services-topia/src/main/java/fr/ird/observe/services/entity/{SpeciesListOceanEntitiesSet.java => SpeciesListOceanEntitiesExtractor.java} (76%) create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/BranchlineServiceTopia.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.