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 d5db9ba Merge branch 'feature/7600' into develop new ec568b5 Migration de l'écran des estimations sur l'object (refs #7601) new e543f39 mise en place de la validation (refs #7601) new 620eb01 Merge branch 'feature/7601' into develop The 3 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 620eb0197314c985956c01de0a10061738269651 Merge: d5db9ba e543f39 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Oct 15 18:00:54 2015 +0200 Merge branch 'feature/7601' into develop commit e543f390cb504960b60a6340439060f75bb16659 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Oct 15 17:59:14 2015 +0200 mise en place de la validation (refs #7601) commit ec568b5369ea7287010ae9323e179a8ed56cfde1 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Oct 15 17:44:50 2015 +0200 Migration de l'écran des estimations sur l'object (refs #7601) Summary of changes: .../fr/ird/observe/ObserveOpenDataManager.java | 5 ++ .../ui/content/table/ContentTableUIHandler.java | 2 +- .../table/impl/seine/ObjectSchoolEstimateUI.jaxx | 14 ++-- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 38 ++++------ .../impl/seine/ObjectSchoolEstimateUIModel.java | 40 +++++++--- ...choolEstimateDto-n1-update-error-validation.xml | 0 ...choolEstimateDto-n1-update-error-validation.xml | 0 ...oolEstimateDto-n1-update-warning-validation.xml | 0 .../ObjectSchoolEstimateServiceController.java | 4 +- .../ird/observe/entities/referentiel/Species2.java | 18 +++++ .../observe/entities/referentiel/SpeciesLists.java | 11 +++ .../service/seine/ObjectSchoolEstimateService.java | 2 +- .../ird/observe/services/ObserveServiceTopia.java | 22 ++++-- .../ird/observe/services/entity/EntitiesSet.java | 36 +++++++++ .../services/entity/ObserveEntitiesFilters.java | 87 ++++++++++++++-------- .../services/entity/ObserveEntityFilter.java | 11 ++- .../services/entity/SpeciesListEntitiesSet.java | 27 +++++++ .../services/entity/UniverseEntitiesSet.java | 30 ++++++++ .../seine/ObjectSchoolEstimateServiceTopia.java | 4 +- 19 files changed, 259 insertions(+), 92 deletions(-) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-update-objectSchoolEstimate-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectSchoolEstimateDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ObjectSchoolEstimate-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/ObjectSchoolEstimateDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ObjectSchoolEstimate-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/ObjectSchoolEstimateDto-n1-update-warning-validation.xml (100%) create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/referentiel/SpeciesLists.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesSet.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/entity/SpeciesListEntitiesSet.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/entity/UniverseEntitiesSet.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.