This is an automated email from the git hooks/post-receive script. New change to branch feature/7549 in repository observe. See http://git.codelutin.com/observe.git discards c2dc6f3 verification des versions a la connection avec un serveur et a l'ouverture de la base (refs #7549) discards 853519a migrer une base sans l'ouvrir, verification de la version de la base local au chargement et migration si nécessaire (refs #7549) discards 7791a1f miragtion des base de données (refs #7549) discards 5083a88 migration des tâches administratives, mise ren place de la Sécurité (refs #7549) discards 9392bae ajout du converter pour les DTO (refs #7549) discards 827ce41 renomage en observeDbUserDto et ajout du role d'administrator (refs #7549) discards 65ebe2e ajout des méthodes de service pour gérer la securité des bases PG (refs #7549) discards 3116433 ajout du DTO pour les utilisateurs de la base PG (refs #7549) adds da72826 début d'utilisation des services dans doSave et doDelete (refs #7531) adds 48e222f utilisation des services dans doSave et doDelete adds 1301e7e début d'utilisation des services dans doSave et doDelete (refs #7531) adds 28d8c9c utilisation des services dans doSave et doDelete adds 18f6d90 Fix merge adds eb48311 appel des services pour le load et precreate (refs #7531) adds b878fd0 appel de services dans dopersist (refs #7531) adds 3f33c38 suppression des fixme (refs #7531) adds 5788fd3 utilisation des services dans getChilds des lists (refs #7531) adds a34fca2 fix tests + chargement du parent dans les listes (refs #7531) adds ed2dfa8 fix tests et compilation (ils ne passent pas mais ça compile) (refs #7531) adds 413a37a fix des services pour recuperer les stubsdto (refs #7531) adds 6cbffa6 modif d'une mauvais classe de DTO (refs #7531) adds c4b0e75 Fix merges adds 248c1f6 mise en place du générateur de text (refs #7547) adds 0e8bc21 deplacement de l'instance du generateur de text dans le context de l'application + utiliser la local de la configuration(refs #7547) adds f83390a Utiliser un moteur de template pour générer le rendu des résumés d'action (Termine #7547) Merge branch 'feature/7547' into develop new ff31642 ajout du DTO pour les utilisateurs de la base PG (refs #7549) new 6e20360 ajout des méthodes de service pour gérer la securité des bases PG (refs #7549) new 34b2c0e renomage en observeDbUserDto et ajout du role d'administrator (refs #7549) new 8ec40fe ajout du converter pour les DTO (refs #7549) new bfcd27c migration des tâches administratives, mise ren place de la Sécurité (refs #7549) new 600a69c miragtion des base de données (refs #7549) new e324081 migrer une base sans l'ouvrir, verification de la version de la base local au chargement et migration si nécessaire (refs #7549) new 3457320 verification des versions a la connection avec un serveur et a l'ouverture de la base (refs #7549) new 6910618 adapter le rapport de connexion au base a la gestion de la sécurité (suite au rebase) (refs #7549) 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 (c2dc6f3) \ N -- N -- N refs/heads/feature/7549 (6910618) 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 9 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 6910618ff8f85c397bda93c616688cda3a9058b6 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Oct 2 15:16:33 2015 +0200 adapter le rapport de connexion au base a la gestion de la sécurité (suite au rebase) (refs #7549) commit 3457320497a7919b3e888b125e2b736a3dc0b398 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Oct 1 16:37:53 2015 +0200 verification des versions a la connection avec un serveur et a l'ouverture de la base (refs #7549) commit e3240813a121b70372f42468b30aff5ddfc0e987 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Sep 30 17:53:37 2015 +0200 migrer une base sans l'ouvrir, verification de la version de la base local au chargement et migration si nécessaire (refs #7549) commit 600a69cdb2419cf151c743a91177d65c88b88004 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Sep 30 16:07:44 2015 +0200 miragtion des base de données (refs #7549) commit bfcd27c09e6ba89f6879d500b611f953fbe88ba4 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Sep 30 09:50:39 2015 +0200 migration des tâches administratives, mise ren place de la Sécurité (refs #7549) commit 8ec40fefe7b49a496b5ca95cae8326ce9a9d420b Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Sep 30 09:46:03 2015 +0200 ajout du converter pour les DTO (refs #7549) commit 34b2c0e0a41e4eb689e03b167440abe13eb51556 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Sep 30 09:45:11 2015 +0200 renomage en observeDbUserDto et ajout du role d'administrator (refs #7549) commit 6e20360f9c13fe59637027f9867afd758ea858c2 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Sep 29 10:59:00 2015 +0200 ajout des méthodes de service pour gérer la securité des bases PG (refs #7549) commit ff316428c0b7dbc7b862c873dbbb8497dbc97cda Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Sep 29 10:50:34 2015 +0200 ajout du DTO pour les utilisateurs de la base PG (refs #7549) Summary of changes: observe-application-swing/pom.xml | 6 + .../java/fr/ird/observe/ObserveServiceHelper.java | 27 +- .../observe/ObserveSwingApplicationContext.java | 34 +- .../java/fr/ird/observe/ObserveTextGenerator.java | 104 ++++++ .../fr/ird/observe/db/ObserveSwingDataSource.java | 3 +- .../java/fr/ird/observe/ui/DecoratorService.java | 49 +-- .../fr/ird/observe/ui/ObserveMainUIHandler.java | 9 +- .../src/main/java/fr/ird/observe/ui/UIHelper.java | 48 ++- .../observe/ui/actions/ShowStorageInfoAction.java | 15 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 12 - .../ird/observe/ui/content/ContentUIHandler.java | 98 +----- .../observe/ui/content/ContentUIInitializer.java | 202 +++++------- .../ird/observe/ui/content/ContentUIManager.java | 64 ++-- .../content/impl/longline/BranchlineUIHandler.java | 35 +-- .../LonglineDetailCompositionUIHandler.java | 36 ++- .../LonglineDetailCompositionUIInitializer.java | 4 - .../longline/LonglineDetailCompositionUIModel.java | 7 - .../impl/longline/SetLonglineUIHandler.java | 105 +++---- .../ActivitySeineObservedSystemUIHandler.java | 32 +- .../FloatingObjectTransmittingBuoyOperationUI.jaxx | 6 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 129 ++++---- ...tingObjectTransmittingBuoyOperationUIModel.java | 16 +- .../impl/seine/FloatingObjectUIHandler.java | 92 +++--- .../ui/content/impl/seine/SetSeineUIHandler.java | 117 ++++--- .../ui/content/list/ContentListUIHandler.java | 7 +- .../impl/longline/ActivityLonglinesUIHandler.java | 36 ++- .../list/impl/longline/TripLonglinesUIHandler.java | 38 ++- .../list/impl/seine/ActivitySeinesUIHandler.java | 36 ++- .../content/list/impl/seine/RoutesUIHandler.java | 36 ++- .../list/impl/seine/TripSeinesUIHandler.java | 40 ++- .../ui/content/open/ContentOpenableUIHandler.java | 18 +- .../impl/longline/ActivityLonglineUIHandler.java | 178 +++++------ .../open/impl/longline/TripLonglineUIHandler.java | 138 ++++---- .../open/impl/seine/ActivitySeineUIHandler.java | 132 ++++---- .../ui/content/open/impl/seine/RouteUIHandler.java | 164 +++++----- .../open/impl/seine/TripSeineUIHandler.java | 163 +++++----- .../ui/content/ref/ContentReferenceUIHandler.java | 241 +++++++------- .../ui/content/table/ContentTableUIHandler.java | 97 +++--- .../ui/content/table/ContentTableUIModel.java | 19 +- .../table/impl/longline/BaitsCompositionUI.jaxx | 11 +- .../impl/longline/BaitsCompositionUIHandler.java | 26 +- .../impl/longline/BaitsCompositionUIModel.java | 9 +- .../impl/longline/BranchlinesCompositionUI.jaxx | 11 +- .../longline/BranchlinesCompositionUIHandler.java | 31 +- .../longline/BranchlinesCompositionUIModel.java | 8 +- .../impl/longline/CatchLonglineUIHandler.java | 30 +- .../table/impl/longline/EncounterUIHandler.java | 24 +- .../longline/FloatlinesCompositionUIHandler.java | 26 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 29 +- .../impl/longline/HooksCompositionUIHandler.java | 26 +- .../table/impl/longline/SensorUsedUIHandler.java | 21 +- .../content/table/impl/longline/TdrUIHandler.java | 21 +- .../impl/longline/WeightMeasuresTableModel.java | 5 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 29 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 20 ++ .../table/impl/seine/NonTargetSampleUIHandler.java | 20 ++ .../impl/seine/ObjectObservedSpeciesUIHandler.java | 21 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 20 ++ .../table/impl/seine/SchoolEstimateUIHandler.java | 20 ++ .../table/impl/seine/TargetCatchUIHandler.java | 20 ++ .../impl/seine/TargetDiscardCatchUIHandler.java | 49 ++- .../table/impl/seine/TargetSampleUIHandler.java | 22 ++ .../ird/observe/ui/storage/StorageUIHandler.java | 338 +------------------- .../fr/ird/observe/ui/storage/tabs/ConfigUI.css | 5 +- .../fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx | 3 +- .../ui/storage/tabs/DataSelectionModel.java | 26 +- .../ird/observe/ui/storage/tabs/SecurityModel.java | 25 ++ .../ui/storage/tabs/StorageTabUIHandler.java | 41 +-- .../fr/ird/observe/ui/tree/DtoNodeSupport.java | 11 - .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 12 - .../EditableTableWithCacheTableModelSupport.java | 24 +- .../observe/ui/util/tripMap/TripMapUIHandler.java | 5 +- .../main/resources/ftl/connexionTestResult_fr.ftl | 20 ++ .../ftl/dataSourceConnectionReport_fr.ftl | 348 +++++++++++++++++++++ .../resources/ftl/dataSourceInformation_fr.ftl | 54 ++++ .../ftl/dataSourceSelectModeResume_fr.ftl | 40 +++ .../ftl/storageModelDataSourceConfiguration_fr.ftl | 18 ++ .../observe-application-swing_en_GB.properties | 1 + .../observe-application-swing_es_ES.properties | 1 + .../observe-application-swing_fr_FR.properties | 1 + .../v1/ReferentialServiceController.java | 4 +- .../ActivityLonglineServiceController.java | 14 +- ...LonglineGlobalCompositionServiceController.java | 4 +- .../v1/longline/SetLonglineServiceController.java | 4 +- .../v1/longline/TripLonglineServiceController.java | 9 +- ...tivitySeineObservedSystemServiceController.java | 4 +- .../v1/seine/ActivitySeineServiceController.java | 9 +- .../v1/seine/FloatingObjectServiceController.java | 4 +- .../v1/seine/NonTargetSampleServiceController.java | 4 +- .../v1/seine/RouteServiceController.java | 14 +- .../v1/seine/SetSeineServiceController.java | 4 +- .../v1/seine/TargetSampleServiceController.java | 4 +- ...TransmittingBuoyOperationServiceController.java | 4 +- .../v1/seine/TripSeineServiceController.java | 9 +- .../services/service/ReferentialService.java | 2 +- .../service/longline/ActivityLonglineService.java | 13 +- .../SetLonglineGlobalCompositionService.java | 2 +- .../service/longline/SetLonglineService.java | 2 +- .../service/longline/TripLonglineService.java | 7 +- .../seine/ActivitySeineObservedSystemService.java | 2 +- .../service/seine/ActivitySeineService.java | 7 +- .../service/seine/FloatingObjectService.java | 2 +- .../service/seine/NonTargetSampleService.java | 2 +- .../services/service/seine/RouteService.java | 10 +- .../services/service/seine/SetSeineService.java | 2 +- .../service/seine/TargetSampleService.java | 2 +- .../seine/TransmittingBuoyOperationService.java | 2 +- .../services/service/seine/TripSeineService.java | 7 +- .../src/main/xmi/observe-services-dto-common.zargo | Bin 37572 -> 39020 bytes .../service/seine/TripSeineServiceRestTest.java | 46 +-- .../services/dto/ObserveDtosInitializer.java | 5 + .../services/service/ReferentialServiceTopia.java | 6 +- .../longline/ActivityLonglineServiceTopia.java | 60 +++- .../SetLonglineGlobalCompositionServiceTopia.java | 4 +- .../service/longline/SetLonglineServiceTopia.java | 4 +- .../service/longline/TripLonglineServiceTopia.java | 40 ++- .../ActivitySeineObservedSystemServiceTopia.java | 4 +- .../service/seine/ActivitySeineServiceTopia.java | 42 ++- .../service/seine/FloatingObjectServiceTopia.java | 4 +- .../service/seine/NonTargetSampleServiceTopia.java | 4 +- .../services/service/seine/RouteServiceTopia.java | 62 +++- .../service/seine/SetSeineServiceTopia.java | 5 +- .../service/seine/TargetSampleServiceTopia.java | 4 +- .../TransmittingBuoyOperationServiceTopia.java | 4 +- .../service/seine/TripSeineServiceTopia.java | 40 ++- .../fr/ird/observe/services/service/RigthTest.java | 4 +- .../service/seine/TripSeineServiceTopiaTest.java | 46 +-- pom.xml | 7 + 128 files changed, 2549 insertions(+), 2060 deletions(-) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ObserveTextGenerator.java create mode 100644 observe-application-swing/src/main/resources/ftl/connexionTestResult_fr.ftl create mode 100644 observe-application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl create mode 100644 observe-application-swing/src/main/resources/ftl/dataSourceInformation_fr.ftl create mode 100644 observe-application-swing/src/main/resources/ftl/dataSourceSelectModeResume_fr.ftl create mode 100644 observe-application-swing/src/main/resources/ftl/storageModelDataSourceConfiguration_fr.ftl -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.