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

branch feature/7469-4 created (now 204428a)
by codelutin.com scm 06 Nov '15

06 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7469-4 in repository observe. See http://git.codelutin.com/observe.git at 204428a vérification de l'existence des ids des noeuds ouverts avant d'ouvrir les noeuds de l'arbre This branch includes the following new commits: new 32d7e3e ajout de la conf des noeuds ouverts new 625ef47 enregsitrement des noeuds ouverts à la fermeture et chargement des noeuds ouverts à l'ouverture new 204428a vérification de l'existence des ids des noeuds ouverts avant d'ouvrir les noeuds de l'arbre 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 204428a935d1ca59263a18990e7756843e5bfdc8 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Nov 6 16:22:57 2015 +0100 vérification de l'existence des ids des noeuds ouverts avant d'ouvrir les noeuds de l'arbre commit 32d7e3e5ae91e33b2824dff82503db505e4e4ebe Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Nov 6 14:56:39 2015 +0100 ajout de la conf des noeuds ouverts commit 625ef4787b94a1fa094c4ff649b27eeff393f6eb Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Nov 6 14:56:48 2015 +0100 enregsitrement des noeuds ouverts à la fermeture et chargement des noeuds ouverts à l'ouverture -- 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 (02fad67 -> 54001ed)
by codelutin.com scm 06 Nov '15

06 Nov '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 02fad67 ne plus utiliser la fonction générique getObserveDto new 54001ed fixes #7699 Lier le ObserveOpenDataManager avec le DataContext 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 54001ed6bd96175588c3c940360b371b9db7b3a2 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Nov 6 14:16:50 2015 +0100 fixes #7699 Lier le ObserveOpenDataManager avec le DataContext Summary of changes: .../fr/ird/observe/ObserveOpenDataManager.java | 83 +++++++----- .../observe/ObserveSwingApplicationContext.java | 4 +- .../fr/ird/observe/business/db/DataContext.java | 148 +++++++++++++++------ .../business/db/constants/DataContextType.java | 12 +- .../open/impl/longline/TripLonglineUIHandler.java | 2 +- .../open/impl/seine/TripSeineUIHandler.java | 2 +- .../services/dto/referential/ProgramDtos.java | 19 +-- 7 files changed, 171 insertions(+), 99 deletions(-) -- 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/7699 deleted (was 54001ed)
by codelutin.com scm 06 Nov '15

06 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7699 in repository observe. See http://git.codelutin.com/observe.git was 54001ed fixes #7699 Lier le ObserveOpenDataManager avec le DataContext This change permanently discards the following revisions: discards 54001ed fixes #7699 Lier le ObserveOpenDataManager avec le DataContext -- 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/7699 updated (2883548 -> 54001ed)
by codelutin.com scm 06 Nov '15

06 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7699 in repository observe. See http://git.codelutin.com/observe.git discards 2883548 fixes #7699 Lier le ObserveOpenDataManager avec le DataContext adds 028920c migration de l'écran de calcul des données (refs #7679) adds 8564b8f maj fichier de traduction (refs #7679) adds 270aa57 Merge branch 'feature/7679' into develop adds 02fad67 ne plus utiliser la fonction générique getObserveDto new 54001ed fixes #7699 Lier le ObserveOpenDataManager avec le DataContext 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 (2883548) \ N -- N -- N refs/heads/feature/7699 (54001ed) 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 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 54001ed6bd96175588c3c940360b371b9db7b3a2 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Nov 6 14:16:50 2015 +0100 fixes #7699 Lier le ObserveOpenDataManager avec le DataContext Summary of changes: .../java/fr/ird/observe/ui/admin/AdminStep.java | 3 +- .../ui/admin/consolidate/ConsolidateModel.java | 45 ------ .../ui/admin/consolidate/ConsolidateUIHandler.java | 159 +++++++++------------ .../longline/GearUseFeaturesLonglineUIHandler.java | 7 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 7 +- .../observe-application-swing_en_GB.properties | 3 + .../observe-application-swing_es_ES.properties | 3 + .../observe-application-swing_fr_FR.properties | 3 + .../consolidate/ConsolidateDataService.java | 2 + .../java/fr/ird/observe/services/dto/IdDtos.java | 20 +++ .../services/ObserveServiceFactoryRest.java | 7 + .../service/seine/NonTargetCatchServiceTopia.java | 4 +- 12 files changed, 121 insertions(+), 142 deletions(-) -- 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 (270aa57 -> 02fad67)
by codelutin.com scm 06 Nov '15

06 Nov '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 270aa57 Merge branch 'feature/7679' into develop new 02fad67 ne plus utiliser la fonction générique getObserveDto 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 02fad67843ca502f23cbee368c8e5ecb754a0274 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Nov 6 16:17:13 2015 +0100 ne plus utiliser la fonction générique getObserveDto Summary of changes: .../table/impl/longline/GearUseFeaturesLonglineUIHandler.java | 7 ++++++- .../ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) -- 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 (e72c6d7 -> 270aa57)
by codelutin.com scm 06 Nov '15

06 Nov '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 e72c6d7 ajout de la constant label pour le label traduit (refs #7698) new 028920c migration de l'écran de calcul des données (refs #7679) new 8564b8f maj fichier de traduction (refs #7679) new 270aa57 Merge branch 'feature/7679' 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 270aa576037041815b506fad53e8b6fdfae806c5 Merge: e72c6d7 8564b8f Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Nov 6 15:24:14 2015 +0100 Merge branch 'feature/7679' into develop commit 8564b8f7a0a5f51661c0419af62e440307bb99b7 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Nov 6 15:22:19 2015 +0100 maj fichier de traduction (refs #7679) commit 028920cbed3e19cc92159676616305152aa7fa0f Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Nov 6 14:59:24 2015 +0100 migration de l'écran de calcul des données (refs #7679) Summary of changes: .../java/fr/ird/observe/ui/admin/AdminStep.java | 3 +- .../ui/admin/consolidate/ConsolidateModel.java | 45 ------ .../ui/admin/consolidate/ConsolidateUIHandler.java | 159 +++++++++------------ .../observe-application-swing_en_GB.properties | 3 + .../observe-application-swing_es_ES.properties | 3 + .../observe-application-swing_fr_FR.properties | 3 + .../consolidate/ConsolidateDataService.java | 2 + .../java/fr/ird/observe/services/dto/IdDtos.java | 20 +++ .../services/ObserveServiceFactoryRest.java | 7 + .../service/seine/NonTargetCatchServiceTopia.java | 4 +- 10 files changed, 109 insertions(+), 140 deletions(-) -- 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/7679 deleted (was 8564b8f)
by codelutin.com scm 06 Nov '15

06 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7679 in repository observe. See http://git.codelutin.com/observe.git was 8564b8f maj fichier de traduction (refs #7679) This change permanently discards the following revisions: discards 8564b8f maj fichier de traduction (refs #7679) discards 028920c migration de l'écran de calcul des données (refs #7679) -- 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/7679 created (now 8564b8f)
by codelutin.com scm 06 Nov '15

06 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7679 in repository observe. See http://git.codelutin.com/observe.git at 8564b8f maj fichier de traduction (refs #7679) This branch includes the following new commits: new 028920c migration de l'écran de calcul des données (refs #7679) new 8564b8f maj fichier de traduction (refs #7679) 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 8564b8f7a0a5f51661c0419af62e440307bb99b7 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Nov 6 15:22:19 2015 +0100 maj fichier de traduction (refs #7679) commit 028920cbed3e19cc92159676616305152aa7fa0f Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Nov 6 14:59:24 2015 +0100 migration de l'écran de calcul des données (refs #7679) -- 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/7699 created (now 2883548)
by codelutin.com scm 06 Nov '15

06 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7699 in repository observe. See http://git.codelutin.com/observe.git at 2883548 fixes #7699 Lier le ObserveOpenDataManager avec le DataContext This branch includes the following new commits: new 2883548 fixes #7699 Lier le ObserveOpenDataManager avec le DataContext 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 288354875ab13f14460f2ea8e090ca1a5be742fc Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Nov 6 14:16:50 2015 +0100 fixes #7699 Lier le ObserveOpenDataManager avec le DataContext -- 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/list_screen_buttons updated (0a50602 -> 9b2e93a)
by codelutin.com scm 06 Nov '15

06 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/list_screen_buttons in repository observe. See http://git.codelutin.com/observe.git discards 0a50602 affichage des boutons sur les programmes, marées et activités longline discards c841b22 dans l'arbre, mettre en noir le programme quand il est ouvert discards 0170b86 Merge branch 'feature/list_screen_buttons' of https://git.codelutin.com/observe into feature/list_screen_buttons discards 6dce6df Ajout de méthodes pour transformer un Dto en sa référence (mais à revoir car il faut aussi passer les locales de référentiels) discards 8753453 Ajout fix me kmorin discards ce46bcf affichage des boutons dans la liste des marées discards 2d3546d accès aux routes et activités ouvertes depuis les niveaux supérieurs discards 615b068 ajout de la gestion d'ouverture et fermeture du programme dans l'observeDataManager discards db88c2d affichage des boutons dans les écrans de liste de routes et d'activités discards 2b1fd12 openDataManager dans l'ui pour pouvoir l'appeler dans les ui discards 6101ffb affichage des boutons dans la liste des marées discards 09f22ff accès aux routes et activités ouvertes depuis les niveaux supérieurs discards 086290f ajout de la gestion d'ouverture et fermeture du programme dans l'observeDataManager discards b0bfc40 affichage des boutons dans les écrans de liste de routes et d'activités discards 0341c7d openDataManager dans l'ui pour pouvoir l'appeler dans les ui adds 41f0245 A la fermeture d'une base bien desenregistrer les listeners dessus adds 6eb2fec Fermeture du context applicatif à la fermeture de l'application adds 19554fc Supression d'un log intutile adds e11bdf2 Suppression d'une classe obsolète adds 11123c1 Fermer proprement les base h2 adds a3dc0a0 suppresion des imports d'une classe supprimée (OpenableEntities) adds 0c76495 migration de l'écran d'export (refs #7677) adds fc9a6f8 migration de l'écran d'export des données observateur (refs #7677) adds 9269054 Merge branch 'feature/7677' into develop adds 4e9a504 ajout d'un adaptateur Gson pour les formDto adds 22849bf Ajout de méthodes pour transformer un Dto en sa référence (mais à revoir car il faut aussi passer les locales de référentiels) adds 73f98dd coder les fonctions de création de reference à partir des DTO et les utiliser dans l'ajout de noeud dans l'arbre de navigation (refs #7698) adds cf06be2 ajout du programm dans les DTO de marées (refs #7698) adds ed21b8e Merge branch 'feature/7698' into develop adds e72c6d7 ajout de la constant label pour le label traduit (refs #7698) new 77e2900 openDataManager dans l'ui pour pouvoir l'appeler dans les ui new eafdafa affichage des boutons dans les écrans de liste de routes et d'activités new 0027432 ajout de la gestion d'ouverture et fermeture du programme dans l'observeDataManager new fa79254 accès aux routes et activités ouvertes depuis les niveaux supérieurs new 7143db3 affichage des boutons dans la liste des marées new 92de5a3 openDataManager dans l'ui pour pouvoir l'appeler dans les ui new 772174a ajout de la gestion d'ouverture et fermeture du programme dans l'observeDataManager new 069a956 accès aux routes et activités ouvertes depuis les niveaux supérieurs new bb000f0 affichage des boutons dans la liste des marées new 9a5bcef Ajout fix me kmorin new 29eacd6 dans l'arbre, mettre en noir le programme quand il est ouvert new 9b2e93a affichage des boutons sur les programmes, marées et activités longline 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 (0a50602) \ N -- N -- N refs/heads/feature/list_screen_buttons (9b2e93a) 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 12 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 9b2e93a8dffe7ca0096ad5025e70ef485bc85cbc Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Nov 6 10:43:07 2015 +0100 affichage des boutons sur les programmes, marées et activités longline commit 29eacd66a1cc3c5287cf30cb96e4ab7f3e2e57db Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Nov 6 10:27:43 2015 +0100 dans l'arbre, mettre en noir le programme quand il est ouvert commit 9a5bcef39b4cbf5c92fa9c470663beb05dca97ef Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Nov 5 22:03:31 2015 +0100 Ajout fix me kmorin commit bb000f0375aacc38c35ca003ab590a4fa00d4e74 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Nov 5 18:37:30 2015 +0100 affichage des boutons dans la liste des marées commit 069a95691a0c206dae2641d69b9bdc8a4d0d089e Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Nov 5 16:17:37 2015 +0100 accès aux routes et activités ouvertes depuis les niveaux supérieurs commit 772174a1e95fb8f94229064a06d72efa451da389 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Nov 5 15:48:51 2015 +0100 ajout de la gestion d'ouverture et fermeture du programme dans l'observeDataManager commit 92de5a35fa1803299a6129d63cad8dd367dba131 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Nov 5 15:44:59 2015 +0100 openDataManager dans l'ui pour pouvoir l'appeler dans les ui commit 7143db34fcf2f6ab54bf66aee9a17ab490403325 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Nov 5 18:37:30 2015 +0100 affichage des boutons dans la liste des marées commit fa79254ad5364da9e4dd4dc6258af4551034dd60 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Nov 5 16:17:37 2015 +0100 accès aux routes et activités ouvertes depuis les niveaux supérieurs commit 002743236e1c51b6af80e130530db4a86454e359 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Nov 5 15:48:51 2015 +0100 ajout de la gestion d'ouverture et fermeture du programme dans l'observeDataManager commit eafdafa7a1abd112ab36d9226fffcc61d30363c1 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Nov 5 15:45:48 2015 +0100 affichage des boutons dans les écrans de liste de routes et d'activités commit 77e2900c148ab062940ec19754444febc6318377 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Nov 5 15:44:59 2015 +0100 openDataManager dans l'ui pour pouvoir l'appeler dans les ui Summary of changes: .../main/java/fr/ird/observe/ObserveRunner.java | 35 ++++-- .../observe/ObserveSwingApplicationContext.java | 5 +- .../fr/ird/observe/db/ObserveSwingDataSource.java | 8 +- .../java/fr/ird/observe/ui/DecoratorService.java | 7 ++ .../java/fr/ird/observe/ui/admin/AdminStep.java | 3 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 44 ++++++-- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 8 +- .../ird/observe/ui/admin/export/ExportModel.java | 82 +++++++------- .../observe/ui/admin/export/ExportUIHandler.java | 125 ++++++++++++--------- .../fr/ird/observe/ui/admin/export/TripEntry.java | 26 ++--- .../ui/admin/export/TripToExportTableModel.java | 13 +-- .../fr/ird/observe/ui/storage/StorageUIModel.java | 5 + .../ui/tree/DataSelectionTreeCellRenderer.java | 15 +-- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 27 ++++- .../controller/v1/DataSourceServiceController.java | 6 + .../CollectionFieldExpressionValidator2.java | 6 - .../observe/ObserveTopiaApplicationContext.java | 19 ++++ .../fr/ird/observe/entities/OpenableEntities.java | 101 ----------------- .../fr/ird/observe/entities/seine/RouteImpl.java | 7 -- .../ird/observe/entities/seine/TripSeineImpl.java | 6 - .../services/service/DataSourceService.java | 7 ++ .../java/fr/ird/observe/services/dto/FormDto.java | 4 + .../fr/ird/observe/services/dto/ImportDataDto.java | 38 +++++++ .../observe/services/dto/gson/FormDtoAdapter.java | 38 +++++++ .../services/dto/gson/ObserveDtoGsonSupplier.java | 2 + .../dto/longline/ActivityLonglineDtos.java | 18 ++- .../services/dto/longline/TripLonglineDtos.java | 21 +++- .../dto/referential/I18nReferentialDto.java | 9 ++ .../services/dto/referential/PersonDtos.java | 8 ++ .../services/dto/seine/ActivitySeineDtos.java | 16 ++- .../ird/observe/services/dto/seine/RouteDtos.java | 15 ++- .../observe/services/dto/seine/TripSeineDtos.java | 22 ++++ .../main/xmi/observe-services-dto-seine.properties | 2 + .../src/main/xmi/observe-services-dto-seine.zargo | Bin 61923 -> 62122 bytes .../services/dto/ObserveDtosInitializer.java | 2 + .../services/service/DataSourceServiceTopia.java | 18 +++ 36 files changed, 480 insertions(+), 288 deletions(-) delete mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/OpenableEntities.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/ImportDataDto.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/FormDtoAdapter.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/I18nReferentialDto.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 12