March 2016 - Observe-commits - mailman.cloud.codelutin.com

branch feature/7603-PS-verfiEcranEstimationBancDUneCalee updated (17795bc -> a2af24d)
by codelutin.com scm March 9, 2016

March 9, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/7603-PS-verfiEcranEstimationBancDUneCalee in repository tutti. See http://git.codelutin.com/tutti.git discards 17795bc supprimer la parametre tripSeineId devenu inutile (see #7603). discards 05a295b Ajouter une fonction dans le service de référentiel pour recupéré la list des espèces pour lun list et l'océan d'une marée (see #7603). discards 09b7b34 Ajout de trace dans les appels des services (see #7603). discards 9f6d85d Ajout du filtre sure les espèces de thons (see #7601). 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 adds bf3644c Fixes #7601 Merge branch 'feature/7601-PS-VerifEstimationdesBancSurObjetFlottant' into develop adds 59a668d Ajout de trace dans les appels des services (see #7602). adds 39e3385 Ajout du filtre sure les espèces (see #7602). adds 86a5a99 mauvais binding du nombre et du statut de l'espèce observé (see #7602). adds 3175213 Ajout méthode pour récupérer les ids des espèces d'une liste adds 27a75b7 Utilisation d'un Set plutôt q'une liste d'ids adds 97a9553 Fixes #7602 Merge branch 'feature/7602-PS-VerifFauneObserveSurObjetFlottant' into develop adds f108ab1 Ajout de trace dans les appels des services. implanter la méthode loadReferenceToRead (see #7598). adds b34c65e Recupérer la route pour connaitre la date de la calée, Après la creation de la calée, ajouter le noeud dans l'arbre de navigation, adds 88c8921 Fixes #7598 Merge branch 'feature/7598-PS-VerifEcranCalée' into develop adds 5e809f1 Ajout de trace dans les appels des services (see #7603). adds f4ebf2a Ajouter une fonction dans le service de référentiel pour recupéré la list des espèces pour lun list et l'océan d'une marée (see #7603). adds a2af24d supprimer la parametre tripSeineId devenu inutile (see #7603). 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 (17795bc) \ N -- N -- N refs/heads/feature/7603-PS-verfiEcranEstimationBancDUneCalee (a2af24d) 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: .../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 | 19 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 40 ++ .../impl/seine/ObjectSchoolEstimateUIHandler.java | 9 +- .../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 +- .../dto/referential/ReferentialReference.java | 15 +- .../dto/referential/ReferentialReferences.java | 7 +- .../services/dto/referential/SpeciesListDto.java | 14 + .../binder/data/ObjectObservedSpeciesBinder.java | 4 +- .../referential/ReferentialBinderSupport.java | 4 +- .../ConsolidateActivitySeineDataResultBuilder.java | 13 +- .../consolidate/ConsolidateDataServiceTopia.java | 18 +- .../seine/ObjectObservedSpeciesServiceTopia.java | 10 + .../seine/ObjectSchoolEstimateServiceTopia.java | 10 + .../service/seine/SetSeineServiceTopia.java | 38 +- .../TransmittingBuoyOperationServiceTopia.java | 10 + .../actions/validate/ValidateServiceTopiaTest.java | 3 +- pom.xml | 2 +- 53 files changed, 518 insertions(+), 1821 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/SpeciesListDto.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (bf3644c -> 88c8921)
by codelutin.com scm March 9, 2016

March 9, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from bf3644c Fixes #7601 Merge branch 'feature/7601-PS-VerifEstimationdesBancSurObjetFlottant' into develop adds 59a668d Ajout de trace dans les appels des services (see #7602). adds 39e3385 Ajout du filtre sure les espèces (see #7602). adds 86a5a99 mauvais binding du nombre et du statut de l'espèce observé (see #7602). adds 3175213 Ajout méthode pour récupérer les ids des espèces d'une liste adds 27a75b7 Utilisation d'un Set plutôt q'une liste d'ids adds 97a9553 Fixes #7602 Merge branch 'feature/7602-PS-VerifFauneObserveSurObjetFlottant' into develop adds f108ab1 Ajout de trace dans les appels des services. implanter la méthode loadReferenceToRead (see #7598). adds b34c65e Recupérer la route pour connaitre la date de la calée, Après la creation de la calée, ajouter le noeud dans l'arbre de navigation, new 88c8921 Fixes #7598 Merge branch 'feature/7598-PS-VerifEcranCalée' into develop The 1 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 88c8921045011148f6ef887e30f07b6238d530f7 Merge: 97a9553 b34c65e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 9 05:33:30 2016 +0100 Fixes #7598 Merge branch 'feature/7598-PS-VerifEcranCalée' into develop Summary of changes: .../ui/content/impl/seine/SetSeineUIHandler.java | 15 +++----- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 40 ++++++++++++++++++++++ .../impl/seine/ObjectSchoolEstimateUIHandler.java | 8 ++--- .../dto/referential/ReferentialReferences.java | 7 ++-- .../services/dto/referential/SpeciesListDto.java | 14 ++++++++ .../binder/data/ObjectObservedSpeciesBinder.java | 4 +-- .../seine/ObjectObservedSpeciesServiceTopia.java | 10 ++++++ .../service/seine/SetSeineServiceTopia.java | 38 ++++++++++++++++++-- 8 files changed, 113 insertions(+), 23 deletions(-) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/SpeciesListDto.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/7598-PS-VerifEcranCalée deleted (was b34c65e)
by codelutin.com scm March 9, 2016

March 9, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/7598-PS-VerifEcranCalée in repository tutti. See http://git.codelutin.com/tutti.git was b34c65e Recupérer la route pour connaitre la date de la calée, Après la creation de la calée, ajouter le noeud dans l'arbre de navigation, The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7598-PS-VerifEcranCalée updated (1d852ab -> b34c65e)
by codelutin.com scm March 9, 2016

March 9, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/7598-PS-VerifEcranCalée in repository tutti. See http://git.codelutin.com/tutti.git discards 1d852ab Recupérer la route pour connaitre la date de la calée, Après la creation de la calée, ajouter le noeud dans l'arbre de navigation, discards d4779e7 Ajout de trace dans les appels des services. implanter la méthode loadReferenceToRead (see #7598). 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 adds bf3644c Fixes #7601 Merge branch 'feature/7601-PS-VerifEstimationdesBancSurObjetFlottant' into develop adds 59a668d Ajout de trace dans les appels des services (see #7602). adds 39e3385 Ajout du filtre sure les espèces (see #7602). adds 86a5a99 mauvais binding du nombre et du statut de l'espèce observé (see #7602). adds 3175213 Ajout méthode pour récupérer les ids des espèces d'une liste adds 27a75b7 Utilisation d'un Set plutôt q'une liste d'ids adds 97a9553 Fixes #7602 Merge branch 'feature/7602-PS-VerifFauneObserveSurObjetFlottant' into develop adds f108ab1 Ajout de trace dans les appels des services. implanter la méthode loadReferenceToRead (see #7598). adds b34c65e Recupérer la route pour connaitre la date de la calée, Après la creation de la calée, ajouter le noeud dans l'arbre de navigation, 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 (1d852ab) \ N -- N -- N refs/heads/feature/7598-PS-VerifEcranCalée (b34c65e) 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: .../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 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 40 ++ .../impl/seine/ObjectSchoolEstimateUIHandler.java | 37 ++ .../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 +- .../dto/referential/ReferentialReference.java | 15 +- .../dto/referential/ReferentialReferences.java | 40 +- .../services/dto/referential/SpeciesListDto.java | 14 + .../binder/data/ObjectObservedSpeciesBinder.java | 4 +- .../referential/ReferentialBinderSupport.java | 4 +- .../ConsolidateActivitySeineDataResultBuilder.java | 13 +- .../consolidate/ConsolidateDataServiceTopia.java | 18 +- .../seine/ObjectObservedSpeciesServiceTopia.java | 10 + .../seine/ObjectSchoolEstimateServiceTopia.java | 10 + .../TransmittingBuoyOperationServiceTopia.java | 10 + .../actions/validate/ValidateServiceTopiaTest.java | 3 +- pom.xml | 2 +- 52 files changed, 547 insertions(+), 1800 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/SpeciesListDto.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7602-PS-VerifFauneObserveSurObjetFlottant deleted (was 27a75b7)
by codelutin.com scm March 9, 2016

March 9, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/7602-PS-VerifFauneObserveSurObjetFlottant in repository tutti. See http://git.codelutin.com/tutti.git was 27a75b7 Utilisation d'un Set plutôt q'une liste d'ids The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7602-PS-VerifFauneObserveSurObjetFlottant updated (6cb3380 -> 27a75b7)
by codelutin.com scm March 9, 2016

March 9, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/7602-PS-VerifFauneObserveSurObjetFlottant in repository tutti. See http://git.codelutin.com/tutti.git discards 6cb3380 correction de traduction (see #7602). discards 8973474 mauvais binding du nombre et du statut de l'espèce observé (see #7602). discards 1e5dd4e Ajout du filtre sure les espèces (see #7602). discards 0fa0621 Ajout de trace dans les appels des services (see #7602). discards 40382dc Ajout du filtre sure les espèces de thons (see #7601). 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 adds bf3644c Fixes #7601 Merge branch 'feature/7601-PS-VerifEstimationdesBancSurObjetFlottant' into develop adds 59a668d Ajout de trace dans les appels des services (see #7602). adds 39e3385 Ajout du filtre sure les espèces (see #7602). adds 86a5a99 mauvais binding du nombre et du statut de l'espèce observé (see #7602). adds 3175213 Ajout méthode pour récupérer les ids des espèces d'une liste adds 27a75b7 Utilisation d'un Set plutôt q'une liste d'ids 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 (6cb3380) \ N -- N -- N refs/heads/feature/7602-PS-VerifFauneObserveSurObjetFlottant (27a75b7) 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: .../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 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 8 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 9 +- .../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 +- .../dto/referential/ReferentialReference.java | 15 +- .../dto/referential/ReferentialReferences.java | 7 +- .../services/dto/referential/SpeciesListDto.java | 14 + .../referential/ReferentialBinderSupport.java | 4 +- .../ConsolidateActivitySeineDataResultBuilder.java | 13 +- .../consolidate/ConsolidateDataServiceTopia.java | 18 +- .../seine/ObjectSchoolEstimateServiceTopia.java | 10 + .../TransmittingBuoyOperationServiceTopia.java | 10 + .../actions/validate/ValidateServiceTopiaTest.java | 3 +- pom.xml | 2 +- 50 files changed, 429 insertions(+), 1811 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/SpeciesListDto.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (afab8fb -> bf3644c)
by codelutin.com scm March 9, 2016

March 9, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 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 new bf3644c Fixes #7601 Merge branch 'feature/7601-PS-VerifEstimationdesBancSurObjetFlottant' into develop The 1 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 bf3644c51ad518e03e731e0a5e4ebdda460f3d98 Merge: afab8fb 4a77188 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 9 05:11:04 2016 +0100 Fixes #7601 Merge branch 'feature/7601-PS-VerifEstimationdesBancSurObjetFlottant' into develop Summary of changes: .../impl/seine/ObjectSchoolEstimateUIHandler.java | 39 ++++++++++++++++++++++ .../reference/ReferentialReferenceAdapter.java | 10 +++--- .../dto/referential/ReferentialReference.java | 15 +-------- .../dto/referential/ReferentialReferences.java | 39 +++++++++++++++++++++- .../referential/ReferentialBinderSupport.java | 4 +-- .../seine/ObjectSchoolEstimateServiceTopia.java | 10 ++++++ 6 files changed, 95 insertions(+), 22 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/7601-PS-VerifEstimationdesBancSurObjetFlottant deleted (was 4a77188)
by codelutin.com scm March 9, 2016

March 9, 2016

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 was 4a77188 Remove ReferentialReference.lastUpdate The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7601-PS-VerifEstimationdesBancSurObjetFlottant updated (b0fedab -> 4a77188)
by codelutin.com scm March 9, 2016

March 9, 2016

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(a)codelutin.com>.

1 0

branch develop updated (aa47dd3 -> afab8fb)
by codelutin.com scm March 8, 2016

March 8, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from aa47dd3 Fixes #7599 Merge branch 'feature/7599-PS-VerifObjetFlottant' into develop new 21dff26 Ajout de trace dans les appels des services. new e21f2d9 Ajout des validateurs pour les bouées de transmissions new 4d109c4 Ajout des traduction pour les typed'opération et les type de balise (reste à les faire fonctionner avec l'EnumEditor) new 7efba2c vider les champs au changement de type d'opération new f0be63a Suppression des traductions dans le module de persistence new 71ec21c Ajout des traductions d'enumération dans l'api de service new 96a491e Utilisation de I18nEnumUtil dans les implantations de service new 26816a1 Revue des constantes dans le modèle de service new 84a5355 Correction d'un test suite à un changement sur le validateur SchoolEstimate new 43477dd Initilisation de EnumEditor avec les libellés + suppression ConstantsI18n new afab8fb Fixes #7600 Merge branch 'feature/7600-PS-VerifOperationSurObjetFlottant' into develop The 11 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 afab8fb4e84115318562cd31176a960485c3c448 Merge: aa47dd3 43477dd Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 8 21:31:30 2016 +0100 Fixes #7600 Merge branch 'feature/7600-PS-VerifOperationSurObjetFlottant' into develop commit 43477ddc3ef6408db74dc919b2a1b57b698ae5f4 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 8 21:30:53 2016 +0100 Initilisation de EnumEditor avec les libellés + suppression ConstantsI18n commit 84a5355213a2494aaa0de0394a55184c9897a504 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 8 15:21:11 2016 +0100 Correction d'un test suite à un changement sur le validateur SchoolEstimate commit 26816a1b87606ebbe336148b891a8f5a01a5749e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 8 15:20:47 2016 +0100 Revue des constantes dans le modèle de service commit 96a491efa027e8eb658502b8020884041561eb3e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 8 14:24:29 2016 +0100 Utilisation de I18nEnumUtil dans les implantations de service commit 71ec21caaa85ff7bb7fce952034c5e0fe132b82e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 8 14:23:54 2016 +0100 Ajout des traductions d'enumération dans l'api de service commit f0be63a2ae9a99e107eff1901d78b26422201727 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 8 14:23:08 2016 +0100 Suppression des traductions dans le module de persistence commit 7efba2c50e1f14c255f6f3818e8590ffbe1b1903 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon Mar 7 15:10:51 2016 +0100 vider les champs au changement de type d'opération commit 4d109c448f937d6bccfecc8de9c668cf7b565367 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon Mar 7 15:09:34 2016 +0100 Ajout des traduction pour les typed'opération et les type de balise (reste à les faire fonctionner avec l'EnumEditor) commit e21f2d97f3a9c55792b8f098bcb5c8bba989acf7 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon Mar 7 15:04:56 2016 +0100 Ajout des validateurs pour les bouées de transmissions commit 21dff26a5aadcb16c6a02f1439bf634bbd4fe3b1 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon Mar 7 15:03:23 2016 +0100 Ajout de trace dans les appels des services. Summary of changes: .../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 | 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 +- .../ConsolidateActivitySeineDataResultBuilder.java | 13 +- .../consolidate/ConsolidateDataServiceTopia.java | 18 +- .../TransmittingBuoyOperationServiceTopia.java | 10 + .../actions/validate/ValidateServiceTopiaTest.java | 3 +- pom.xml | 2 +- 42 files changed, 387 insertions(+), 1776 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 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 11