This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit afab8fb4e84115318562cd31176a960485c3c448 Merge: aa47dd3 43477dd Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Mar 8 21:31:30 2016 +0100 Fixes #7600 Merge branch 'feature/7600-PS-VerifOperationSurObjetFlottant' into develop .../fr/ird/observe/db/constants/ConstantsI18n.java | 23 - .../observe/ui/content/ContentUIInitializer.java | 22 + ...ngObjectTransmittingBuoyOperationUIHandler.java | 14 +- .../impl/seine/FloatingObjectUIHandler.java | 1 + .../ui/content/impl/seine/SetSeineUIHandler.java | 4 +- .../ui/util/tripMap/TripMapContentBuilder.java | 47 ++- ...nsmittingBuoyDto-n1-update-error-validation.xml | 75 ++++ ...mittingBuoyDto-n1-update-warning-validation.xml | 38 ++ .../observe-application-swing_en_GB.properties | 8 + .../observe-application-swing_es_ES.properties | 8 + .../observe-application-swing_fr_FR.properties | 3 + observe-entities/pom.xml | 26 -- .../entities/constants/GearTypePersist.java | 38 +- .../constants/TripMapPointTypePersist.java | 44 +- .../NonTargetCatchComputedValueSourcePersist.java | 23 +- .../entities/constants/seine/OwnershipPersist.java | 35 +- .../constants/seine/SchoolTypePersist.java | 24 +- .../TypeTransmittingBuoyOperationPersist.java | 57 +-- .../observe/entities/gps/GPSPointIntervalImpl.java | 4 +- .../entities/longline/TripLonglineTopiaDao.java | 20 +- .../ird/observe/entities/referentiel/Species2.java | 5 - .../observe/entities/seine/ActivitySeineImpl.java | 5 - .../observe/entities/seine/NonTargetCatchImpl.java | 4 +- .../ird/observe/entities/seine/SetSeineImpl.java | 7 - .../observe/entities/seine/TripSeineTopiaDao.java | 14 +- .../i18n/observe-entities_en_GB.properties | 462 --------------------- .../i18n/observe-entities_es_ES.properties | 461 -------------------- .../i18n/observe-entities_fr_FR.properties | 462 --------------------- observe-services-api/pom.xml | 12 + .../fr/ird/observe/services/util/I18nEnumUtil.java | 75 ++++ .../i18n/observe-services-api_en_GB.properties | 34 ++ .../i18n/observe-services-api_es_ES.properties | 34 ++ .../i18n/observe-services-api_fr_FR.properties | 34 ++ .../observe/services/dto/constants/GearType.java | 33 +- .../services/dto/constants/ReferenceStatus.java | 22 +- .../services/dto/constants/TripMapPointType.java | 46 +- .../seine/NonTargetCatchComputedValueSource.java | 6 +- .../ConsolidateActivitySeineDataResultBuilder.java | 13 +- .../consolidate/ConsolidateDataServiceTopia.java | 18 +- .../TransmittingBuoyOperationServiceTopia.java | 10 + .../actions/validate/ValidateServiceTopiaTest.java | 3 +- pom.xml | 2 +- 42 files changed, 500 insertions(+), 1776 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.