This is an automated email from the git hooks/post-receive script. New change to branch feature/7601-PS-VerifEstimationdesBancSurObjetFlottant in repository tutti. See http://git.codelutin.com/tutti.git discards b0fedab Ajout du filtre sure les espèces de thons (see #7601). discards fd81f78 Ajout de trace dans les appels des services (see #7601). adds 6088843 Ajout du filtre des navires sur les écrans des marées adds 112c59b Ajout de trace dans les appels des services. adds 4030cc1 Ajout de la distance des système observé dans les binders dto <--> entité adds 5168461 Ajout du type de vessel pour poivoir effectuer le filtre dessus dans l'écran des marées adds 87244c8 Fixes #7597 Merge branch 'feature/7597-PS-SystemObserve' into develop adds da782f1 Ajout de trace dans les appels des services. adds 4de9b91 icone du DCP dans les menus "Remonter ves.." et "Descendre vers..." adds aa47dd3 Fixes #7599 Merge branch 'feature/7599-PS-VerifObjetFlottant' into develop adds 21dff26 Ajout de trace dans les appels des services. adds e21f2d9 Ajout des validateurs pour les bouées de transmissions adds 4d109c4 Ajout des traduction pour les typed'opération et les type de balise (reste à les faire fonctionner avec l'EnumEditor) adds 7efba2c vider les champs au changement de type d'opération adds f0be63a Suppression des traductions dans le module de persistence adds 71ec21c Ajout des traductions d'enumération dans l'api de service adds 96a491e Utilisation de I18nEnumUtil dans les implantations de service adds 26816a1 Revue des constantes dans le modèle de service adds 84a5355 Correction d'un test suite à un changement sur le validateur SchoolEstimate adds 43477dd Initilisation de EnumEditor avec les libellés + suppression ConstantsI18n adds afab8fb Fixes #7600 Merge branch 'feature/7600-PS-VerifOperationSurObjetFlottant' into develop adds ba2eb81 Ajout de trace dans les appels des services (see #7601). adds d51f35e Ajout du filtre sure les espèces de thons (see #7601). adds 2d50803 Use stream API adds 4a77188 Remove ReferentialReference.lastUpdate This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (b0fedab) \ N -- N -- N refs/heads/feature/7601-PS-VerifEstimationdesBancSurObjetFlottant (4a77188) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. No new revisions were added by this update. Summary of changes: .../src/main/filters/observe-ui.properties | 2 +- .../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 +- .../open/impl/longline/TripLonglineUIHandler.java | 11 + .../open/impl/seine/TripSeineUIHandler.java | 11 + .../impl/seine/ObjectSchoolEstimateUIHandler.java | 5 +- .../ui/util/tripMap/TripMapContentBuilder.java | 47 ++- ...nsmittingBuoyDto-n1-update-error-validation.xml | 0 ...mittingBuoyDto-n1-update-warning-validation.xml | 0 .../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 +- .../reference/ReferentialReferenceAdapter.java | 10 +- .../ReferentialReferenceSetDefinitions.java | 4 +- .../dto/referential/ReferentialReference.java | 15 +- .../services/dto/referential/VesselDtos.java | 31 ++ .../data/ActivitySeineObservedSystemDtoBinder.java | 2 + .../referential/ReferentialBinderSupport.java | 4 +- .../services/binder/referential/VesselBinder.java | 8 +- .../ConsolidateActivitySeineDataResultBuilder.java | 13 +- .../consolidate/ConsolidateDataServiceTopia.java | 18 +- .../ActivitySeineObservedSystemServiceTopia.java | 10 + .../service/seine/FloatingObjectServiceTopia.java | 30 ++ .../TransmittingBuoyOperationServiceTopia.java | 10 + .../actions/validate/ValidateServiceTopiaTest.java | 3 +- pom.xml | 2 +- 55 files changed, 502 insertions(+), 1804 deletions(-) delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/db/constants/ConstantsI18n.java copy observe-entities/src/main/resources/fr/ird/observe/entities/seine/TransmittingBuoy-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TransmittingBuoyDto-n1-update-error-validation.xml (100%) copy observe-entities/src/main/resources/fr/ird/observe/entities/seine/TransmittingBuoy-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TransmittingBuoyDto-n1-update-warning-validation.xml (100%) delete mode 100644 observe-entities/src/main/resources/i18n/observe-entities_en_GB.properties delete mode 100644 observe-entities/src/main/resources/i18n/observe-entities_es_ES.properties delete mode 100644 observe-entities/src/main/resources/i18n/observe-entities_fr_FR.properties create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/util/I18nEnumUtil.java create mode 100644 observe-services-api/src/main/resources/i18n/observe-services-api_en_GB.properties create mode 100644 observe-services-api/src/main/resources/i18n/observe-services-api_es_ES.properties create mode 100644 observe-services-api/src/main/resources/i18n/observe-services-api_fr_FR.properties create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/VesselDtos.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.