This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git 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 .../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 + .../src/main/resources/icons/action-copyToLeft.png | Bin 0 -> 345 bytes .../main/resources/icons/action-copyToRight.png | Bin 0 -> 349 bytes .../main/resources/icons/action-deleteFromLeft.png | Bin 0 -> 783 bytes .../resources/icons/action-deleteFromRight.png | Bin 0 -> 783 bytes ...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(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.