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

branch feature/7587 updated (b5758f6 -> 1dcdd98)
by codelutin.com scm 06 Oct '15

06 Oct '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7587 in repository observe. See http://git.codelutin.com/observe.git discards b5758f6 calcule de la nouvelle position de la marée (refs #7587) discards 416d0f8 adpatation des la carte + petite rose de vents (refs #7587) discards ac31162 correction de la validation + ajout des routes dans le DTO de trip seine (refs #7587) discards 8d75432 correction de la validation + ajout des routes dans le DTO de trip seine (refs #7587) discards 6b98aaf correction de la validation + ajout des routes dans le DTO de trip seine (refs #7587) discards 7a12dcf Renommage de ObserveValidator en ObserveSwingValidator discards 1a1febd début de migration de l'ecran (refs #7587) discards ff0f341 début de migration de l'ecran (refs #7587) discards 34d8183 correction du remplissage des données referentielles des combo et listes adds 9d449cb correction du remplissage des données referentielles des combo et listes adds 35287ed correction de l'ouverture de l'écran de marée (refs #7586) adds d4e5353 affichage de l'écran d'édition de marée quand on clique sur nouvelle marée (refs #7586) adds fe0a577 chargement des triplonglines (refs #7586) adds 54f7e07 fix decorator(refs #7586) adds 65595be fix compilation adds 2e27a48 Termine #7586 Rock'n Roll! Merge branch 'feature/7586' into develop new d30781b début de migration de l'ecran (refs #7587) new 3b53dd5 début de migration de l'ecran (refs #7587) new c064c65 Renommage de ObserveValidator en ObserveSwingValidator new 5b96fb0 correction de la validation + ajout des routes dans le DTO de trip seine (refs #7587) new 4aff5ad correction de la validation + ajout des routes dans le DTO de trip seine (refs #7587) new cf7321f correction de la validation + ajout des routes dans le DTO de trip seine (refs #7587) new 5877b30 adpatation des la carte + petite rose de vents (refs #7587) new 1dcdd98 calcule de la nouvelle position de la marée (refs #7587) 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 (b5758f6) \ N -- N -- N refs/heads/feature/7587 (1dcdd98) 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 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 1dcdd98999735fea3540642e97b77b89a8c81970 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Oct 6 16:58:55 2015 +0200 calcule de la nouvelle position de la marée (refs #7587) commit 5877b30ad3962342c7ac63d04c077ff66696349a Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Oct 6 16:14:01 2015 +0200 adpatation des la carte + petite rose de vents (refs #7587) commit cf7321f225db9a07eda65c911af24af97eaeab1d Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Oct 6 15:29:53 2015 +0200 correction de la validation + ajout des routes dans le DTO de trip seine (refs #7587) commit 4aff5ada12c0fd11df98225ff3f26991cb7a8435 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Oct 6 14:30:12 2015 +0200 correction de la validation + ajout des routes dans le DTO de trip seine (refs #7587) commit 5b96fb0ab86d8f010a689134e59d85875c7df468 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Oct 6 14:26:13 2015 +0200 correction de la validation + ajout des routes dans le DTO de trip seine (refs #7587) commit c064c6599dc2dc017083085a56e173205bfeff6d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Oct 6 11:57:41 2015 +0200 Renommage de ObserveValidator en ObserveSwingValidator commit 3b53dd5c6ff1f7f17cc892ae622109baba72a16b Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Oct 6 11:24:49 2015 +0200 début de migration de l'ecran (refs #7587) commit d30781b8df6c5c6801079373b8ea6b3768f12eae Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon Oct 5 18:21:33 2015 +0200 début de migration de l'ecran (refs #7587) Summary of changes: .../observe/ObserveSwingApplicationContext.java | 10 +- .../business/db/model/DataSelectionModel.java | 345 +++++++++++---------- .../java/fr/ird/observe/ui/DecoratorService.java | 122 ++++---- .../observe/ui/content/ContentUIInitializer.java | 16 +- .../ird/observe/ui/content/ContentUIManager.java | 16 +- .../list/impl/longline/TripLonglinesUIHandler.java | 10 +- .../content/open/impl/longline/TripLonglineUI.css | 7 +- .../ui/content/open/impl/seine/TripSeineUI.css | 6 +- .../ui/storage/tabs/DataSelectionModel.java | 2 +- .../observe/ui/storage/tabs/RolesTableModel.java | 3 +- .../ui/storage/tabs/StorageTabUIHandler.java | 3 +- .../ui/tree/DataSelectionTreeSelectionModel.java | 14 +- .../loadors/ProgramLonglineNodeChildLoador.java | 22 +- .../observe-application-swing_en_GB.properties | 8 + .../observe-application-swing_es_ES.properties | 8 + .../observe-application-swing_fr_FR.properties | 16 +- .../resources/i18n/observe-swing_fr_FR.properties | 16 +- .../v1/longline/TripLonglineServiceController.java | 5 +- .../service/longline/TripLonglineService.java | 3 +- .../services/dto/referential/PersonDtos.java | 48 +++ .../services/dto/referential/ReferentialDtos.java | 40 +++ .../services/dto/ObserveDtosInitializer.java | 6 +- .../service/longline/TripLonglineServiceTopia.java | 29 +- 23 files changed, 435 insertions(+), 320 deletions(-) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/PersonDtos.java -- 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 (2107f8a -> 2e27a48)
by codelutin.com scm 06 Oct '15

06 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 2107f8a Début de la mise en place de l'arbre de navigation Merge branch 'feature/7553' into develop new 9d449cb correction du remplissage des données referentielles des combo et listes new 35287ed correction de l'ouverture de l'écran de marée (refs #7586) new d4e5353 affichage de l'écran d'édition de marée quand on clique sur nouvelle marée (refs #7586) new fe0a577 chargement des triplonglines (refs #7586) new 54f7e07 fix decorator(refs #7586) new 65595be fix compilation new 2e27a48 Termine #7586 Rock'n Roll! Merge branch 'feature/7586' into develop The 7 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 2e27a48b00afa0384bde3a81e9fea65e8bca4557 Merge: 2107f8a 65595be Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Oct 6 17:52:31 2015 +0200 Termine #7586 Rock'n Roll! Merge branch 'feature/7586' into develop commit 65595be4c187f300f9622c408d5149340939038a Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Oct 6 16:33:11 2015 +0200 fix compilation commit 54f7e07ed265ede21edc01962a5e20616276cdc4 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Oct 6 16:00:38 2015 +0200 fix decorator(refs #7586) commit fe0a5771f418e9a28b35eb892b35da0054c6481a Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Oct 6 15:44:22 2015 +0200 chargement des triplonglines (refs #7586) commit d4e5353cb86a56c20df54000b557914f2f3fdf52 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Oct 6 12:48:17 2015 +0200 affichage de l'écran d'édition de marée quand on clique sur nouvelle marée (refs #7586) commit 35287edf1e4391e355cfbbee40a67bb603dd0f1e Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Oct 6 12:17:54 2015 +0200 correction de l'ouverture de l'écran de marée (refs #7586) commit 9d449cbd028240dbb2163f5dd79a0ec13c291f7a Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Oct 5 17:03:15 2015 +0200 correction du remplissage des données referentielles des combo et listes Summary of changes: .../observe/ObserveSwingApplicationContext.java | 10 +- .../business/db/model/DataSelectionModel.java | 345 +++++++++++---------- .../java/fr/ird/observe/ui/DecoratorService.java | 123 ++++---- .../ird/observe/ui/content/ContentUIHandler.java | 11 +- .../observe/ui/content/ContentUIInitializer.java | 215 ++++++++----- .../ird/observe/ui/content/ContentUIManager.java | 16 +- .../fr/ird/observe/ui/content/ContentUIModel.java | 5 +- .../list/impl/longline/TripLonglinesUIHandler.java | 10 +- .../content/open/impl/longline/TripLonglineUI.css | 7 +- .../ui/content/open/impl/seine/TripSeineUI.css | 6 +- .../ui/storage/tabs/DataSelectionModel.java | 2 +- .../observe/ui/storage/tabs/RolesTableModel.java | 3 +- .../ui/storage/tabs/StorageTabUIHandler.java | 3 +- .../ui/tree/DataSelectionTreeSelectionModel.java | 14 +- .../loadors/ProgramLonglineNodeChildLoador.java | 22 +- .../observe-application-swing_en_GB.properties | 8 + .../observe-application-swing_es_ES.properties | 8 + .../observe-application-swing_fr_FR.properties | 16 +- .../resources/i18n/observe-swing_fr_FR.properties | 16 +- .../v1/longline/TripLonglineServiceController.java | 5 +- .../service/longline/TripLonglineService.java | 3 +- .../java/fr/ird/observe/services/dto/FormDto.java | 7 +- .../services/dto/referential/PersonDtos.java | 48 +++ .../services/dto/referential/ReferentialDtos.java | 40 +++ .../services/dto/ObserveDtosInitializer.java | 6 +- .../service/longline/TripLonglineServiceTopia.java | 29 +- 26 files changed, 587 insertions(+), 391 deletions(-) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/PersonDtos.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 7

branch feature/7587 updated (ac31162 -> b5758f6)
by codelutin.com scm 06 Oct '15

06 Oct '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7587 in repository observe. See http://git.codelutin.com/observe.git from ac31162 correction de la validation + ajout des routes dans le DTO de trip seine (refs #7587) new 416d0f8 adpatation des la carte + petite rose de vents (refs #7587) new b5758f6 calcule de la nouvelle position de la marée (refs #7587) The 2 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 b5758f6fd2046d0269cfb49c7d0c085a9bcca873 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Oct 6 16:58:55 2015 +0200 calcule de la nouvelle position de la marée (refs #7587) commit 416d0f84fed1141e99edba226d9880432656c27e Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Oct 6 16:14:01 2015 +0200 adpatation des la carte + petite rose de vents (refs #7587) Summary of changes: .../ui/content/open/ContentOpenableUIHandler.java | 41 ++++++++++++++++++++-- .../impl/longline/ActivityLonglineUIHandler.java | 7 +++- .../open/impl/longline/TripLonglineUIHandler.java | 10 ++++-- .../open/impl/seine/ActivitySeineUIHandler.java | 8 +++++ .../ui/content/open/impl/seine/RouteUIHandler.java | 6 ++++ .../open/impl/seine/TripSeineUIHandler.java | 20 ++++++++++- .../observe/ui/util/tripMap/ObserveMapPane.java | 40 ++++++++++++++------- .../ui/util/tripMap/TripMapContentBuilder.java | 17 ++++----- .../observe/ui/util/tripMap/TripMapUIHandler.java | 23 ++++++------ .../services/service/seine/TripSeineService.java | 2 +- 10 files changed, 135 insertions(+), 39 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 2

branch feature/7586 deleted (was 65595be)
by codelutin.com scm 06 Oct '15

06 Oct '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7586 in repository observe. See http://git.codelutin.com/observe.git was 65595be fix compilation This change permanently discards the following revisions: discards 65595be fix compilation discards 54f7e07 fix decorator(refs #7586) discards fe0a577 chargement des triplonglines (refs #7586) discards d4e5353 affichage de l'écran d'édition de marée quand on clique sur nouvelle marée (refs #7586) discards 35287ed correction de l'ouverture de l'écran de marée (refs #7586) discards 9d449cb correction du remplissage des données referentielles des combo et listes -- 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/7586 updated (54f7e07 -> 65595be)
by codelutin.com scm 06 Oct '15

06 Oct '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7586 in repository observe. See http://git.codelutin.com/observe.git from 54f7e07 fix decorator(refs #7586) new 65595be fix compilation 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 65595be4c187f300f9622c408d5149340939038a Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Oct 6 16:33:11 2015 +0200 fix compilation Summary of changes: .../src/main/java/fr/ird/observe/ui/storage/tabs/RolesTableModel.java | 3 ++- 1 file changed, 2 insertions(+), 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 feature/7586 updated (d4e5353 -> 54f7e07)
by codelutin.com scm 06 Oct '15

06 Oct '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7586 in repository observe. See http://git.codelutin.com/observe.git from d4e5353 affichage de l'écran d'édition de marée quand on clique sur nouvelle marée (refs #7586) new fe0a577 chargement des triplonglines (refs #7586) new 54f7e07 fix decorator(refs #7586) The 2 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 54f7e07ed265ede21edc01962a5e20616276cdc4 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Oct 6 16:00:38 2015 +0200 fix decorator(refs #7586) commit fe0a5771f418e9a28b35eb892b35da0054c6481a Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Oct 6 15:44:22 2015 +0200 chargement des triplonglines (refs #7586) Summary of changes: .../observe/ObserveSwingApplicationContext.java | 10 +- .../java/fr/ird/observe/ui/DecoratorService.java | 122 ++++++++++----------- .../list/impl/longline/TripLonglinesUIHandler.java | 10 +- .../ui/storage/tabs/DataSelectionModel.java | 2 +- .../loadors/ProgramLonglineNodeChildLoador.java | 22 ++-- .../v1/longline/TripLonglineServiceController.java | 5 +- .../service/longline/TripLonglineService.java | 3 +- .../service/longline/TripLonglineServiceTopia.java | 29 +++-- 8 files changed, 100 insertions(+), 103 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 2

branch feature/7587 updated (7a12dcf -> ac31162)
by codelutin.com scm 06 Oct '15

06 Oct '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7587 in repository observe. See http://git.codelutin.com/observe.git from 7a12dcf Renommage de ObserveValidator en ObserveSwingValidator new 6b98aaf correction de la validation + ajout des routes dans le DTO de trip seine (refs #7587) new 8d75432 correction de la validation + ajout des routes dans le DTO de trip seine (refs #7587) new ac31162 correction de la validation + ajout des routes dans le DTO de trip seine (refs #7587) 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 ac3116246a9571a2430b33295581a44d3ba1a668 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Oct 6 15:29:53 2015 +0200 correction de la validation + ajout des routes dans le DTO de trip seine (refs #7587) commit 8d754326821f0b89c3e15522dcbfcda3bea004d5 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Oct 6 14:30:12 2015 +0200 correction de la validation + ajout des routes dans le DTO de trip seine (refs #7587) commit 6b98aaff13c8da02391b883e0d9b68f9c1a8d793 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Oct 6 14:26:13 2015 +0200 correction de la validation + ajout des routes dans le DTO de trip seine (refs #7587) Summary of changes: .../ui/content/open/ContentOpenableUIHandler.java | 70 ++----- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 4 +- .../open/impl/seine/TripSeineUIHandler.java | 4 - .../content/open/impl/seine/TripSeineUIModel.java | 3 +- .../TripSeineDto-n1-update-error-validation.xml | 206 --------------------- .../TripSeineDto-n1-create-error-validation.xml | 0 .../TripSeineDto-n1-create-warning-validation.xml | 0 .../TripSeineDto-n1-update-error-validation.xml | 0 .../TripSeineDto-n1-update-warning-validation.xml | 36 ++-- .../main/xmi/observe-services-dto-seine.properties | 1 + .../src/main/xmi/observe-services-dto-seine.zargo | Bin 59029 -> 59456 bytes .../services/dto/ObserveDtosInitializer.java | 3 +- 12 files changed, 40 insertions(+), 287 deletions(-) delete mode 100644 observe-application-swing/src/main/resources/fr.ird.observe.services.dto.seine/TripSeineDto-n1-update-error-validation.xml rename observe-application-swing/src/main/resources/{fr.ird.observe.services.dto.seine => fr/ird/observe/services/dto/seine}/TripSeineDto-n1-create-error-validation.xml (100%) rename observe-application-swing/src/main/resources/{fr.ird.observe.services.dto.seine => fr/ird/observe/services/dto/seine}/TripSeineDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-n1-update-error-validation.xml (100%) rename observe-application-swing/src/main/resources/{fr.ird.observe.services.dto.seine => fr/ird/observe/services/dto/seine}/TripSeineDto-n1-update-warning-validation.xml (65%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 3

01/01: affichage de l'écran d'édition de marée quand on clique sur nouvelle marée (refs #7586)
by codelutin.com scm 06 Oct '15

06 Oct '15

This is an automated email from the git hooks/post-receive script. New commit to branch feature/7586 in repository observe. See http://git.codelutin.com/observe.git commit d4e5353cb86a56c20df54000b557914f2f3fdf52 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Oct 6 12:48:17 2015 +0200 affichage de l'écran d'édition de marée quand on clique sur nouvelle marée (refs #7586) --- .../java/fr/ird/observe/ui/content/ContentUIManager.java | 16 ++++++++-------- .../i18n/observe-application-swing_en_GB.properties | 8 ++++++++ .../i18n/observe-application-swing_es_ES.properties | 8 ++++++++ .../i18n/observe-application-swing_fr_FR.properties | 16 ++++++++-------- .../main/resources/i18n/observe-swing_fr_FR.properties | 16 ++++++++-------- 5 files changed, 40 insertions(+), 24 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java index 3e2a2e1..39ad3ae 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java @@ -112,23 +112,23 @@ public class ContentUIManager { addMapping(DATA, ProgramDto.class, GearType.seine.name(), TripSeinesUI.class); addMapping(DATA, TripSeineDto.class, TripSeineUI.class); - addMapping(DATA, TripSeineDto.class, n("observe.tree.tripSeine.unsaved"), TripSeineUI.class); + addMapping(DATA, TripSeineDto.class, n("observe.tree.tripSeineDto.unsaved"), TripSeineUI.class); //FIXME // addMapping(DATA, TripSeineDto.class, TripSeineDto.PROPERTY_GEAR_USE_FEATURES_SEINE, GearUseFeaturesSeineUI.class); // addMapping(DATA, TripSeineDto.class, TripSeineDto.PROPERTY_ROUTE, RoutesUI.class); addMapping(DATA, RouteDto.class, RouteUI.class); - addMapping(DATA, RouteDto.class, n("observe.tree.route.unsaved"), RouteUI.class); + addMapping(DATA, RouteDto.class, n("observe.tree.routeDto.unsaved"), RouteUI.class); //FIXME // addMapping(DATA, RouteDto.class, RouteDto.PROPERTY_ACTIVITY_SEINE, ActivitySeinesUI.class); addMapping(DATA, ActivitySeineDto.class, ActivitySeineUI.class); - addMapping(DATA, ActivitySeineDto.class, n("observe.tree.activitySeine.unsaved"), ActivitySeineUI.class); + addMapping(DATA, ActivitySeineDto.class, n("observe.tree.activitySeineDto.unsaved"), ActivitySeineUI.class); //FIXME addMapping(DATA, ActivitySeineDto.class, ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM, ActivitySeineObservedSystemUI.class); addMapping(DATA, SetSeineDto.class, SetSeineUI.class); - addMapping(DATA, SetSeineDto.class, n("observe.tree.setSeine.unsaved"), SetSeineUI.class); + addMapping(DATA, SetSeineDto.class, n("observe.tree.setSeineDto.unsaved"), SetSeineUI.class); addMapping(DATA, SetSeineDto.class, SetSeineSchoolEstimateDto.PROPERTY_SCHOOL_ESTIMATE, SchoolEstimateUI.class); addMapping(DATA, SetSeineDto.class, SetSeineTargetCatchDto.PROPERTY_TARGET_CATCH, TargetCatchUI.class); addMapping(DATA, SetSeineDto.class, SetSeineDto.PROPERTY_TARGET_DISCARDED, TargetDiscardCatchUI.class); @@ -139,7 +139,7 @@ public class ContentUIManager { // addMapping(DATA, SetSeineDto.class, SetSeineDto.PROPERTY_NON_TARGET_SAMPLE, NonTargetSampleUI.class); addMapping(DATA, FloatingObjectDto.class, FloatingObjectUI.class); - addMapping(DATA, FloatingObjectDto.class, n("observe.tree.floatingObject.unsaved"), FloatingObjectUI.class); + addMapping(DATA, FloatingObjectDto.class, n("observe.tree.floatingObjectDto.unsaved"), FloatingObjectUI.class); addMapping(DATA, FloatingObjectDto.class, FloatingObjectDto.PROPERTY_OBJECT_OPERATION, FloatingObjectTransmittingBuoyOperationUI.class); addMapping(DATA, FloatingObjectDto.class, FloatingObjectObservedSpeciesDto.PROPERTY_OBJECT_OBSERVED_SPECIES, ObjectObservedSpeciesUI.class); addMapping(DATA, FloatingObjectDto.class, FloatingObjectSchoolEstimateDto.PROPERTY_OBJECT_SCHOOL_ESTIMATE, ObjectSchoolEstimateUI.class); @@ -149,18 +149,18 @@ public class ContentUIManager { addMapping(DATA, ProgramDto.class, GearType.longline.name(), TripLonglinesUI.class); addMapping(DATA, TripLonglineDto.class, TripLonglineUI.class); - addMapping(DATA, TripLonglineDto.class, n("observe.tree.tripLongline.unsaved"), TripLonglineUI.class); + addMapping(DATA, TripLonglineDto.class, n("observe.tree.tripLonglineDto.unsaved"), TripLonglineUI.class); //FIXME // addMapping(DATA, TripLonglineDto.class, TripLonglineDto.PROPERTY_GEAR_USE_FEATURES_LONGLINE, GearUseFeaturesLonglineUI.class); // addMapping(DATA, TripLonglineDto.class, TripLonglineDto.PROPERTY_ACTIVITY_LONGLINE, ActivityLonglinesUI.class); addMapping(DATA, ActivityLonglineDto.class, ActivityLonglineUI.class); - addMapping(DATA, ActivityLonglineDto.class, n("observe.tree.activityLongline.unsaved"), ActivityLonglineUI.class); + addMapping(DATA, ActivityLonglineDto.class, n("observe.tree.activityLonglineDto.unsaved"), ActivityLonglineUI.class); addMapping(DATA, ActivityLonglineDto.class, ActivityLonglineEncouterDto.PROPERTY_ENCOUNTER, EncounterUI.class); addMapping(DATA, ActivityLonglineDto.class, ActivityLonglineSensorUsedDto.PROPERTY_SENSOR_USED, SensorUsedUI.class); addMapping(DATA, SetLonglineDto.class, SetLonglineUI.class); - addMapping(DATA, SetLonglineDto.class, n("observe.tree.setLongline.unsaved"), SetLonglineUI.class); + addMapping(DATA, SetLonglineDto.class, n("observe.tree.setLonglineDto.unsaved"), SetLonglineUI.class); addMapping(DATA, SetLonglineDto.class, "longlineGlobalComposition", LonglineGlobalCompositionUI.class); addMapping(DATA, SetLonglineDto.class, "longlineDetailComposition", LonglineDetailCompositionUI.class); diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties index 04b9ede..659cd71 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties @@ -2244,8 +2244,10 @@ observe.title.validate.tip=Validate datas of a storage observe.title.welcome.admin=Observe Admin observe.tree.activityLongline=Activity observe.tree.activityLongline.unsaved=New activity +observe.tree.activityLonglineDto.unsaved= observe.tree.activitySeine=Activity observe.tree.activitySeine.unsaved=New activity +observe.tree.activitySeineDto.unsaved= observe.tree.baitHaulingStatus=Bait hauling status observe.tree.baitSettingStatus=Bait setting status observe.tree.baitType=Bait type @@ -2256,6 +2258,7 @@ observe.tree.detectionMode=Detection mode observe.tree.encounter=Encounter observe.tree.encounterType= observe.tree.floatingObject.unsaved=New DCP +observe.tree.floatingObjectDto.unsaved= observe.tree.fpaZone=Fpa zone observe.tree.gear=Gear observe.tree.gearCaracteristic=Gear caracteristic @@ -2297,6 +2300,7 @@ observe.tree.reference.longline=Longline Referential observe.tree.reference.seine=Seine Referential observe.tree.route=Road observe.tree.route.unsaved=New route +observe.tree.routeDto.unsaved= observe.tree.schoolEstimate=School estimate observe.tree.sensorBrand=Sensor brand observe.tree.sensorDataFormat=Sensor data format @@ -2304,8 +2308,10 @@ observe.tree.sensorType=Sensor type observe.tree.sensorUsed=Sensor used observe.tree.setLongline= observe.tree.setLongline.unsaved=New fishing operation +observe.tree.setLonglineDto.unsaved= observe.tree.setSeine= observe.tree.setSeine.unsaved=New set +observe.tree.setSeineDto.unsaved= observe.tree.settingShape=Setting shape observe.tree.sex=Sex observe.tree.sizeMeasureType=Size measure type @@ -2324,7 +2330,9 @@ observe.tree.tdr=TDR observe.tree.transmittingBuoyOperation=Transmitting buoy operation observe.tree.transmittingBuoyType=Transmitting buoy type observe.tree.tripLongline.unsaved=New trip +observe.tree.tripLonglineDto.unsaved= observe.tree.tripSeine.unsaved=New trip +observe.tree.tripSeineDto.unsaved= observe.tree.tripType=Trip type observe.tree.vessel=Boat observe.tree.vesselActivityLongline=Boat activity diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties index a7a9db4..e2f9403 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties @@ -2246,8 +2246,10 @@ observe.title.validate.tip= observe.title.welcome.admin= observe.tree.activityLongline=Actividad observe.tree.activityLongline.unsaved= +observe.tree.activityLonglineDto.unsaved= observe.tree.activitySeine=Actividad observe.tree.activitySeine.unsaved= +observe.tree.activitySeineDto.unsaved= observe.tree.baitHaulingStatus= observe.tree.baitSettingStatus= observe.tree.baitType= @@ -2258,6 +2260,7 @@ observe.tree.detectionMode=Modo de detección observe.tree.encounter= observe.tree.encounterType= observe.tree.floatingObject.unsaved=Nuevo DCP +observe.tree.floatingObjectDto.unsaved= observe.tree.fpaZone= observe.tree.gear= observe.tree.gearCaracteristic= @@ -2299,6 +2302,7 @@ observe.tree.reference.longline= observe.tree.reference.seine= observe.tree.route=Ruta observe.tree.route.unsaved=Nueva ruta +observe.tree.routeDto.unsaved= observe.tree.schoolEstimate=Estimación del banco observe.tree.sensorBrand= observe.tree.sensorDataFormat= @@ -2306,8 +2310,10 @@ observe.tree.sensorType= observe.tree.sensorUsed= observe.tree.setLongline= observe.tree.setLongline.unsaved=Nuevo Lance +observe.tree.setLonglineDto.unsaved= observe.tree.setSeine= observe.tree.setSeine.unsaved=Nuevo Lance +observe.tree.setSeineDto.unsaved= observe.tree.settingShape= observe.tree.sex=Sexo observe.tree.sizeMeasureType= @@ -2326,7 +2332,9 @@ observe.tree.tdr= observe.tree.transmittingBuoyOperation= observe.tree.transmittingBuoyType= observe.tree.tripLongline.unsaved=Nueva marea +observe.tree.tripLonglineDto.unsaved= observe.tree.tripSeine.unsaved=Nueva marea +observe.tree.tripSeineDto.unsaved= observe.tree.tripType= observe.tree.vessel=Barco observe.tree.vesselActivityLongline= diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index 37890d7..40aa3da 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -2243,9 +2243,9 @@ observe.title.validate=Validation des données observe.title.validate.tip=Valider les données d'une source de données observe.title.welcome.admin=Observe Administrateur observe.tree.activityLongline=Activités -observe.tree.activityLongline.unsaved=Nouvelle activité +observe.tree.activityLonglineDto.unsaved=Nouvelle activité observe.tree.activitySeine=Activités -observe.tree.activitySeine.unsaved=Nouvelle activité +observe.tree.activitySeineDto.unsaved=Nouvelle activité observe.tree.baitHaulingStatus=Status de l'appât au virage observe.tree.baitSettingStatus=Status de l'appât au filage observe.tree.baitType=Type d'appât @@ -2255,7 +2255,7 @@ observe.tree.country=Pays observe.tree.detectionMode=Mode détection observe.tree.encounter=Rencontres observe.tree.encounterType=Type de rencontre -observe.tree.floatingObject.unsaved=Nouveau DCP +observe.tree.floatingObjectDto.unsaved=Nouveau DCP observe.tree.fpaZone=Zone FPA observe.tree.gear=Équipement observe.tree.gearCaracteristic=Caractéristique d'un équipement @@ -2296,16 +2296,16 @@ observe.tree.reference.common=Référentiel commun observe.tree.reference.longline=Référentiel Palangre observe.tree.reference.seine=Référentiel Senne observe.tree.route=Routes -observe.tree.route.unsaved=Nouvelle route +observe.tree.routeDto.unsaved=Nouvelle route observe.tree.schoolEstimate=Estimation banc observe.tree.sensorBrand=Marque de capteur observe.tree.sensorDataFormat=Format de données de capteur observe.tree.sensorType=Type de capteur observe.tree.sensorUsed=Capteurs utilisés observe.tree.setLongline=Détails de l'opération -observe.tree.setLongline.unsaved=Nouvelle opération de pêche +observe.tree.setLonglineDto.unsaved=Nouvelle opération de pêche observe.tree.setSeine=Calée -observe.tree.setSeine.unsaved=Nouvelle calée +observe.tree.setSeineDto.unsaved=Nouvelle calée observe.tree.settingShape=Forme au filage observe.tree.sex=Sexe observe.tree.sizeMeasureType=Type de mesure de taille @@ -2323,8 +2323,8 @@ observe.tree.targetSampleCapture=Echantillon thon capturé observe.tree.tdr=Enregistreurs de profondeur observe.tree.transmittingBuoyOperation=Opération balise observe.tree.transmittingBuoyType=Type de balise -observe.tree.tripLongline.unsaved=Nouvelle marée -observe.tree.tripSeine.unsaved=Nouvelle marée +observe.tree.tripLonglineDto.unsaved=Nouvelle marée +observe.tree.tripSeineDto.unsaved=Nouvelle marée observe.tree.tripType=Type de marée observe.tree.vessel=Bateau observe.tree.vesselActivityLongline=Activité bateau diff --git a/observe-application-swing/src/main/resources/i18n/observe-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-swing_fr_FR.properties index 6c7d853..64534f3 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-swing_fr_FR.properties @@ -2024,9 +2024,9 @@ observe.title.validate=Validation des données observe.title.validate.tip=Valider les données d'une source de données observe.title.welcome.admin=Observe Administrateur observe.tree.activityLongline=Activités -observe.tree.activityLongline.unsaved=Nouvelle activité +observe.tree.activityLonglineDto.unsaved=Nouvelle activité observe.tree.activitySeine=Activités -observe.tree.activitySeine.unsaved=Nouvelle activité +observe.tree.activitySeineDto.unsaved=Nouvelle activité observe.tree.baitHaulingStatus=Status de l'appât au virage observe.tree.baitSettingStatus=Status de l'appât au filage observe.tree.baitType=Type d'appât @@ -2036,7 +2036,7 @@ observe.tree.country=Pays observe.tree.detectionMode=Mode détection observe.tree.encounter=Rencontres observe.tree.encounterType=Type de rencontre -observe.tree.floatingObject.unsaved=Nouveau DCP +observe.tree.floatingObjectDto.unsaved=Nouveau DCP observe.tree.fpaZone=Zone FPA observe.tree.gear=Équipement observe.tree.gearCaracteristic=Caractéristique d'un équipement @@ -2077,16 +2077,16 @@ observe.tree.reference.common=Référentiel commun observe.tree.reference.longline=Référentiel Palangre observe.tree.reference.seine=Référentiel Senne observe.tree.route=Routes -observe.tree.route.unsaved=Nouvelle route +observe.tree.routeDto.unsaved=Nouvelle route observe.tree.schoolEstimate=Estimation banc observe.tree.sensorBrand=Marque de capteur observe.tree.sensorDataFormat=Format de données de capteur observe.tree.sensorType=Type de capteur observe.tree.sensorUsed=Capteurs utilisés observe.tree.setLongline=Détails de l'opération -observe.tree.setLongline.unsaved=Nouvelle opération de pêche +observe.tree.setLonglineDto.unsaved=Nouvelle opération de pêche observe.tree.setSeine=Calée -observe.tree.setSeine.unsaved=Nouvelle calée +observe.tree.setSeineDto.unsaved=Nouvelle calée observe.tree.settingShape=Forme au filage observe.tree.sex=Sexe observe.tree.sizeMeasureType=Type de mesure de taille @@ -2104,8 +2104,8 @@ observe.tree.targetSampleCapture=Echantillon thon capturé observe.tree.tdr=Enregistreurs de profondeur observe.tree.transmittingBuoyOperation=Opération balise observe.tree.transmittingBuoyType=Type de balise -observe.tree.tripLongline.unsaved=Nouvelle marée -observe.tree.tripSeine.unsaved=Nouvelle marée +observe.tree.tripLonglineDto.unsaved=Nouvelle marée +observe.tree.tripSeineDto.unsaved=Nouvelle marée observe.tree.tripType=Type de marée observe.tree.vessel=Bateau observe.tree.vesselActivityLongline=Activité bateau -- 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/7586 updated (35287ed -> d4e5353)
by codelutin.com scm 06 Oct '15

06 Oct '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7586 in repository observe. See http://git.codelutin.com/observe.git from 35287ed correction de l'ouverture de l'écran de marée (refs #7586) new d4e5353 affichage de l'écran d'édition de marée quand on clique sur nouvelle marée (refs #7586) 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 d4e5353cb86a56c20df54000b557914f2f3fdf52 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Oct 6 12:48:17 2015 +0200 affichage de l'écran d'édition de marée quand on clique sur nouvelle marée (refs #7586) Summary of changes: .../java/fr/ird/observe/ui/content/ContentUIManager.java | 16 ++++++++-------- .../i18n/observe-application-swing_en_GB.properties | 8 ++++++++ .../i18n/observe-application-swing_es_ES.properties | 8 ++++++++ .../i18n/observe-application-swing_fr_FR.properties | 16 ++++++++-------- .../main/resources/i18n/observe-swing_fr_FR.properties | 16 ++++++++-------- 5 files changed, 40 insertions(+), 24 deletions(-) -- 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/7586 updated (9d449cb -> 35287ed)
by codelutin.com scm 06 Oct '15

06 Oct '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7586 in repository observe. See http://git.codelutin.com/observe.git from 9d449cb correction du remplissage des données referentielles des combo et listes new 35287ed correction de l'ouverture de l'écran de marée (refs #7586) 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 35287edf1e4391e355cfbbee40a67bb603dd0f1e Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Oct 6 12:17:54 2015 +0200 correction de l'ouverture de l'écran de marée (refs #7586) Summary of changes: .../business/db/model/DataSelectionModel.java | 345 +++++++++++---------- .../observe/ui/content/ContentUIInitializer.java | 2 +- .../content/open/impl/longline/TripLonglineUI.css | 7 +- .../ui/content/open/impl/seine/TripSeineUI.css | 6 +- .../ui/storage/tabs/StorageTabUIHandler.java | 3 +- .../ui/tree/DataSelectionTreeSelectionModel.java | 14 +- .../services/dto/referential/PersonDtos.java | 48 +++ .../services/dto/referential/ReferentialDtos.java | 40 +++ .../services/dto/ObserveDtosInitializer.java | 6 +- 9 files changed, 286 insertions(+), 185 deletions(-) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/PersonDtos.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1