October 2015 - Observe-commits - mailman.cloud.codelutin.com

branch feature/7610 deleted (was c9befda)
by codelutin.com scm 16 Oct '15

16 Oct '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7610 in repository observe. See http://git.codelutin.com/observe.git was c9befda ajout du programme dans l'arbre après création (refs #7610) This change permanently discards the following revisions: discards c9befda ajout du programme dans l'arbre après création (refs #7610) discards e74f1f4 modification des decorateurs pour aller chercher en profondeur les attributs des referencedto qui sont eux même attributs (exemple de LengthWeightParameterDto : ocean est un attribut de type referencedto, il faut qu'on aille chercher le label) (refs #7610) discards 49a44e8 déplacement de la clé i18n de referencestatus dans le dto plutôt que dans l'entité (refs #7610) discards 06f3130 correction du decorateur de referencedto pour le cas où des tokens sont des referencedtos (refs #7610) discards ee984be correction du decorateur de referencedto pour que le tri fonctionne (refs #7610) discards 43decc9 filterReferentialListByStatus dans les combo discards d554512 correction du ReferentielListRenderer pour grises les lignes désactivées quand les objets sont des referencedto (refs #7610) discards 63eaf83 fix typo discards 22cbd16 trad discards c4575a4 ouverture des écrans de référentiel commun (refs #7610) discards 6ca2905 modif des linkedhashset en list dans certains dto pour faire marcher les double listes (refs #7610) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch feature/7610 updated (56915d0 -> c9befda)
by codelutin.com scm 16 Oct '15

16 Oct '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7610 in repository observe. See http://git.codelutin.com/observe.git discards 56915d0 modification des decorateurs pour aller chercher en profondeur les attributs des referencedto qui sont eux même attributs (exemple de LengthWeightParameterDto : ocean est un attribut de type referencedto, il faut qu'on aille chercher le label) (refs #7610) discards 7840e88 déplacement de la clé i18n de referencestatus dans le dto plutôt que dans l'entité (refs #7610) discards 9fdca20 correction du decorateur de referencedto pour le cas où des tokens sont des referencedtos (refs #7610) discards ed3328e correction du decorateur de referencedto pour que le tri fonctionne (refs #7610) discards d2e1010 filterReferentialListByStatus dans les combo discards 162bca1 correction du ReferentielListRenderer pour grises les lignes désactivées quand les objets sont des referencedto (refs #7610) discards 6f68958 fix typo discards 085ea34 trad discards 849801d ouverture des écrans de référentiel commun (refs #7610) discards 355ffec modif des linkedhashset en list dans certains dto pour faire marcher les double listes (refs #7610) adds 9b06a03 affichage de la calée dans l'arbre de navigation (refs #7598) adds 5dd20f8 migration de l'écran (refs #7598) adds 0fa1a91 ajout de la validation (refs #7598) adds a718909 Merge branch 'feature/7598' into develop adds 440123c traduction des types de bancs (refs #7598) adds 5d71046 migration de l'écran d'un object flottant (refs #7599) adds 44d772e mise en place de la validation (refs #7599) adds 522269d Merge branch 'feature/7599' into develop adds 9b62f13 correction de la validation de l'écran activity seine (refs #7595) adds 5a58912 Migration de l'écran d'opération sur l'object (refs #7600) adds 563c0b7 mise en place de la validation (refs #7600) adds d5db9ba Merge branch 'feature/7600' into develop adds ec568b5 Migration de l'écran des estimations sur l'object (refs #7601) adds e543f39 mise en place de la validation (refs #7601) adds 620eb01 Merge branch 'feature/7601' into develop adds d398a48 Migration de l'écran de la faune observés sur l'object (refs #7602) adds b1f853b mise en place de la validation (refs #7602) adds 03d0c00 Merge branch 'feature/7602' into develop new 6ca2905 modif des linkedhashset en list dans certains dto pour faire marcher les double listes (refs #7610) new c4575a4 ouverture des écrans de référentiel commun (refs #7610) new 22cbd16 trad new 63eaf83 fix typo new d554512 correction du ReferentielListRenderer pour grises les lignes désactivées quand les objets sont des referencedto (refs #7610) new 43decc9 filterReferentialListByStatus dans les combo new ee984be correction du decorateur de referencedto pour que le tri fonctionne (refs #7610) new 06f3130 correction du decorateur de referencedto pour le cas où des tokens sont des referencedtos (refs #7610) new 49a44e8 déplacement de la clé i18n de referencestatus dans le dto plutôt que dans l'entité (refs #7610) new e74f1f4 modification des decorateurs pour aller chercher en profondeur les attributs des referencedto qui sont eux même attributs (exemple de LengthWeightParameterDto : ocean est un attribut de type referencedto, il faut qu'on aille chercher le label) (refs #7610) new c9befda ajout du programme dans l'arbre après création (refs #7610) 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 (56915d0) \ N -- N -- N refs/heads/feature/7610 (c9befda) 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. 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 c9befdad82bb5ef0118896a7078df484b6f32d1d Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Oct 16 10:50:52 2015 +0200 ajout du programme dans l'arbre après création (refs #7610) commit e74f1f40bfbf149a49f741f58a05a3d3fb779f8d Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Oct 15 17:44:21 2015 +0200 modification des decorateurs pour aller chercher en profondeur les attributs des referencedto qui sont eux même attributs (exemple de LengthWeightParameterDto : ocean est un attribut de type referencedto, il faut qu'on aille chercher le label) (refs #7610) commit 49a44e8bc818b7d0214cf7a838b0e54687ca3f6b Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Oct 15 14:45:07 2015 +0200 déplacement de la clé i18n de referencestatus dans le dto plutôt que dans l'entité (refs #7610) commit 06f31303d6f789a479258c6ab850fbffd80174ac Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Oct 15 14:06:25 2015 +0200 correction du decorateur de referencedto pour le cas où des tokens sont des referencedtos (refs #7610) commit ee984be242987c6a65b1f66c42281b3bc64fda98 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Oct 15 11:17:06 2015 +0200 correction du decorateur de referencedto pour que le tri fonctionne (refs #7610) commit 43decc9d8e2dc6be17abe77c9e5e0caaf6324d92 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Oct 15 10:44:43 2015 +0200 filterReferentialListByStatus dans les combo commit d55451223ebafa6c5e8a7babb70a1373cb45751b Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Oct 15 10:43:00 2015 +0200 correction du ReferentielListRenderer pour grises les lignes désactivées quand les objets sont des referencedto (refs #7610) commit 63eaf8326979af4b08fab447104d10ea92f4e80f Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Oct 15 10:32:32 2015 +0200 fix typo commit 22cbd16809c9a23ad074ecc64b1ea3d3e54ebc2e Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Oct 15 10:20:37 2015 +0200 trad commit c4575a4a1cc0089bdd089a4c43da1c4c1b7bbb5e Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Oct 14 18:03:45 2015 +0200 ouverture des écrans de référentiel commun (refs #7610) commit 6ca290570a491ecbc2262f5bb3f6f7c375eb85bf Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Oct 14 11:03:12 2015 +0200 modif des linkedhashset en list dans certains dto pour faire marcher les double listes (refs #7610) Summary of changes: .../fr/ird/observe/ObserveOpenDataManager.java | 5 + .../ird/observe/db/constantes/ConstantsI18n.java | 23 +++ .../ird/observe/ui/content/ContentUIManager.java | 4 +- .../FloatingObjectTransmittingBuoyOperationUI.css | 16 +- .../FloatingObjectTransmittingBuoyOperationUI.jaxx | 9 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 167 ++++++--------------- ...tingObjectTransmittingBuoyOperationUIModel.java | 39 +---- .../impl/seine/FloatingObjectUIHandler.java | 40 +---- .../ui/content/impl/seine/SetSeineUIHandler.java | 107 ++----------- .../ui/content/impl/seine/SetSeineUIModel.java | 3 - .../ui/content/ref/ContentReferenceUIHandler.java | 4 +- .../ui/content/table/ContentTableUIHandler.java | 2 +- .../table/impl/seine/ObjectObservedSpeciesUI.jaxx | 14 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 40 ++--- .../impl/seine/ObjectObservedSpeciesUIModel.java | 39 +++-- .../table/impl/seine/ObjectSchoolEstimateUI.jaxx | 14 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 38 ++--- .../impl/seine/ObjectSchoolEstimateUIModel.java | 40 +++-- .../tree/loadors/ActivitySeineNodeChildLoador.java | 18 +-- .../loadors/FloatingObjectNodeChildLoador.java | 16 +- ...ActivitySeineDto-n1-update-error-validation.xml | 2 +- ...loatingObjectDto-n1-create-error-validation.xml | 0 ...atingObjectDto-n1-create-warning-validation.xml | 0 ...loatingObjectDto-n1-update-error-validation.xml | 0 ...atingObjectDto-n1-update-warning-validation.xml | 0 ...choolEstimateDto-n1-update-error-validation.xml | 0 ...nsmittingBuoyDto-n1-update-error-validation.xml | 19 ++- ...servedSpeciesDto-n1-update-error-validation.xml | 0 ...choolEstimateDto-n1-update-error-validation.xml | 0 ...oolEstimateDto-n1-update-warning-validation.xml | 0 .../SetSeineDto-n1-create-error-validation.xml | 15 +- .../SetSeineDto-n1-create-warning-validation.xml | 2 +- .../SetSeineDto-n1-update-error-validation.xml | 18 +-- .../SetSeineDto-n1-update-warning-validation.xml | 2 +- .../observe-application-swing_en_GB.properties | 4 + .../observe-application-swing_es_ES.properties | 4 + .../observe-application-swing_fr_FR.properties | 8 +- .../ObjectObservedSpeciesServiceController.java | 4 +- .../ObjectSchoolEstimateServiceController.java | 4 +- .../ird/observe/entities/referentiel/Species2.java | 18 +++ .../observe/entities/referentiel/SpeciesLists.java | 13 ++ .../seine/ObjectObservedSpeciesService.java | 2 +- .../service/seine/ObjectSchoolEstimateService.java | 2 +- .../fr/ird/observe/services/dto/ReferenceDtos.java | 45 ++++++ .../services/dto/referential/ProgramDtos.java | 36 +++++ .../services/dto/seine/ActivitySeineDto.java | 9 +- .../services/dto/seine/FloatingObjectDtos.java | 26 ++++ .../seine/FloatingObjectTransmittingBuoyDto.java | 49 ++---- .../observe/services/dto/seine/SetSeineDto.java | 77 ++++++++++ .../main/xmi/observe-services-dto-seine.properties | 1 + .../src/main/xmi/observe-services-dto-seine.zargo | Bin 60981 -> 61137 bytes .../ird/observe/services/ObserveServiceTopia.java | 22 ++- .../services/builder/EntityToDtoBuilder.java | 12 ++ .../services/dto/ObserveDtosInitializer.java | 3 +- .../ird/observe/services/entity/EntitiesSet.java | 36 +++++ .../services/entity/ObserveEntitiesFilters.java | 92 ++++++++---- .../services/entity/ObserveEntityFilter.java | 11 +- .../services/entity/SpeciesListEntitiesSet.java | 27 ++++ .../services/entity/UniverseEntitiesSet.java | 30 ++++ .../service/seine/ActivitySeineServiceTopia.java | 7 +- .../service/seine/FloatingObjectServiceTopia.java | 23 +-- .../seine/ObjectObservedSpeciesServiceTopia.java | 5 +- .../seine/ObjectSchoolEstimateServiceTopia.java | 4 +- .../TransmittingBuoyOperationServiceTopia.java | 4 +- 64 files changed, 731 insertions(+), 543 deletions(-) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/db/constantes/ConstantsI18n.java copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-create-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-n1-update-warning-validation.xml (100%) 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/FloatingObject-n1-update-transmittingBuoyOperation-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto-n1-update-error-validation.xml (72%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ObjectObservedSpecies-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/ObjectObservedSpeciesDto-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%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-create-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineDto-n1-create-error-validation.xml (89%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineDto-n1-create-warning-validation.xml (89%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineDto-n1-update-error-validation.xml (86%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineDto-n1-update-warning-validation.xml (89%) create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/referentiel/SpeciesLists.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/FloatingObjectDtos.java copy observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectImpl.java => observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto.java (51%) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/SetSeineDto.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(a)list.forge.codelutin.com>.

1 11

branch develop updated (620eb01 -> 03d0c00)
by codelutin.com scm 16 Oct '15

16 Oct '15

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 620eb01 Merge branch 'feature/7601' into develop new d398a48 Migration de l'écran de la faune observés sur l'object (refs #7602) new b1f853b mise en place de la validation (refs #7602) new 03d0c00 Merge branch 'feature/7602' 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 03d0c00aa44f5964eb4883a0afb4703ce9d78751 Merge: 620eb01 b1f853b Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Oct 16 09:45:41 2015 +0200 Merge branch 'feature/7602' into develop commit b1f853beb89ba955506eb43270203e689ae5c4d8 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Oct 16 09:45:19 2015 +0200 mise en place de la validation (refs #7602) commit d398a4805550d78f52338acccd0d9f2699477c05 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Oct 16 09:38:37 2015 +0200 Migration de l'écran de la faune observés sur l'object (refs #7602) Summary of changes: .../table/impl/seine/ObjectObservedSpeciesUI.jaxx | 14 ++++---- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 40 ++++++++-------------- .../impl/seine/ObjectObservedSpeciesUIModel.java | 39 +++++++++++++++------ ...servedSpeciesDto-n1-update-error-validation.xml | 0 .../ObjectObservedSpeciesServiceController.java | 4 +-- .../observe/entities/referentiel/SpeciesLists.java | 4 ++- .../seine/ObjectObservedSpeciesService.java | 2 +- .../services/entity/ObserveEntitiesFilters.java | 5 +++ .../seine/ObjectObservedSpeciesServiceTopia.java | 5 ++- 9 files changed, 62 insertions(+), 51 deletions(-) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ObjectObservedSpecies-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/ObjectObservedSpeciesDto-n1-update-error-validation.xml (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 3

branch develop updated (d5db9ba -> 620eb01)
by codelutin.com scm 15 Oct '15

15 Oct '15

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(a)codelutin.com> Date: Thu Oct 15 18:00:54 2015 +0200 Merge branch 'feature/7601' into develop commit e543f390cb504960b60a6340439060f75bb16659 Author: Sylvain Bavencoff <bavencoff(a)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(a)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(a)list.forge.codelutin.com>.

1 3

branch feature/7610 updated (849801d -> 56915d0)
by codelutin.com scm 15 Oct '15

15 Oct '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7610 in repository observe. See http://git.codelutin.com/observe.git from 849801d ouverture des écrans de référentiel commun (refs #7610) new 085ea34 trad new 6f68958 fix typo new 162bca1 correction du ReferentielListRenderer pour grises les lignes désactivées quand les objets sont des referencedto (refs #7610) new d2e1010 filterReferentialListByStatus dans les combo new ed3328e correction du decorateur de referencedto pour que le tri fonctionne (refs #7610) new 9fdca20 correction du decorateur de referencedto pour le cas où des tokens sont des referencedtos (refs #7610) new 7840e88 déplacement de la clé i18n de referencestatus dans le dto plutôt que dans l'entité (refs #7610) new 56915d0 modification des decorateurs pour aller chercher en profondeur les attributs des referencedto qui sont eux même attributs (exemple de LengthWeightParameterDto : ocean est un attribut de type referencedto, il faut qu'on aille chercher le label) (refs #7610) The 8 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 56915d055a17bdf01f621ae164df6ee7816ab044 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Oct 15 17:44:21 2015 +0200 modification des decorateurs pour aller chercher en profondeur les attributs des referencedto qui sont eux même attributs (exemple de LengthWeightParameterDto : ocean est un attribut de type referencedto, il faut qu'on aille chercher le label) (refs #7610) commit 7840e880445721b597d8bbc59d15eda4e00d7edd Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Oct 15 14:45:07 2015 +0200 déplacement de la clé i18n de referencestatus dans le dto plutôt que dans l'entité (refs #7610) commit 9fdca206b727f11fe9286ff9b597249ff236bfab Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Oct 15 14:06:25 2015 +0200 correction du decorateur de referencedto pour le cas où des tokens sont des referencedtos (refs #7610) commit ed3328e8da4f4e9709464bdbfb4d82232616ad0e Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Oct 15 11:17:06 2015 +0200 correction du decorateur de referencedto pour que le tri fonctionne (refs #7610) commit d2e10104ff632bf2b8d68a5c46eaeb72df377841 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Oct 15 10:44:43 2015 +0200 filterReferentialListByStatus dans les combo commit 162bca10b55b0bd2e941216bd8eb4ea473f91daf Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Oct 15 10:43:00 2015 +0200 correction du ReferentielListRenderer pour grises les lignes désactivées quand les objets sont des referencedto (refs #7610) commit 6f6895861ee9b55da464b09e359aa1d2b91ef647 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Oct 15 10:32:32 2015 +0200 fix typo commit 085ea340702c5189e697b73ccd977ca4a6680b40 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Oct 15 10:20:37 2015 +0200 trad Summary of changes: .../java/fr/ird/observe/ui/DecoratorService.java | 297 +++++++++++---------- .../observe/ui/content/ContentUIInitializer.java | 29 +- .../ui/content/ref/ContentReferenceUIHandler.java | 20 +- .../decorator/LengthWeightParameterDecorator.java | 14 +- .../ui/util/decorator/NonTargetCatchDecorator.java | 9 +- .../util/decorator/NonTargetLengthDecorator.java | 9 +- .../decorator/ObjectObservedSpeciesDecorator.java | 9 +- .../ui/util/decorator/ObserveDecorator.java | 56 +++- .../ui/util/decorator/ReferenceDecorator.java | 36 ++- .../ui/util/decorator/SpeciesDecorator.java | 9 +- .../ui/util/decorator/TripLonglineDecorator.java | 4 +- .../ui/util/decorator/TripSeineDecorator.java | 4 +- .../observe-application-swing_fr_FR.properties | 186 ++++++------- .../entities/constants/ReferenceStatus.java | 22 +- .../services/dto/constants/ReferenceStatus.java | 22 +- 15 files changed, 399 insertions(+), 327 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 8

branch develop updated (9b62f13 -> d5db9ba)
by codelutin.com scm 15 Oct '15

15 Oct '15

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 9b62f13 correction de la validation de l'écran activity seine (refs #7595) new 5a58912 Migration de l'écran d'opération sur l'object (refs #7600) new 563c0b7 mise en place de la validation (refs #7600) new d5db9ba Merge branch 'feature/7600' 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 d5db9bac75ae465738dd38beba48f8b6f87d9161 Merge: 9b62f13 563c0b7 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Oct 15 14:42:57 2015 +0200 Merge branch 'feature/7600' into develop commit 563c0b77c4d4ede024dcc2916f15d14a32a7e09d Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Oct 15 14:41:43 2015 +0200 mise en place de la validation (refs #7600) commit 5a58912739cadfd2ed9be81b37874c2c821e2dc7 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Oct 15 14:30:43 2015 +0200 Migration de l'écran d'opération sur l'object (refs #7600) Summary of changes: .../FloatingObjectTransmittingBuoyOperationUI.css | 16 +- .../FloatingObjectTransmittingBuoyOperationUI.jaxx | 9 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 167 ++++++--------------- ...tingObjectTransmittingBuoyOperationUIModel.java | 39 +---- .../loadors/FloatingObjectNodeChildLoador.java | 16 +- ...nsmittingBuoyDto-n1-update-error-validation.xml | 19 ++- .../seine/FloatingObjectTransmittingBuoyDto.java | 49 ++---- .../main/xmi/observe-services-dto-seine.properties | 1 + .../src/main/xmi/observe-services-dto-seine.zargo | Bin 60981 -> 61137 bytes .../services/builder/EntityToDtoBuilder.java | 12 ++ .../services/dto/ObserveDtosInitializer.java | 3 +- .../TransmittingBuoyOperationServiceTopia.java | 4 +- 12 files changed, 117 insertions(+), 218 deletions(-) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-update-transmittingBuoyOperation-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto-n1-update-error-validation.xml (72%) copy observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectImpl.java => observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto.java (51%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 3

branch develop updated (522269d -> 9b62f13)
by codelutin.com scm 15 Oct '15

15 Oct '15

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 522269d Merge branch 'feature/7599' into develop new 9b62f13 correction de la validation de l'écran activity seine (refs #7595) 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 9b62f13f2382fce84c51fa49e5911b8dd7123b44 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Oct 15 10:51:05 2015 +0200 correction de la validation de l'écran activity seine (refs #7595) Summary of changes: .../services/dto/seine/ActivitySeineDto-n1-update-error-validation.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch develop updated (440123c -> 522269d)
by codelutin.com scm 15 Oct '15

15 Oct '15

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 440123c traduction des types de bancs (refs #7598) new 5d71046 migration de l'écran d'un object flottant (refs #7599) new 44d772e mise en place de la validation (refs #7599) new 522269d Merge branch 'feature/7599' 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 522269d604bb26c20aca1d3299e546bc4f30766c Merge: 440123c 44d772e Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Oct 15 10:33:53 2015 +0200 Merge branch 'feature/7599' into develop commit 44d772e94967a3fa27161fa59e1edc307178bcf8 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Oct 15 10:32:35 2015 +0200 mise en place de la validation (refs #7599) commit 5d71046cb6aab802de72494c6aff688f6ee4b97c Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Oct 15 10:25:48 2015 +0200 migration de l'écran d'un object flottant (refs #7599) Summary of changes: .../ird/observe/ui/content/ContentUIManager.java | 2 +- .../impl/seine/FloatingObjectUIHandler.java | 40 ++++------------------ ...loatingObjectDto-n1-create-error-validation.xml | 0 ...atingObjectDto-n1-create-warning-validation.xml | 0 ...loatingObjectDto-n1-update-error-validation.xml | 0 ...atingObjectDto-n1-update-warning-validation.xml | 0 .../observe-application-swing_fr_FR.properties | 2 +- .../services/dto/seine/FloatingObjectDtos.java | 26 ++++++++++++++ .../service/seine/FloatingObjectServiceTopia.java | 23 +++++++------ 9 files changed, 47 insertions(+), 46 deletions(-) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-create-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-n1-update-warning-validation.xml (100%) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/FloatingObjectDtos.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 3

branch feature/7599 deleted (was 44d772e)
by codelutin.com scm 15 Oct '15

15 Oct '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7599 in repository observe. See http://git.codelutin.com/observe.git was 44d772e mise en place de la validation (refs #7599) This change permanently discards the following revisions: discards 44d772e mise en place de la validation (refs #7599) discards 5d71046 migration de l'écran d'un object flottant (refs #7599) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch feature/7599 updated (5d71046 -> 44d772e)
by codelutin.com scm 15 Oct '15

15 Oct '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7599 in repository observe. See http://git.codelutin.com/observe.git from 5d71046 migration de l'écran d'un object flottant (refs #7599) new 44d772e mise en place de la validation (refs #7599) 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 44d772e94967a3fa27161fa59e1edc307178bcf8 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Oct 15 10:32:35 2015 +0200 mise en place de la validation (refs #7599) Summary of changes: .../services/dto/seine/FloatingObjectDto-n1-create-error-validation.xml | 0 .../services/dto/seine/FloatingObjectDto-n1-create-warning-validation.xml | 0 .../services/dto/seine/FloatingObjectDto-n1-update-error-validation.xml | 0 .../services/dto/seine/FloatingObjectDto-n1-update-warning-validation.xml | 0 4 files changed, 0 insertions(+), 0 deletions(-) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-create-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-n1-update-warning-validation.xml (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1