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 ba4b82287e618c83bce0dd029d429ddc83876bb1 Merge: d07cdbe 1a77e25 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 19 01:57:51 2015 +0200 Revue de code (retour sur develop pour que ça avance) Merge branch 'feature/correction + revue de code' into develop .../ObserveSwingApplicationConfigOption.java | 17 +- .../fr/ird/observe/db/ObserveSwingDataSource.java | 16 +- .../observe/entities/tripMap/TripMapPointType.java | 4 +- .../observe/ui/content/ContentUIInitializer.java | 7 +- .../ui/content/ref/impl/longline/HookSizeUI.jaxx | 10 +- .../ui/content/ref/impl/longline/HookTypeUI.jaxx | 10 +- .../ui/content/table/ContentTableUIHandler.java | 4 +- .../ftl/dataSourceConnectionReport_fr.ftl | 2 +- .../observe-application-swing_en_GB.properties | 14 +- .../observe-application-swing_es_ES.properties | 14 +- .../observe-application-swing_fr_FR.properties | 16 +- .../application/web/ObserveWebMotionFilter.java | 18 ++- .../web/request/ObserveWebRequestContext.java | 7 + .../observe/ObserveTopiaConfigurationFactory.java | 7 + .../ird/observe/entities/constants/GearType.java | 4 +- .../seine/NonTargetCatchComputedValueSource.java | 6 +- .../entities/constants/seine/Ownership.java | 6 +- .../entities/constants/seine/SchoolType.java | 6 +- .../seine/TypeTransmittingBuoyOperation.java | 10 +- .../entities/referentiel/ReferenceEntities.java | 9 +- .../ird/observe/entities/referentiel/Species2.java | 2 +- .../observe/entities/referentiel/SpeciesLists.java | 15 -- .../i18n/observe-entities_en_GB.properties | 74 ++++----- .../i18n/observe-entities_es_ES.properties | 42 ++--- .../i18n/observe-entities_fr_FR.properties | 42 ++--- .../services/ObserveServiceInitializer.java | 22 +++ .../services/ObserveSpeciesListConfiguration.java | 149 +++++++++++++++++ .../services/service/DataSourceService.java | 2 +- ...bserveDataSourceConfigurationRestConstants.java | 2 + .../java/fr/ird/observe/services/dto/FormDto.java | 12 +- .../java/fr/ird/observe/services/dto/IdDto.java | 15 ++ .../services/dto/constants/ReferenceStatus.java | 4 +- .../services/dto/constants/TripMapPointType.java | 4 +- .../services/ObserveServiceFactoryRest.java | 7 +- .../fr/ird/observe/services/TestClassResource.java | 2 + .../fr/ird/observe/services/ObserveJdbcHelper.java | 2 + .../observe/services/ObserveSecurityHelper.java | 2 + .../services/ObserveServiceContextTopia.java | 12 ++ .../services/ObserveServiceFactoryTopia.java | 20 ++- .../ird/observe/services/ObserveServiceTopia.java | 74 ++++----- .../ObserveTopiaApplicationContextFactory.java | 2 + .../services/builder/DtoToEntityBuilder.java | 2 + .../services/builder/EntityToDtoBuilder.java | 2 + .../builder/EntityToReferenceDtoBuilder.java | 2 + .../EntityToReferentialReferenceDtoBuilder.java | 2 + .../observe/services/dto/ObserveDtoBinders.java | 2 + .../observe/services/dto/ReferenceTypeName.java | 18 +++ .../ird/observe/services/entity/EntitiesSet.java | 31 +++- .../services/entity/EntitiesSetFactory.java | 177 +++++++++++++++++++++ .../services/entity/ObserveEntitiesFilters.java | 143 ----------------- .../services/entity/ObserveEntityFilter.java | 71 --------- .../services/entity/SpeciesListEntitiesSet.java | 19 +-- .../entity/SpeciesListOceanEntitiesSet.java | 15 +- .../services/entity/UniverseEntitiesSet.java | 39 ----- .../ConsolidateActivitySeineDataResultBuilder.java | 3 + .../ActivitySeineObservedSystemServiceTopia.java | 8 +- .../services/ApplicationContextResource.java | 5 + .../fr/ird/observe/services/service/RigthTest.java | 7 +- .../service/seine/TripSeineServiceTopiaTest.java | 6 +- pom.xml | 3 +- 60 files changed, 721 insertions(+), 527 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.