This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from c3f6abd Réduit la plage d'erreur gérées par l'exception ObserveServiceRestNotAvailableException car on masque certains messages d'erreur new 47102cb Set data provider to cell renderer when present new 0ba9286 fix NPE if no trip found for a program new e3b7181 UI for data synchronize action new 2194ff2 more decoration methods new 6012e89 Continue ui for data synchronize action new d5fb3d4 debut de gestion de la prise en compte des marées présentes des deux cotés lors d'une recopie new c1cee17 Début d'implantation de la logique de synchronisation de données new f68a088 Meilleure utilisation des déclarations de service new 3dc6ce0 Make delete actions works new 7b3d335 Introduce delete request in SqlScriptProducerService new 325892a Add more logs new a747c82 use now delete from sql producer instead of hibernate delete new 1b76319 Rename test new d7ad52e Ajout de plus de messages de préparation des tâches à executer new fb3465f Check if classes are implemented new cb053ba Fix bad class name new d281360 Fix layout + add action icons new 2709614 introduce services provider contract new 16d28d4 Improve exception handler new f54a610 make the test works again new d1a1527 add rest service new 06024e3 Sanitize the application context, introduce DataSourcesManager, clean code a lot new ce3b308 Improve tasks renderer new 0aa66ab Fixes #4304 \o/ Merge branch 'feature/4304_synchro_marees' into develop The 24 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 0aa66abdad6ff3052c1648b6ac1479c237e90e89 Merge: c3f6abd ce3b308 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 9 16:53:18 2016 +0200 Fixes #4304 \o/ Merge branch 'feature/4304_synchro_marees' into develop commit ce3b308c4d20e17958964700ffe1f25f308ba127 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 9 16:52:13 2016 +0200 Improve tasks renderer commit 06024e398f99496fb59aae43c796122c7379eba6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 9 16:42:08 2016 +0200 Sanitize the application context, introduce DataSourcesManager, clean code a lot commit d1a15274acba4f48994ea35ac466058488be4935 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 9 16:41:26 2016 +0200 add rest service commit f54a6106d355f286c1e42f0acfa0e8ee514cd3d7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 9 16:41:14 2016 +0200 make the test works again commit 16d28d4c3ca0dd3aa9b83a3c7f2a3cee0c233a52 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 9 16:40:32 2016 +0200 Improve exception handler commit 2709614ff71714af22606bcf40db878e22530114 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 9 16:39:57 2016 +0200 introduce services provider contract commit d2813606492e0ef920fe89464d7024b3cf1c7ef9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 9 16:39:38 2016 +0200 Fix layout + add action icons commit cb053baaad6490acc3bef11b4f0bb2352ad0029a Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 9 16:38:13 2016 +0200 Fix bad class name commit fb3465fcbe3d00aea018a40b29768ad2984109e9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 9 16:11:50 2016 +0200 Check if classes are implemented commit d7ad52eb0e99aee1748d6974b7087231cd37b3b5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 8 16:17:55 2016 +0200 Ajout de plus de messages de préparation des tâches à executer commit 1b76319d55d3fc32479770a3bd4d2a36e4b1a1ba Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 8 15:59:26 2016 +0200 Rename test commit a747c8225ae4166bdb6fdb243cb9e86b7b9a7bf9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 8 15:58:50 2016 +0200 use now delete from sql producer instead of hibernate delete commit 325892a388a64041f06ab5ce86d9c25e3fb68bc6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 8 15:58:30 2016 +0200 Add more logs commit 7b3d335ae09b5e9e76cf68d07c92a52f6b684552 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 8 15:58:20 2016 +0200 Introduce delete request in SqlScriptProducerService commit 3dc6ce0aeae64d2bf50f3fe206cc7b077f464fd5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 8 15:56:27 2016 +0200 Make delete actions works commit f68a088128dcbac272d85c19dc6e65c5d9b8c4d4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 8 12:08:09 2016 +0200 Meilleure utilisation des déclarations de service commit c1cee17e2b11b2230a92ba8a28adc0f7251175a7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 8 12:08:05 2016 +0200 Début d'implantation de la logique de synchronisation de données commit d5fb3d4af7aa5f3aa003ca2313010fd5ad4de6a7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 8 11:35:44 2016 +0200 debut de gestion de la prise en compte des marées présentes des deux cotés lors d'une recopie commit 6012e8927d9ba8f60943e03b48fe52eaf17bf5be Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Aug 3 12:33:28 2016 +0200 Continue ui for data synchronize action commit 2194ff2cd4542698e6ca1195eb6f3098c4e54731 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Aug 3 12:33:14 2016 +0200 more decoration methods commit e3b7181a75318c871b39513055120a426551e870 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 2 17:37:26 2016 +0200 UI for data synchronize action commit 0ba9286a57c80197a67ca6244ac07b67705a36bf Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 2 17:37:03 2016 +0200 fix NPE if no trip found for a program commit 47102cbd0cb790d7609901861adfe76b8debefee Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 2 17:36:23 2016 +0200 Set data provider to cell renderer when present Summary of changes: .../swing/decoration/DecoratorService.java | 10 + .../src/main/filters/observe-ui.properties | 4 + .../java/fr/ird/observe/ObserveActionExecutor.java | 20 +- .../main/java/fr/ird/observe/ObserveCLAction.java | 23 +- .../fr/ird/observe/ObserveOpenDataManager.java | 65 ++ .../main/java/fr/ird/observe/ObserveRunner.java | 91 +- .../observe/ObserveSwingApplicationContext.java | 999 ++++++++------------- .../ObserveSwingApplicationDataSourcesManager.java | 108 +++ .../fr/ird/observe/db/ObserveSwingDataSource.java | 276 +++++- .../main/java/fr/ird/observe/ui/ObserveMainUI.jaxx | 18 +- .../main/java/fr/ird/observe/ui/ObserveMainUI.jcss | 4 + .../fr/ird/observe/ui/ObserveMainUIHandler.java | 66 +- .../java/fr/ird/observe/ui/ObserveUICallback.java | 7 +- .../src/main/java/fr/ird/observe/ui/UIHelper.java | 12 +- .../actions/ChangeApplicationLanguageAction.java | 2 +- .../observe/ui/actions/ChangeDbLanguageAction.java | 2 +- .../observe/ui/actions/ChangeStorageAction.java | 2 +- .../observe/ui/actions/CloseApplicationAction.java | 2 +- .../fr/ird/observe/ui/actions/CloseHelpAction.java | 2 +- .../ird/observe/ui/actions/CloseStorageAction.java | 4 +- .../ui/actions/ImportStorageFromFileAction.java | 4 +- .../ird/observe/ui/actions/LaunchAdminAction.java | 2 +- .../ui/actions/ReloadApplicationAction.java | 2 +- .../actions/ReloadDefaultConfigurationAction.java | 2 +- .../observe/ui/actions/ReloadResourcesAction.java | 5 +- .../observe/ui/actions/ReloadStorageAction.java | 6 +- .../ui/actions/SaveStorageToFileAction.java | 4 +- .../ird/observe/ui/actions/ShowConfigAction.java | 4 +- .../observe/ui/actions/ShowStorageInfoAction.java | 2 +- .../ui/actions/shared/CloseAndCreateUIAction.java | 8 +- .../ui/actions/shared/CloseOpenUIAction.java | 8 +- .../shared/MoveActivityLonglinesUIAction.java | 2 +- .../actions/shared/MoveActivitySeinesUIAction.java | 2 +- .../ui/actions/shared/MoveRoutesUIAction.java | 2 +- .../actions/shared/MoveTripLonglinesUIAction.java | 2 +- .../ui/actions/shared/MoveTripSeinesUIAction.java | 2 +- .../observe/ui/actions/shared/ReOpenUIAction.java | 2 +- .../ui/actions/shared/SelectOpenNodeUIAction.java | 2 +- .../java/fr/ird/observe/ui/admin/AdminStep.java | 21 + .../java/fr/ird/observe/ui/admin/AdminTabUI.jaxx | 15 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 57 +- .../fr/ird/observe/ui/admin/AdminUILauncher.java | 6 +- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 149 ++- .../ui/admin/consolidate/ConsolidateUIHandler.java | 2 +- .../datasynchro/CopyToLeftDataSynchronizeTask.java | 33 + .../CopyToRightDataSynchronizeTask.java | 33 + .../ui/admin/datasynchro/DataSynchroModel.java | 118 +++ .../ui/admin/datasynchro/DataSynchroUI.jaxx | 129 +++ .../ui/admin/datasynchro/DataSynchroUI.jcss | 114 +++ .../ui/admin/datasynchro/DataSynchroUIHandler.java | 300 +++++++ .../DataSynchronizeTaskListCellRenderer.java | 27 + .../datasynchro/DataSynchronizeTaskSupport.java | 56 ++ .../DeleteFromLeftDataSynchronizeTask.java | 25 + .../DeleteFromRightDataSynchronizeTask.java | 25 + .../observe/ui/admin/export/ExportUIHandler.java | 4 +- .../observe/ui/admin/report/ReportUIHandler.java | 4 +- .../observe/ui/admin/save/SaveLocalUIHandler.java | 6 +- .../ui/admin/validate/ValidateUIHandler.java | 2 +- .../java/fr/ird/observe/ui/content/ContentUI.jaxx | 11 +- .../ird/observe/ui/content/ContentUIHandler.java | 2 +- .../ird/observe/ui/content/ContentUIManager.java | 77 +- .../impl/longline/LonglineDetailCompositionUI.jaxx | 2 +- .../LonglineDetailCompositionUIHandler.java | 12 +- ...onglineDetailCompositionUIValidationHelper.java | 233 ----- ...LonglineDetailCompositionValidationContext.java | 116 +++ .../LonglineDetailCompositionValidatorService.java | 155 ++++ .../impl/longline/LonglineGlobalCompositionUI.jaxx | 8 +- .../LonglineGlobalCompositionUIHandler.java | 3 +- .../impl/longline/SetLonglineUIHandler.java | 2 +- .../ActivitySeineObservedSystemUIHandler.java | 2 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 2 +- .../impl/seine/FloatingObjectUIHandler.java | 2 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 4 +- .../impl/longline/ActivityLonglinesUIHandler.java | 2 +- .../list/impl/longline/TripLonglinesUIHandler.java | 2 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 2 +- .../content/list/impl/seine/RoutesUIHandler.java | 2 +- .../list/impl/seine/TripSeinesUIHandler.java | 2 +- .../impl/longline/ActivityLonglineUIHandler.java | 2 +- .../open/impl/longline/TripLonglineUIHandler.java | 4 +- .../open/impl/seine/ActivitySeineUIHandler.java | 2 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 4 +- .../open/impl/seine/TripSeineUIHandler.java | 4 +- .../ui/content/ref/ContentReferenceUIHandler.java | 2 +- .../ui/content/table/ContentTableUIHandler.java | 4 +- .../impl/longline/CatchLonglineUIHandler.java | 10 +- .../table/impl/longline/EncounterUIHandler.java | 4 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 6 +- .../table/impl/longline/SensorUsedUIHandler.java | 4 +- .../content/table/impl/longline/TdrUIHandler.java | 6 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 6 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 4 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 2 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 4 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 4 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 4 +- .../table/impl/seine/TargetCatchUIHandler.java | 4 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 4 +- .../table/impl/seine/TargetSampleUIHandler.java | 2 +- .../ird/observe/ui/storage/ObstunaAdminAction.java | 16 +- .../ui/storage/StorageBackupUILauncher.java | 4 +- .../ird/observe/ui/storage/StorageUIHandler.java | 48 +- .../ird/observe/ui/storage/StorageUILauncher.java | 11 +- .../fr/ird/observe/ui/storage/StorageUIModel.java | 70 +- .../observe/ui/storage/tabs/ChooseDbModeUI.jaxx | 13 +- .../ui/storage/tabs/DataSelectionModel.java | 42 +- .../ui/storage/tabs/StorageTabUIHandler.java | 3 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 2 +- .../ird/observe/ui/tree/ActivityLonglineNode.java | 2 +- .../fr/ird/observe/ui/tree/ActivitySeineNode.java | 2 +- .../ui/tree/DataSelectionTreeSelectionModel.java | 2 +- .../observe/ui/tree/FloatingObjectSeineNode.java | 2 +- .../ui/tree/NavigationTreeSelectionModel.java | 2 +- .../tree/ObserveNavigationTreeShowPopupAction.java | 8 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 87 +- .../ird/observe/ui/tree/ProgramLonglineNode.java | 2 +- .../fr/ird/observe/ui/tree/ProgramSeineNode.java | 2 +- .../fr/ird/observe/ui/tree/RouteSeineNode.java | 2 +- .../fr/ird/observe/ui/tree/SetLonglineNode.java | 2 +- .../java/fr/ird/observe/ui/tree/SetSeineNode.java | 2 +- .../fr/ird/observe/ui/tree/TripLonglineNode.java | 2 +- .../java/fr/ird/observe/ui/tree/TripSeineNode.java | 2 +- .../actions/ChangeActivityRouteActionListener.java | 4 +- .../actions/ChangeActivityTripActionListener.java | 2 +- .../actions/ChangeRouteTripActionListener.java | 4 +- .../actions/ChangeTripProgramActionListener.java | 8 +- .../loadors/ActivityLonglinesNodeChildLoador.java | 2 +- .../tree/loadors/ActivitySeineNodeChildLoador.java | 2 +- .../loadors/ActivitySeinesNodeChildLoador.java | 2 +- .../loadors/ProgramLonglineNodeChildLoador.java | 9 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 10 +- .../ui/tree/loadors/RoutesNodeChildLoador.java | 2 +- .../observe/ui/util/tripMap/TripMapUIHandler.java | 4 +- .../observe/validation/ObserveSwingValidator.java | 42 +- .../ird/observe/validation/ValidationContext.java | 40 +- .../observe-application-swing_en_GB.properties | 28 + .../observe-application-swing_es_ES.properties | 28 + .../observe-application-swing_fr_FR.properties | 27 + .../{action-go-back.png => action-copyToLeft.png} | Bin .../main/resources/icons/action-copyToRight.png | Bin 0 -> 349 bytes ...action-delete.png => action-deleteFromLeft.png} | Bin ...ction-delete.png => action-deleteFromRight.png} | Bin ...glineDetailCompositionValidatorServiceTest.java | 107 +-- .../v1/SqlScriptProducerServiceController.java | 11 +- .../DataSynchronizeServiceController.java | 32 + ...er.java => ReplicateTripServiceController.java} | 4 +- .../injector/SqlScriptProducerRequestInjector.java | 12 +- .../maven/plugins/checkapi/CheckApiMojo.java | 29 +- .../plugins/checkapi/MissingClassException.java | 21 + .../java/fr/ird/observe/RunScriptTopiaSqlWork.java | 8 + .../observe/services/ObserveServicesProvider.java | 124 +++ ...quest.java => AddSqlScriptProducerRequest.java} | 20 +- ...st.java => DeleteSqlScriptProducerRequest.java} | 50 +- .../services/service/SqlScriptProducerService.java | 4 +- .../datasynchro/DataSynchronizeCopyTask.java | 27 + .../datasynchro/DataSynchronizeDeleteTask.java | 27 + .../datasynchro/DataSynchronizeRequest.java | 101 +++ .../datasynchro/DataSynchronizeService.java | 52 ++ .../datasynchro/DataSyncrhonizeTaskSupport.java | 26 + .../actions/validate/ValidateServiceUtils.java | 10 +- .../validate/ValidatorInitializationException.java | 14 + .../services/service/DataSourceServiceTopia.java | 22 +- .../service/SqlScriptProducerServiceTopia.java | 84 +- .../datasynchro/DataSynchronizeServiceTopia.java | 115 +++ .../actions/export/ReplicateTripServiceTopia.java | 6 +- ...a => AddSqlScriptProducerServiceTopiaTest.java} | 22 +- .../services/service/MigrateTestsDatabases.java | 24 +- .../sql/batch/actions/AbstractTablesAction.java | 5 +- .../sql/batch/actions/DeleteTablesAction.java | 13 +- .../sql/batch/actions/ReplicateTablesAction.java | 6 + .../sql/batch/actions/UpdateTablesAction.java | 5 + .../service/sql/batch/tables/TopiaSqlTables.java | 11 + 172 files changed, 3489 insertions(+), 1676 deletions(-) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationDataSourcesManager.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/CopyToLeftDataSynchronizeTask.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/CopyToRightDataSynchronizeTask.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DataSynchroModel.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DataSynchroUI.jaxx create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DataSynchroUI.jcss create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DataSynchroUIHandler.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DataSynchronizeTaskListCellRenderer.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DataSynchronizeTaskSupport.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DeleteFromLeftDataSynchronizeTask.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DeleteFromRightDataSynchronizeTask.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionValidationContext.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionValidatorService.java copy observe-application-swing/src/main/resources/icons/{action-go-back.png => action-copyToLeft.png} (100%) create mode 100644 observe-application-swing/src/main/resources/icons/action-copyToRight.png copy observe-application-swing/src/main/resources/icons/{action-delete.png => action-deleteFromLeft.png} (100%) copy observe-application-swing/src/main/resources/icons/{action-delete.png => action-deleteFromRight.png} (100%) create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/datasynchro/DataSynchronizeServiceController.java rename observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/export/{ReplicateTripServicecontroller.java => ReplicateTripServiceController.java} (94%) create mode 100644 observe-check-api-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi/MissingClassException.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/ObserveServicesProvider.java copy observe-services-api/src/main/java/fr/ird/observe/services/service/{SqlScriptProducerRequest.java => AddSqlScriptProducerRequest.java} (80%) rename observe-services-api/src/main/java/fr/ird/observe/services/service/{SqlScriptProducerRequest.java => DeleteSqlScriptProducerRequest.java} (60%) create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/datasynchro/DataSynchronizeCopyTask.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/datasynchro/DataSynchronizeDeleteTask.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/datasynchro/DataSynchronizeRequest.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/datasynchro/DataSynchronizeService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/datasynchro/DataSyncrhonizeTaskSupport.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorInitializationException.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/datasynchro/DataSynchronizeServiceTopia.java rename observe-services-topia/src/test/java/fr/ird/observe/services/service/{SqlScriptProducerServiceTopiaTest.java => AddSqlScriptProducerServiceTopiaTest.java} (70%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.