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 4ce182d Démarage de client swing (termine #7328) estion des data source dans l'application swing (termine #7529) Merge branch 'feature/7528' into develop new da72826 début d'utilisation des services dans doSave et doDelete (refs #7531) new 48e222f utilisation des services dans doSave et doDelete new 1301e7e début d'utilisation des services dans doSave et doDelete (refs #7531) new 28d8c9c utilisation des services dans doSave et doDelete new 18f6d90 Fix merge new eb48311 appel des services pour le load et precreate (refs #7531) new b878fd0 appel de services dans dopersist (refs #7531) new 3f33c38 suppression des fixme (refs #7531) new 5788fd3 utilisation des services dans getChilds des lists (refs #7531) new a34fca2 fix tests + chargement du parent dans les listes (refs #7531) new ed2dfa8 fix tests et compilation (ils ne passent pas mais ça compile) (refs #7531) new 413a37a fix des services pour recuperer les stubsdto (refs #7531) new 6cbffa6 modif d'une mauvais classe de DTO (refs #7531) new c4b0e75 Fix merges new 248c1f6 mise en place du générateur de text (refs #7547) new 0e8bc21 deplacement de l'instance du generateur de text dans le context de l'application + utiliser la local de la configuration(refs #7547) new 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 The 17 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 f83390ab503eb29c8292e3b10c65535521eebf6d Merge: c4b0e75 0e8bc21 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 2 11:52:14 2015 +0200 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 commit 0e8bc2176e6eed1b30490384ec293cb04d6386dc Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Oct 2 11:29:19 2015 +0200 deplacement de l'instance du generateur de text dans le context de l'application + utiliser la local de la configuration(refs #7547) commit 248c1f68bd20115e5fd9d882839399613c84d765 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Sep 28 09:55:57 2015 +0200 mise en place du générateur de text (refs #7547) commit c4b0e75e2edccc86c497ad9719ffc772587beed2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 2 11:48:34 2015 +0200 Fix merges commit 6cbffa6627beaef45d90208c5734b17ff85486b9 Author: Kevin Morin <morin@codelutin.com> Date: Tue Sep 29 14:44:12 2015 +0200 modif d'une mauvais classe de DTO (refs #7531) commit 413a37ab143e1d2040e1f4fc096760c9cbbb2edb Author: Kevin Morin <morin@codelutin.com> Date: Tue Sep 29 11:08:43 2015 +0200 fix des services pour recuperer les stubsdto (refs #7531) commit ed2dfa8a1ab9bb0353e7af55fc4fcade99f3cc39 Author: Kevin Morin <morin@codelutin.com> Date: Mon Sep 28 18:54:27 2015 +0200 fix tests et compilation (ils ne passent pas mais ça compile) (refs #7531) commit a34fca23496d08933824ebfaa449f7006ac43b9b Author: Kevin Morin <morin@codelutin.com> Date: Mon Sep 28 18:10:03 2015 +0200 fix tests + chargement du parent dans les listes (refs #7531) commit 5788fd3703e5130023c0c889b8ca7148f38dc765 Author: Kevin Morin <morin@codelutin.com> Date: Mon Sep 28 17:40:07 2015 +0200 utilisation des services dans getChilds des lists (refs #7531) commit 3f33c387644698dc15830836d9287ff1cbb013cf Author: Kevin Morin <morin@codelutin.com> Date: Mon Sep 28 16:27:01 2015 +0200 suppression des fixme (refs #7531) commit b878fd0ecc90e0576031a2981cd6da951e0b538f Author: Kevin Morin <morin@codelutin.com> Date: Fri Sep 25 17:03:15 2015 +0200 appel de services dans dopersist (refs #7531) commit eb4831192d1324325e3b1752241d94873b2d0aa7 Author: Kevin Morin <morin@codelutin.com> Date: Fri Sep 25 11:32:25 2015 +0200 appel des services pour le load et precreate (refs #7531) commit 18f6d90066868c465a56b2a501e1205560a65847 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Sep 24 19:26:43 2015 +0200 Fix merge commit 28d8c9cbf1763a993999ffa190d1cf13e15dba8b Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 24 18:15:26 2015 +0200 utilisation des services dans doSave et doDelete commit 1301e7e568b354feff89b9870eddd69bed2739c8 Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 24 17:08:04 2015 +0200 début d'utilisation des services dans doSave et doDelete (refs #7531) commit 48e222feba23457b1ee0b9e7932704fc2b44c124 Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 24 18:15:26 2015 +0200 utilisation des services dans doSave et doDelete commit da72826c7e01465b1291e1649796410afcd91f78 Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 24 17:08:04 2015 +0200 début d'utilisation des services dans doSave et doDelete (refs #7531) Summary of changes: observe-application-swing/pom.xml | 6 + .../main/java/fr/ird/observe/ObserveCLAction.java | 3 +- .../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 | 352 +-------------------- .../fr/ird/observe/ui/storage/tabs/ConfigUI.css | 5 +- .../fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx | 3 +- .../ui/storage/tabs/DataSelectionModel.java | 26 +- .../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 35328 -> 36919 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, 2526 insertions(+), 2075 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>.