branch feature/8383_importer_une_sauvegarde_apres_fermeture_connexion updated (220908b -> 4a9fc8d)
This is an automated email from the git hooks/post-receive script. New change to branch feature/8383_importer_une_sauvegarde_apres_fermeture_connexion in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git omits 220908b Check if the datasource is opened and try to open it if not adds 47102cb Set data provider to cell renderer when present adds 0ba9286 fix NPE if no trip found for a program adds e3b7181 UI for data synchronize action adds 2194ff2 more decoration methods adds 6012e89 Continue ui for data synchronize action adds d5fb3d4 debut de gestion de la prise en compte des marées présentes des deux cotés lors d'une recopie adds c1cee17 Début d'implantation de la logique de synchronisation de données adds f68a088 Meilleure utilisation des déclarations de service adds 3dc6ce0 Make delete actions works adds 7b3d335 Introduce delete request in SqlScriptProducerService adds 325892a Add more logs adds a747c82 use now delete from sql producer instead of hibernate delete adds 1b76319 Rename test adds d7ad52e Ajout de plus de messages de préparation des tâches à executer adds fb3465f Check if classes are implemented adds cb053ba Fix bad class name adds d281360 Fix layout + add action icons adds 2709614 introduce services provider contract adds 16d28d4 Improve exception handler adds f54a610 make the test works again adds d1a1527 add rest service adds 06024e3 Sanitize the application context, introduce DataSourcesManager, clean code a lot adds ce3b308 Improve tasks renderer adds 0aa66ab Fixes #4304 \o/ Merge branch 'feature/4304_synchro_marees' into develop adds 05db94f Corrige la perte de valeur de la raison du rejet lorsque l'on change de ligne adds 9bdd2db Merge branch 'feature/7605_raison_rejet_perdue' into 'develop' adds 5a6c6c7 Restaure le control d'activation sur l'ocean d'une marée adds b36a7ca Merge branch 'feature/7588_maree_ocean_modifiable_avec_sous_item' into 'develop' adds 2d2c96a Fix trips lists title, restring program name as a title adds 972a2e2 Refactor program title recovery from decorator adds 04ea0f4 Merge branch 'feature/7588_nom_programme_absent_barre_de_titre' into 'develop' adds 9a4f6bf -mAdd new icons adds a8cb47d Review package for all synchros + continue referential synchro dev adds a16a05b Reorganize i18n in swing module adds 6149dee Remove unused class adds 6889515 Renommage tasks adds 8b32632 Invert! adds ba6a9e2 Amélioration api node adds e0e5402 amélioration renderer adds f4cf9c0 Do not use the sunchronize mode to build referential diffs adds c1d88ba Simplify noe api adds 96e26b3 La partie graphique est ok adds 372f8d2 change log level adds d3e1ce2 alignement du service pour les taches sql à generer adds aa9a8e2 Pouvoir récupérer une liste d'entities à partir de leur ids + pouvoir executer plusieurs scripts dans une même transaction adds 628cccd Utilisation d'un paquetage commun pour la génération des requetes sql dans les deux synchro référentiel adds 614afe8 pass on topai to fix a bug adds 8a8733c Ajout du moteur de synchro bi-di adds d4df0a0 Intégration dans les ui de la synchro bidi + un peu de nettoyage par ci par là adds 7fb6df8 Ajout d'un FIXME à corriger plus tard... adds ee9ee02 Bien enlever la référence à remplacer de la liste des choix possibles adds abc8562 ajout méthode utile adds ce1a11c Ajout méthode pour récupérer l'enveloppe des référentiels adds 3851e9a On conserve les ids existant uniquement de chaque côté pour réaliser des insert en cascade si nécessaire adds b592cc9 clean code adds 33d1b63 Fixes #4309 \o/ Merge branch 'feature/4309_synchro_referential' into develop adds c7fa9b5 fix build adds 0df3a9d Fix activities move (from one road to another) action adds abf437d Fix comment bad reference adds 51c5a02 Fix loop and rename cleanAndPopulateMethod to clearAndPopulate adds c1c9a90 Fix routes move action adds 7e5d226 Update NodeChangeActionListener to take into account the fact that closing an entity will close its children adds 477f8f0 Fix activity lonline trip move action adds 95b29bc Fix trip/route/activity transfer via context menu : move the entity from a node to another closing it (except if it's a trip) at the same time adds c12c107 Fix move multiple entities from a parent node to another : an open entity has to be closed adds 4154470 Fix specific trip move from a program to another (need to close previous program and open the targeted one) adds 6190c6a Refactor ChangeTripProgramActionListener a bit adds eb7dc36 Enable entity move from a parent to another whatever the state of taht entity (open/closed) adds b8ba109 Fix go to open activity buttons label and visibility adds b2a1f4c Fix path expansion when moving an entity from a parent to another adds 9e9a45b Fix merge adds b3a9590 Merge branch 'feature/7591_Correction_migration_entites_d_un_parent_a_un_autre' into develop adds aaff8fd fix i18n new 26a5ee2 Check if the datasource is opened and try to open it if not new 4a9fc8d fix merge 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 (220908b) \ N -- N -- N refs/heads/feature/8383_importer_une_sauvegarde_apres_fermeture_connexion (4a9fc8d) 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 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 4a9fc8dd7d64ab6c423db096305fb6a200dac1d3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 16 18:15:25 2016 +0200 fix merge commit 26a5ee2483d7c0252c75b7ddb5fdbe55c64f69cb Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Fri Aug 5 12:27:41 2016 +0200 Check if the datasource is opened and try to open it if not refs #8383 Summary of changes: .../swing/decoration/DecoratorService.java | 10 + .../decoration/decorators/ObserveDecorator.java | 8 +- .../src/main/filters/observe-ui.properties | 19 + .../java/fr/ird/observe/ObserveActionExecutor.java | 20 +- .../main/java/fr/ird/observe/ObserveCLAction.java | 23 +- .../fr/ird/observe/ObserveOpenDataManager.java | 83 + .../main/java/fr/ird/observe/ObserveRunner.java | 91 +- .../observe/ObserveSwingApplicationContext.java | 999 +++---- .../ObserveSwingApplicationDataSourcesManager.java | 108 + .../fr/ird/observe/db/ObserveSwingDataSource.java | 292 ++- .../observe/entities/tripMap/TripMapPointType.java | 30 +- .../main/java/fr/ird/observe/ui/ObserveMainUI.jaxx | 19 +- .../main/java/fr/ird/observe/ui/ObserveMainUI.jcss | 28 +- .../fr/ird/observe/ui/ObserveMainUIHandler.java | 66 +- .../java/fr/ird/observe/ui/ObserveUICallback.java | 7 +- .../src/main/java/fr/ird/observe/ui/UIHelper.java | 32 +- .../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 | 12 +- .../ui/actions/shared/CloseOpenUIAction.java | 8 +- .../shared/MoveActivityLonglinesUIAction.java | 59 +- .../actions/shared/MoveActivitySeinesUIAction.java | 58 +- .../ui/actions/shared/MoveRoutesUIAction.java | 68 +- .../actions/shared/MoveTripLonglinesUIAction.java | 2 +- .../ui/actions/shared/MoveTripSeinesUIAction.java | 2 +- .../ui/actions/shared/MoveTripsUIAction.java | 4 +- .../observe/ui/actions/shared/ReOpenUIAction.java | 6 +- .../ui/actions/shared/ResetEditUIAction.java | 4 +- .../ui/actions/shared/SelectOpenNodeUIAction.java | 2 +- .../java/fr/ird/observe/ui/admin/AdminStep.java | 126 +- .../java/fr/ird/observe/ui/admin/AdminTabUI.jaxx | 21 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 95 +- .../main/java/fr/ird/observe/ui/admin/AdminUI.jcss | 2 +- .../fr/ird/observe/ui/admin/AdminUIHandler.java | 37 + .../fr/ird/observe/ui/admin/AdminUILauncher.java | 7 +- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 445 +++- .../fr/ird/observe/ui/admin/config/ConfigUI.jaxx | 12 + .../fr/ird/observe/ui/admin/config/ConfigUI.jcss | 37 +- .../observe/ui/admin/config/ConfigUIHandler.java | 22 +- .../ui/admin/consolidate/ConsolidateUIHandler.java | 14 +- .../observe/ui/admin/export/ExportUIHandler.java | 44 +- .../observe/ui/admin/report/ReportConfigUI.jcss | 6 +- .../fr/ird/observe/ui/admin/report/ReportUI.jcss | 14 +- .../observe/ui/admin/report/ReportUIHandler.java | 19 +- .../ird/observe/ui/admin/resume/ShowResumeUI.jaxx | 3 +- .../ui/admin/resume/ShowResumeUIHandler.java | 3 + .../observe/ui/admin/save/SaveLocalUIHandler.java | 26 +- .../admin/synchronize/data/DataSynchroModel.java | 119 + .../ui/admin/synchronize/data/DataSynchroUI.jaxx | 129 + .../ui/admin/synchronize/data/DataSynchroUI.jcss | 110 + .../synchronize/data/DataSynchroUIHandler.java | 295 +++ .../data/DataSynchronizeTaskListCellRenderer.java | 29 + .../data/task/CopyToLeftDataSynchronizeTask.java | 33 + .../data/task/CopyToRightDataSynchronizeTask.java | 33 + .../data/task/DataSynchronizeTaskSupport.java | 56 + .../task/DeleteFromLeftDataSynchronizeTask.java | 25 + .../task/DeleteFromRightDataSynchronizeTask.java | 25 + .../legacy}/ObsoleteReferentialReference.java | 2 +- ...soleteReferentialReferenceListCellRenderer.java | 2 +- .../{ => referential/legacy}/SynchronizeModel.java | 37 +- .../{ => referential/legacy}/SynchronizeUI.jaxx | 4 +- .../{ => referential/legacy}/SynchronizeUI.jcss | 2 +- .../legacy}/SynchronizeUIHandler.java | 34 +- .../referential/ng/ReferentialReplaceUI.jaxx | 29 + .../referential/ng/ReferentialReplaceUI.jcss | 9 + .../ng/ReferentialReplaceUIHandler.java | 40 + .../referential/ng/ReferentialSynchroConfigUI.jaxx | 80 + .../referential/ng/ReferentialSynchroConfigUI.jcss | 54 + .../referential/ng/ReferentialSynchroModel.java | 319 +++ .../referential/ng/ReferentialSynchroUI.jaxx | 134 + .../referential/ng/ReferentialSynchroUI.jcss | 135 + .../ng/ReferentialSynchroUIHandler.java | 157 ++ .../ng/ReferentialSynchronizeResources.java | 161 ++ ...ReferentialSynchronizeTaskListCellRenderer.java | 29 + .../ng/ReferentialSynchronizeTaskListModel.java | 52 + .../referential/ng/action/ApplyAction.java | 86 + .../ng/action/RegisterAddTaskAction.java | 42 + .../ng/action/RegisterCopyTaskAction.java | 41 + .../ng/action/RegisterDeleteTaskAction.java | 34 + .../ng/action/RegisterDesactivateTaskAction.java | 34 + .../ng/action/RegisterRevertTaskAction.java | 27 + .../ng/action/RegisterSkipTaskAction.java | 27 + .../ng/action/RegisterTasksActionSupport.java | 190 ++ .../ng/action/RegisterUpdateTaskAction.java | 43 + .../ng/task/AddReferentialSynchronizeTask.java | 19 + .../ng/task/DeleteReferentialSynchronizeTask.java | 19 + .../DesactivateReferentialSynchronizeTask.java | 40 + .../ng/task/ReferentialSynchronizeTaskSupport.java | 79 + ...ferentialSynchronizeTaskWithReplaceSupport.java | 39 + .../ng/task/RevertReferentialSynchronizeTask.java | 19 + .../ng/task/SkipReferentialSynchronizeTask.java | 24 + .../ng/task/UpdateReferentialSynchronizeTask.java | 19 + .../ReferentialSynchronizeTreeCellRenderer.java | 122 + .../ng/tree/ReferentialSynchronizeTreeModel.java | 393 +++ .../ReferentialSynchronizeTreeModelsBuilder.java | 171 ++ .../node/AddedReferenceReferentialSynchroNode.java | 20 + .../ReferenceReferentialSynchroNodeSupport.java | 61 + .../tree/node/ReferentialSynchroNodeSupport.java | 38 + .../ng/tree/node/RootReferentialSynchroNode.java | 55 + .../ng/tree/node/TypeReferentialSynchroNode.java | 42 + .../UpdatedReferenceReferentialSynchroNode.java | 19 + .../ui/admin/validate/ValidateConfigUI.jaxx | 5 - .../ui/admin/validate/ValidateConfigUI.jcss | 16 +- .../ird/observe/ui/admin/validate/ValidateUI.jcss | 6 +- .../ui/admin/validate/ValidateUIHandler.java | 44 +- .../java/fr/ird/observe/ui/content/ContentUI.jaxx | 16 +- .../ird/observe/ui/content/ContentUIHandler.java | 2 +- .../ird/observe/ui/content/ContentUIManager.java | 77 +- .../ui/content/impl/longline/BranchlineUI.jaxx | 2 +- .../ui/content/impl/longline/BranchlineUI.jcss | 80 +- .../content/impl/longline/BranchlineUIHandler.java | 4 +- .../impl/longline/LonglineDetailCompositionUI.jaxx | 4 +- .../impl/longline/LonglineDetailCompositionUI.jcss | 62 +- .../LonglineDetailCompositionUIHandler.java | 30 +- .../LonglineDetailCompositionUIInitializer.java | 52 +- ...onglineDetailCompositionUIValidationHelper.java | 233 -- ...LonglineDetailCompositionValidationContext.java | 116 + .../LonglineDetailCompositionValidatorService.java | 155 ++ .../impl/longline/LonglineGlobalCompositionUI.jaxx | 10 +- .../impl/longline/LonglineGlobalCompositionUI.jcss | 16 +- .../LonglineGlobalCompositionUIHandler.java | 7 +- .../ui/content/impl/longline/SetLonglineUI.jaxx | 2 +- .../ui/content/impl/longline/SetLonglineUI.jcss | 130 +- .../impl/longline/SetLonglineUIHandler.java | 8 +- .../impl/seine/ActivitySeineObservedSystemUI.jaxx | 2 +- .../impl/seine/ActivitySeineObservedSystemUI.jcss | 4 +- .../ActivitySeineObservedSystemUIHandler.java | 6 +- .../FloatingObjectTransmittingBuoyOperationUI.jaxx | 2 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 4 +- .../ui/content/impl/seine/FloatingObjectUI.jaxx | 2 +- .../ui/content/impl/seine/FloatingObjectUI.jcss | 2 +- .../impl/seine/FloatingObjectUIHandler.java | 8 +- .../observe/ui/content/impl/seine/SetSeineUI.jaxx | 2 +- .../observe/ui/content/impl/seine/SetSeineUI.jcss | 74 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 12 +- .../ird/observe/ui/content/list/ContentListUI.jcss | 2 +- .../ui/content/list/ContentListUIHandler.java | 15 + .../list/impl/longline/ActivityLonglinesUI.jaxx | 2 +- .../list/impl/longline/ActivityLonglinesUI.jcss | 20 +- .../impl/longline/ActivityLonglinesUIHandler.java | 12 +- .../content/list/impl/longline/CommonListUI.jcss | 18 +- .../list/impl/longline/TripLonglinesUI.jcss | 16 +- .../list/impl/longline/TripLonglinesUIHandler.java | 13 +- .../content/list/impl/seine/ActivitySeinesUI.jaxx | 2 +- .../content/list/impl/seine/ActivitySeinesUI.jcss | 20 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 12 +- .../ui/content/list/impl/seine/CommonListUI.jcss | 26 +- .../ui/content/list/impl/seine/RoutesUI.jaxx | 2 +- .../ui/content/list/impl/seine/RoutesUI.jcss | 16 +- .../content/list/impl/seine/RoutesUIHandler.java | 12 +- .../ui/content/list/impl/seine/TripSeinesUI.jcss | 16 +- .../list/impl/seine/TripSeinesUIHandler.java | 13 +- .../open/impl/longline/ActivityLonglineUI.jaxx | 2 +- .../open/impl/longline/ActivityLonglineUI.jcss | 14 +- .../impl/longline/ActivityLonglineUIHandler.java | 10 +- .../content/open/impl/longline/TripLonglineUI.jaxx | 5 +- .../content/open/impl/longline/TripLonglineUI.jcss | 34 +- .../open/impl/longline/TripLonglineUIHandler.java | 10 +- .../content/open/impl/seine/ActivitySeineUI.jaxx | 2 +- .../content/open/impl/seine/ActivitySeineUI.jcss | 14 +- .../open/impl/seine/ActivitySeineUIHandler.java | 12 +- .../ui/content/open/impl/seine/RouteUI.jaxx | 2 +- .../ui/content/open/impl/seine/RouteUI.jcss | 6 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 12 +- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 5 +- .../ui/content/open/impl/seine/TripSeineUI.jcss | 23 +- .../open/impl/seine/TripSeineUIHandler.java | 10 +- .../observe/ui/content/ref/ContentReferenceUI.jaxx | 1 + .../observe/ui/content/ref/ContentReferenceUI.jcss | 1 + .../ui/content/ref/ContentReferenceUIHandler.java | 27 +- .../ird/observe/ui/content/ref/impl/CountryUI.jaxx | 14 +- .../ird/observe/ui/content/ref/impl/FpaZoneUI.jaxx | 14 +- .../content/ref/impl/GearCaracteristicTypeUI.jaxx | 14 +- .../ui/content/ref/impl/GearCaracteristicUI.jaxx | 14 +- .../ui/content/ref/impl/GearCaracteristicUI.jcss | 4 +- .../fr/ird/observe/ui/content/ref/impl/GearUI.jaxx | 14 +- .../fr/ird/observe/ui/content/ref/impl/GearUI.jcss | 10 +- .../ird/observe/ui/content/ref/impl/HarbourUI.jaxx | 14 +- .../ird/observe/ui/content/ref/impl/HarbourUI.jcss | 6 +- .../content/ref/impl/LengthWeightParameterUI.jaxx | 14 +- .../content/ref/impl/LengthWeightParameterUI.jcss | 10 +- .../ird/observe/ui/content/ref/impl/OceanUI.jaxx | 14 +- .../observe/ui/content/ref/impl/OrganismUI.jaxx | 14 +- .../ird/observe/ui/content/ref/impl/PersonUI.jaxx | 14 +- .../ird/observe/ui/content/ref/impl/PersonUI.jcss | 2 +- .../ird/observe/ui/content/ref/impl/ProgramUI.jaxx | 14 +- .../ird/observe/ui/content/ref/impl/ProgramUI.jcss | 4 +- .../fr/ird/observe/ui/content/ref/impl/SexUI.jaxx | 14 +- .../ui/content/ref/impl/SpeciesGroupUI.jaxx | 14 +- .../observe/ui/content/ref/impl/SpeciesListUI.jaxx | 14 +- .../observe/ui/content/ref/impl/SpeciesListUI.jcss | 8 +- .../ird/observe/ui/content/ref/impl/SpeciesUI.jaxx | 14 +- .../ird/observe/ui/content/ref/impl/SpeciesUI.jcss | 8 +- .../ui/content/ref/impl/VesselSizeCategoryUI.jaxx | 14 +- .../observe/ui/content/ref/impl/VesselTypeUI.jaxx | 14 +- .../ird/observe/ui/content/ref/impl/VesselUI.jaxx | 14 +- .../ird/observe/ui/content/ref/impl/VesselUI.jcss | 4 +- .../ref/impl/longline/BaitHaulingStatusUI.jaxx | 14 +- .../ref/impl/longline/BaitSettingStatusUI.jaxx | 14 +- .../ui/content/ref/impl/longline/BaitTypeUI.jaxx | 14 +- .../ref/impl/longline/CatchFateLonglineUI.jaxx | 14 +- .../content/ref/impl/longline/EncounterTypeUI.jaxx | 14 +- .../ui/content/ref/impl/longline/HealthnessUI.jaxx | 14 +- .../content/ref/impl/longline/HookPositionUI.jaxx | 14 +- .../ui/content/ref/impl/longline/HookSizeUI.jaxx | 14 +- .../ui/content/ref/impl/longline/HookTypeUI.jaxx | 14 +- .../impl/longline/ItemHorizontalPositionUI.jaxx | 14 +- .../ref/impl/longline/ItemVerticalPositionUI.jaxx | 14 +- .../ref/impl/longline/LightsticksColorUI.jaxx | 14 +- .../ref/impl/longline/LightsticksTypeUI.jaxx | 14 +- .../ui/content/ref/impl/longline/LineTypeUI.jaxx | 14 +- .../ref/impl/longline/MaturityStatusUI.jaxx | 14 +- .../ref/impl/longline/MitigationTypeUI.jaxx | 14 +- .../content/ref/impl/longline/SensorBrandUI.jaxx | 14 +- .../ref/impl/longline/SensorDataFormatUI.jaxx | 14 +- .../ui/content/ref/impl/longline/SensorTypeUI.jaxx | 14 +- .../content/ref/impl/longline/SettingShapeUI.jaxx | 14 +- .../ref/impl/longline/SizeMeasureTypeUI.jaxx | 14 +- .../ref/impl/longline/StomacFullnessUI.jaxx | 14 +- .../ui/content/ref/impl/longline/TripTypeUI.jaxx | 14 +- .../impl/longline/VesselActivityLonglineUI.jaxx | 14 +- .../ref/impl/longline/WeightMeasureTypeUI.jaxx | 14 +- .../ui/content/ref/impl/seine/DetectionModeUI.jaxx | 14 +- .../ui/content/ref/impl/seine/ObjectFateUI.jaxx | 14 +- .../content/ref/impl/seine/ObjectOperationUI.jaxx | 14 +- .../ui/content/ref/impl/seine/ObjectTypeUI.jaxx | 14 +- .../content/ref/impl/seine/ObservedSystemUI.jaxx | 14 +- .../content/ref/impl/seine/ReasonForDiscardUI.jaxx | 14 +- .../ref/impl/seine/ReasonForNoFishingUI.jaxx | 14 +- .../content/ref/impl/seine/ReasonForNullSetUI.jaxx | 14 +- .../ui/content/ref/impl/seine/SpeciesFateUI.jaxx | 14 +- .../ui/content/ref/impl/seine/SpeciesStatusUI.jaxx | 14 +- .../ref/impl/seine/SurroundingActivityUI.jaxx | 14 +- .../impl/seine/TransmittingBuoyOperationUI.jaxx | 14 +- .../ref/impl/seine/TransmittingBuoyTypeUI.jaxx | 14 +- .../ref/impl/seine/VesselActivitySeineUI.jaxx | 14 +- .../content/ref/impl/seine/WeightCategoryUI.jaxx | 14 +- .../observe/ui/content/ref/impl/seine/WindUI.jaxx | 14 +- .../observe/ui/content/table/ContentTableUI.jaxx | 10 +- .../ui/content/table/ContentTableUIHandler.java | 8 +- .../table/impl/longline/BaitsCompositionUI.jaxx | 6 +- .../table/impl/longline/BaitsCompositionUI.jcss | 24 +- .../impl/longline/BaitsCompositionUIHandler.java | 20 +- .../impl/longline/BranchlinesCompositionUI.jaxx | 6 +- .../impl/longline/BranchlinesCompositionUI.jcss | 20 +- .../longline/BranchlinesCompositionUIHandler.java | 16 +- .../table/impl/longline/CatchLonglineUI.jaxx | 10 +- .../table/impl/longline/CatchLonglineUI.jcss | 144 +- .../impl/longline/CatchLonglineUIHandler.java | 76 +- .../content/table/impl/longline/EncounterUI.jaxx | 6 +- .../content/table/impl/longline/EncounterUI.jcss | 8 +- .../table/impl/longline/EncounterUIHandler.java | 20 +- .../impl/longline/FloatlinesCompositionUI.jaxx | 6 +- .../impl/longline/FloatlinesCompositionUI.jcss | 16 +- .../longline/FloatlinesCompositionUIHandler.java | 12 +- .../impl/longline/GearUseFeaturesLonglineUI.jaxx | 6 +- .../impl/longline/GearUseFeaturesLonglineUI.jcss | 20 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 36 +- .../table/impl/longline/HooksCompositionUI.jaxx | 6 +- .../table/impl/longline/HooksCompositionUI.jcss | 20 +- .../impl/longline/HooksCompositionUIHandler.java | 16 +- .../content/table/impl/longline/SensorUsedUI.jaxx | 6 +- .../content/table/impl/longline/SensorUsedUI.jcss | 38 +- .../table/impl/longline/SensorUsedUIHandler.java | 36 +- .../ui/content/table/impl/longline/TdrUI.jaxx | 6 +- .../ui/content/table/impl/longline/TdrUI.jcss | 128 +- .../content/table/impl/longline/TdrUIHandler.java | 30 +- .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 6 +- .../table/impl/seine/GearUseFeaturesSeineUI.jcss | 20 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 36 +- .../content/table/impl/seine/NonTargetCatchUI.jaxx | 4 +- .../content/table/impl/seine/NonTargetCatchUI.jcss | 2 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 38 +- .../table/impl/seine/NonTargetSampleUI.jaxx | 4 +- .../table/impl/seine/NonTargetSampleUI.jcss | 2 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 28 +- .../table/impl/seine/ObjectObservedSpeciesUI.jaxx | 4 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 16 +- .../table/impl/seine/ObjectSchoolEstimateUI.jaxx | 4 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 12 +- .../content/table/impl/seine/SchoolEstimateUI.jaxx | 4 +- .../content/table/impl/seine/SchoolEstimateUI.jcss | 2 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 16 +- .../ui/content/table/impl/seine/TargetCatchUI.jaxx | 4 +- .../ui/content/table/impl/seine/TargetCatchUI.jcss | 12 +- .../table/impl/seine/TargetCatchUIHandler.java | 26 +- .../table/impl/seine/TargetDiscardCatchUI.jaxx | 4 +- .../table/impl/seine/TargetDiscardCatchUI.jcss | 12 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 30 +- .../table/impl/seine/TargetSampleCaptureUI.jaxx | 4 +- .../table/impl/seine/TargetSampleRejeteUI.jaxx | 4 +- .../table/impl/seine/TargetSampleUIHandler.java | 30 +- .../ird/observe/ui/storage/ObstunaAdminAction.java | 16 +- .../ui/storage/StorageBackupUILauncher.java | 4 +- .../java/fr/ird/observe/ui/storage/StorageUI.jcss | 8 +- .../ird/observe/ui/storage/StorageUIHandler.java | 86 +- .../ird/observe/ui/storage/StorageUILauncher.java | 11 +- .../fr/ird/observe/ui/storage/StorageUIModel.java | 95 +- .../observe/ui/storage/tabs/ChooseDbModeUI.jaxx | 13 +- .../ird/observe/ui/storage/tabs/ConfigDataUI.jcss | 20 +- .../ui/storage/tabs/ConfigReferentielUI.jcss | 14 +- .../ui/storage/tabs/DataSelectionModel.java | 47 +- .../ui/storage/tabs/StorageTabUIHandler.java | 9 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 2 +- .../ird/observe/ui/tree/ActivityLonglineNode.java | 2 +- .../fr/ird/observe/ui/tree/ActivitySeineNode.java | 2 +- .../ui/tree/DataSelectionTreeCellRenderer.java | 19 +- .../ui/tree/DataSelectionTreeSelectionModel.java | 2 +- .../observe/ui/tree/FloatingObjectSeineNode.java | 2 +- .../ui/tree/NavigationTreeSelectionModel.java | 2 +- .../tree/ObserveNavigationTreeShowPopupAction.java | 51 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 117 +- .../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 | 39 +- .../actions/ChangeActivityTripActionListener.java | 36 +- .../actions/ChangeRouteTripActionListener.java | 39 +- .../actions/ChangeTripProgramActionListener.java | 34 +- .../ui/tree/actions/NodeChangeActionListener.java | 15 +- .../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 +- .../fr/ird/observe/ui/usage/UsagesUIHandler.java | 4 +- .../observe/ui/util/tripMap/ObserveMapPane.java | 10 +- .../ui/util/tripMap/TripMapContentBuilder.java | 8 +- .../fr/ird/observe/ui/util/tripMap/TripMapUI.jcss | 10 +- .../observe/ui/util/tripMap/TripMapUIHandler.java | 12 +- .../observe/validation/ObserveSwingValidator.java | 42 +- .../ird/observe/validation/ValidationContext.java | 40 +- .../observe/validation/ValidationModelMode.java | 12 +- .../observe-application-swing_en_GB.properties | 2743 ++++++++++---------- .../observe-application-swing_es_ES.properties | 2743 ++++++++++---------- .../observe-application-swing_fr_FR.properties | 2743 ++++++++++---------- .../src/main/resources/icons/action-copyToBoth.png | Bin 0 -> 685 bytes .../{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 ...onnected.png => action-desactivateFromLeft.png} | Bin ...nnected.png => action-desactivateFromRight.png} | Bin ...g => action-desactivateWithReplaceFromLeft.png} | Bin ... => action-desactivateWithReplaceFromRight.png} | Bin ...remote-import.png => action-revertFromLeft.png} | Bin ...emote-import.png => action-revertFromRight.png} | Bin .../main/resources/icons/action-skipFromLeft.png | Bin 0 -> 655 bytes .../main/resources/icons/action-skipFromRight.png | Bin 0 -> 655 bytes .../src/main/resources/icons/action-synchroAdd.png | Bin 0 -> 658 bytes ...action-db-none.png => action-synchroDelete.png} | Bin ...-remote-import.png => action-synchroRevert.png} | Bin .../main/resources/icons/action-synchroUpdate.png | Bin 0 -> 767 bytes ...glineDetailCompositionValidatorServiceTest.java | 107 +- .../controller/v1/DataSourceServiceController.java | 6 + .../v1/SqlScriptProducerServiceController.java | 11 +- ...er.java => ReplicateTripServiceController.java} | 4 +- .../data/DataSynchronizeServiceController.java | 32 + ...eferentialSynchronizeDiffServiceController.java | 34 + ...ferentialSynchronizeLocalServiceController.java | 8 +- ...erentialSynchronizeRemoteServiceController.java | 8 +- .../ReferentialSynchronizeServiceController.java | 28 + .../injector/SqlScriptProducerRequestInjector.java | 12 +- .../maven/plugins/checkapi/CheckApiMojo.java | 29 +- .../plugins/checkapi/MissingClassException.java | 21 + .../main/java/fr/ird/type/CoordinateHelper.java | 55 - .../observe/ObserveTopiaPersistenceContext.java | 5 + .../java/fr/ird/observe/RunScriptTopiaSqlWork.java | 81 +- .../fr/ird/observe/RunScriptsTopiaSqlWork.java | 44 +- .../observe/services/ObserveServicesProvider.java | 130 + ...quest.java => AddSqlScriptProducerRequest.java} | 20 +- .../services/service/DataSourceService.java | 3 + ...st.java => DeleteSqlScriptProducerRequest.java} | 50 +- .../services/service/SqlScriptProducerService.java | 4 +- .../synchro/data/DataSynchronizeRequest.java | 103 + .../synchro/data/DataSynchronizeService.java | 52 + .../synchro/data/task/DataSynchronizeCopyTask.java | 14 + .../data/task/DataSynchronizeDeleteTask.java | 14 + .../data/task/DataSynchronizeTaskSupport.java | 44 + .../referential/ReferentialSynchronizeMode.java | 69 + .../diff/ReferentialDataSourceState.java | 65 + .../diff/ReferentialDataSourceStates.java | 47 + .../diff/ReferentialSynchronizeDiff.java | 99 + .../diff/ReferentialSynchronizeDiffService.java | 30 + .../diff/ReferentialSynchronizeDiffState.java | 67 + .../diff/ReferentialSynchronizeDiffStateType.java | 15 + .../diff/ReferentialSynchronizeDiffs.java | 104 + .../diff/ReferentialSynchronizeDiffsEngine.java | 110 + .../legacy}/LocalReferentialStates.java | 2 +- .../legacy}/RemoteReferentialDiff.java | 2 +- ...ionalReferentialSynchronizeCallbackRequest.java | 2 +- ...onalReferentialSynchronizeCallbackRequests.java | 2 +- ...tionalReferentialSynchronizeCallbackResult.java | 2 +- ...ionalReferentialSynchronizeCallbackResults.java | 2 +- ...nidirectionalReferentialSynchronizeContext.java | 2 +- ...UnidirectionalReferentialSynchronizeEngine.java | 2 +- ...ectionalReferentialSynchronizeLocalService.java | 2 +- ...ctionalReferentialSynchronizeRemoteService.java | 2 +- ...nidirectionalReferentialSynchronizeRequest.java | 2 +- ...UnidirectionalReferentialSynchronizeResult.java | 2 +- .../ng/ReferentialSynchronizeRequest.java | 115 + .../ng/ReferentialSynchronizeService.java | 29 + .../ng/ReferentialSynchronizeServiceEngine.java | 36 + ...entialSynchronizeServiceProduceSqlsRequest.java | 96 + ...rentialSynchronizeServiceProduceSqlsResult.java | 26 + .../ng/ReferentialSynchronizeSqlsRequest.java | 101 + .../ng/task/ReferentialSynchronizeTask.java | 37 + .../ng/task/ReferentialSynchronizeTaskType.java | 26 + .../actions/validate/ValidateServiceUtils.java | 10 +- .../validate/ValidatorInitializationException.java | 14 + .../i18n/observe-services-api_en_GB.properties | 6 + .../i18n/observe-services-api_es_ES.properties | 6 + .../i18n/observe-services-api_fr_FR.properties | 6 + .../services/dto/seine/TargetCatchDtos.java | 20 + .../ird/observe/services/ObserveServiceTopia.java | 16 + .../services/service/DataSourceServiceTopia.java | 141 +- .../service/SqlScriptProducerServiceTopia.java | 84 +- .../actions/export/ReplicateTripServiceTopia.java | 6 +- .../synchro/data/DataSynchronizeServiceTopia.java | 114 + .../ReferentialSynchronizeDiffServiceTopia.java | 136 + ...nalReferentialSynchronizeLocalServiceTopia.java | 41 +- ...alReferentialSynchronizeRemoteServiceTopia.java | 2 +- .../ng/ReferentialSynchronizeServiceTopia.java | 64 + .../ReferentialSynchronizeSqlsRequestBuilder.java | 295 +++ .../referential/sql/ApplySqlRequestWork.java | 44 + .../sql}/DeleteSqlStatementGenerator.java | 5 +- .../sql/DesactivateSqlStatementGenerator.java} | 29 +- .../sql}/InsertSqlStatementGenerator.java | 52 +- .../InsertSqlWithCascadeStatementGenerator.java | 105 + .../sql}/ReplaceSqlStatementGenerator.java | 5 +- .../sql}/UpdateSqlStatementGenerator.java | 47 +- .../UpdateSqlWithCascadeStatementGenerator.java | 103 + ...a => AddSqlScriptProducerServiceTopiaTest.java} | 22 +- .../services/service/MigrateTestsDatabases.java | 24 +- .../UnidirectionalSynchronizeReferentialTest.java | 6 + .../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 + pom.xml | 2 +- 459 files changed, 15031 insertions(+), 7961 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/synchronize/data/DataSynchroModel.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/data/DataSynchroUI.jaxx create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/data/DataSynchroUI.jcss create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/data/DataSynchroUIHandler.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/data/DataSynchronizeTaskListCellRenderer.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/data/task/CopyToLeftDataSynchronizeTask.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/data/task/CopyToRightDataSynchronizeTask.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/data/task/DataSynchronizeTaskSupport.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/data/task/DeleteFromLeftDataSynchronizeTask.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/data/task/DeleteFromRightDataSynchronizeTask.java rename observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/{ => referential/legacy}/ObsoleteReferentialReference.java (97%) rename observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/{ => referential/legacy}/ObsoleteReferentialReferenceListCellRenderer.java (97%) rename observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/{ => referential/legacy}/SynchronizeModel.java (89%) rename observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/{ => referential/legacy}/SynchronizeUI.jaxx (94%) rename observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/{ => referential/legacy}/SynchronizeUI.jcss (93%) rename observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/{ => referential/legacy}/SynchronizeUIHandler.java (86%) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialReplaceUI.jaxx create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialReplaceUI.jcss create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialReplaceUIHandler.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jcss create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jaxx create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jcss create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchronizeResources.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchronizeTaskListCellRenderer.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchronizeTaskListModel.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/action/ApplyAction.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/action/RegisterAddTaskAction.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/action/RegisterCopyTaskAction.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/action/RegisterDeleteTaskAction.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/action/RegisterDesactivateTaskAction.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/action/RegisterRevertTaskAction.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/action/RegisterSkipTaskAction.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/action/RegisterTasksActionSupport.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/action/RegisterUpdateTaskAction.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/task/AddReferentialSynchronizeTask.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/task/DeleteReferentialSynchronizeTask.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/task/DesactivateReferentialSynchronizeTask.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskSupport.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskWithReplaceSupport.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/task/RevertReferentialSynchronizeTask.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/task/SkipReferentialSynchronizeTask.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/task/UpdateReferentialSynchronizeTask.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeCellRenderer.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModel.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/tree/node/AddedReferenceReferentialSynchroNode.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/tree/node/ReferenceReferentialSynchroNodeSupport.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/tree/node/ReferentialSynchroNodeSupport.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/tree/node/RootReferentialSynchroNode.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/tree/node/TypeReferentialSynchroNode.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/tree/node/UpdatedReferenceReferentialSynchroNode.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 create mode 100644 observe-application-swing/src/main/resources/icons/action-copyToBoth.png 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%) copy observe-application-swing/src/main/resources/icons/{action-unconnected.png => action-desactivateFromLeft.png} (100%) copy observe-application-swing/src/main/resources/icons/{action-unconnected.png => action-desactivateFromRight.png} (100%) copy observe-application-swing/src/main/resources/icons/{action-unconnected.png => action-desactivateWithReplaceFromLeft.png} (100%) copy observe-application-swing/src/main/resources/icons/{action-unconnected.png => action-desactivateWithReplaceFromRight.png} (100%) copy observe-application-swing/src/main/resources/icons/{action-remote-import.png => action-revertFromLeft.png} (100%) copy observe-application-swing/src/main/resources/icons/{action-remote-import.png => action-revertFromRight.png} (100%) create mode 100644 observe-application-swing/src/main/resources/icons/action-skipFromLeft.png create mode 100644 observe-application-swing/src/main/resources/icons/action-skipFromRight.png create mode 100644 observe-application-swing/src/main/resources/icons/action-synchroAdd.png copy observe-application-swing/src/main/resources/icons/{action-db-none.png => action-synchroDelete.png} (100%) copy observe-application-swing/src/main/resources/icons/{action-remote-import.png => action-synchroRevert.png} (100%) create mode 100644 observe-application-swing/src/main/resources/icons/action-synchroUpdate.png 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-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/data/DataSynchronizeServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceController.java rename observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/{ => referential/legacy}/UnidirectionalReferentialSynchronizeLocalServiceController.java (87%) rename observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/{ => referential/legacy}/UnidirectionalReferentialSynchronizeRemoteServiceController.java (85%) create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/ng/ReferentialSynchronizeServiceController.java create mode 100644 observe-check-api-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi/MissingClassException.java delete mode 100644 observe-entities-migration/src/main/java/fr/ird/type/CoordinateHelper.java copy observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/UnidirectionalReferentialSynchronizeCallbackResult.java => observe-entities/src/main/java/fr/ird/observe/RunScriptsTopiaSqlWork.java (50%) 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/synchro/data/DataSynchronizeRequest.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/data/DataSynchronizeService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/data/task/DataSynchronizeCopyTask.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/data/task/DataSynchronizeDeleteTask.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/data/task/DataSynchronizeTaskSupport.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ReferentialSynchronizeMode.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialDataSourceState.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialDataSourceStates.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiff.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffState.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffStateType.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffs.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffsEngine.java rename observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/{ => referential/legacy}/LocalReferentialStates.java (97%) rename observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/{ => referential/legacy}/RemoteReferentialDiff.java (97%) rename observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/{ => referential/legacy}/UnidirectionalReferentialSynchronizeCallbackRequest.java (96%) rename observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/{ => referential/legacy}/UnidirectionalReferentialSynchronizeCallbackRequests.java (97%) rename observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/{ => referential/legacy}/UnidirectionalReferentialSynchronizeCallbackResult.java (95%) rename observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/{ => referential/legacy}/UnidirectionalReferentialSynchronizeCallbackResults.java (96%) rename observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/{ => referential/legacy}/UnidirectionalReferentialSynchronizeContext.java (96%) rename observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/{ => referential/legacy}/UnidirectionalReferentialSynchronizeEngine.java (99%) rename observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/{ => referential/legacy}/UnidirectionalReferentialSynchronizeLocalService.java (98%) rename observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/{ => referential/legacy}/UnidirectionalReferentialSynchronizeRemoteService.java (96%) rename observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/{ => referential/legacy}/UnidirectionalReferentialSynchronizeRequest.java (98%) rename observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/{ => referential/legacy}/UnidirectionalReferentialSynchronizeResult.java (98%) create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeRequest.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceEngine.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceProduceSqlsRequest.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceProduceSqlsResult.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequest.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/task/ReferentialSynchronizeTask.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/task/ReferentialSynchronizeTaskType.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/synchro/data/DataSynchronizeServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceTopia.java rename observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/{ => referential/legacy}/UnidirectionalReferentialSynchronizeLocalServiceTopia.java (89%) rename observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/{ => referential/legacy}/UnidirectionalReferentialSynchronizeRemoteServiceTopia.java (98%) create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/ApplySqlRequestWork.java copy observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/{ => referential/sql}/DeleteSqlStatementGenerator.java (90%) rename observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/{DeleteSqlStatementGenerator.java => referential/sql/DesactivateSqlStatementGenerator.java} (57%) rename observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/{ => referential/sql}/InsertSqlStatementGenerator.java (85%) create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/InsertSqlWithCascadeStatementGenerator.java rename observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/{ => referential/sql}/ReplaceSqlStatementGenerator.java (96%) rename observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/{ => referential/sql}/UpdateSqlStatementGenerator.java (88%) create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/UpdateSqlWithCascadeStatementGenerator.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>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/8383_importer_une_sauvegarde_apres_fermeture_connexion in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 26a5ee2483d7c0252c75b7ddb5fdbe55c64f69cb Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Fri Aug 5 12:27:41 2016 +0200 Check if the datasource is opened and try to open it if not refs #8383 --- .../ird/observe/ui/storage/StorageUIHandler.java | 55 +++++++++++++--------- 1 file changed, 32 insertions(+), 23 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java index 194711f..b8e8f52 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java @@ -52,6 +52,7 @@ import fr.ird.observe.ui.storage.tabs.DataSelectionModel; import fr.ird.observe.ui.storage.tabs.RolesTableModel; import fr.ird.observe.ui.storage.tabs.SecurityModel; import fr.ird.observe.ui.storage.tabs.StorageTabUI; +import jaxx.runtime.JAXXContext; import jaxx.runtime.context.DefaultApplicationContext.AutoLoad; import jaxx.runtime.swing.wizard.WizardUILancher; import org.apache.commons.io.FileUtils; @@ -103,7 +104,7 @@ public class StorageUIHandler { case USE_LOCAL: configuration = model.toH2StorageConfig(t("observe.storage.label.local")); - dataSource = ObserveSwingApplicationContext.get().getDataSourcesManager().newDataSource(configuration); + dataSource = ObserveSwingApplicationContext.get().newDataSource(configuration); dataSource.addObserveSwingDataSourceListener( new ObserveSwingDataSourceListenerAdapter() { @@ -295,7 +296,7 @@ public class StorageUIHandler { } }; } - ObserveMainUI mainUI = ObserveSwingApplicationContext.get().getMainUI(); + ObserveMainUI mainUI = ObserveSwingApplicationContext.get().getObserveMainUI(); if (mainUI == null) { if (log.isWarnEnabled()) { log.warn("Launch standalone apply action " + action); @@ -305,7 +306,7 @@ public class StorageUIHandler { } else { ObserveActionExecutor executor = ObserveRunner.getActionExecutor(); - executor.addAction(t("observe.storage.action.applyAction"), action); + executor.addAction(t("observe.action.storage.applyAction"), action); } } @@ -360,16 +361,23 @@ public class StorageUIHandler { boolean localDbIsSane = true; if (destroyLocalBase || model.isDoBackup()) { if (localDataSource == null) { - try { - ObserveDataSourceConfigurationTopiaH2 localConfiguration = config.getDataSourceConfigurationH2(t("observe.storage.label.local")); + ObserveDataSourceConfigurationTopiaH2 localConfiguration = config.getDataSourceConfigurationH2(t("observe.storage.label.local")); + + // la base ne doit pas etre mise a jour dans ce cas + localConfiguration.setCanMigrate(false); - // la base ne doit pas etre mise a jour dans ce cas - localConfiguration.setCanMigrate(false); + // on charge un storage sur la base locale + localDataSource = ObserveSwingApplicationContext.get().getDataSourcesManager().newDataSource(localConfiguration); + } - // on charge un storage sur la base locale - localDataSource = ObserveSwingApplicationContext.get().getDataSourcesManager().newDataSource(localConfiguration); + // Let's check if the datasource is opened or not : + // we could have close the datasource through the ui + // If the datasource is closed, we try to open it + if (!localDataSource.isOpen()) { + try { localDataSource.open(); + } catch (Exception e) { // on a pas reussi à ouvrir la base locale // cela ne doit pas empécher de continuer @@ -476,8 +484,8 @@ public class StorageUIHandler { } -// observeContext.getDataSourcesManager().setMainDataSource(currentDataSource); - observeContext.prepareMainStorage(currentDataSource, true); + observeContext.setDataSource(currentDataSource); + observeContext.prepareMainStorage(currentDataSource); if (model.getDbMode() == DbMode.CREATE_LOCAL) { @@ -502,7 +510,7 @@ public class StorageUIHandler { } config.setLocalStorageExist(false); - observeContext.getDataSourcesManager().setMainDataSource(null); + observeContext.setDataSource(null); throw e; @@ -531,7 +539,7 @@ public class StorageUIHandler { " in " + f); } try { - SqlScriptProducerService dumpProducerService = observeContext.getMainDataSourceServicesProvider().newSqlScriptProducerService(); + SqlScriptProducerService dumpProducerService = observeContext.newService(SqlScriptProducerService.class); backupLocalDatabase(dumpProducerService, f); config.setInitialDumpExist(true); } catch (Exception e) { @@ -544,7 +552,7 @@ public class StorageUIHandler { } if (model.isStoreRemoteConfig()) { - storeRemoteConfig(model); + storeRemoteConfig(context, model); } } catch (Exception ex) { @@ -557,10 +565,11 @@ public class StorageUIHandler { * Sauvegarder dans la configuration de l'application le paramétrage de la * source de données distante donnée. * + * @param context le context applicatif * @param model le model de la source de données */ - public void storeRemoteConfig(StorageUIModel model) { - ObserveSwingApplicationConfig config = ObserveSwingApplicationContext.get().getConfig(); + public void storeRemoteConfig(JAXXContext context, StorageUIModel model) { + ObserveSwingApplicationConfig config = context.getContextValue(ObserveSwingApplicationConfig.class); // on sauvegarde dans le parametrage dans la configuration de // l'application @@ -600,8 +609,8 @@ public class StorageUIHandler { log.debug(dst); } - AddSqlScriptProducerRequest request = AddSqlScriptProducerRequest.forH2().addSchema().addReferential().addAllData(); - byte[] dataDump = dumpProducerService.produceAddSqlScript(request); + SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addSchema().addReferential().addAllData(); + byte[] dataDump = dumpProducerService.produceSqlScript(request); try (FileOutputStream outputStream = new FileOutputStream(dst)) { @@ -627,7 +636,7 @@ public class StorageUIHandler { File dst, Set<DataReference> trips) { - SqlScriptProducerService dumpService = dataSource.newSqlScriptProducerService(); + SqlScriptProducerService dumpService = dataSource.newService(SqlScriptProducerService.class); if (trips == null) { @@ -653,8 +662,8 @@ public class StorageUIHandler { ImmutableSet<String> tripIds = ImmutableSet.copyOf(Iterables.transform(trips, DataReference.getIdFunction())); - AddSqlScriptProducerRequest request = AddSqlScriptProducerRequest.forH2().addSchema().addReferential().dataIdsToAdd(tripIds); - byte[] dump = dumpService.produceAddSqlScript(request); + SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addSchema().addReferential().addDataIds(tripIds); + byte[] dump = dumpService.produceSqlScript(request); try (FileOutputStream fileOutputStream = new FileOutputStream(dst)) { @@ -774,11 +783,11 @@ public class StorageUIHandler { case USE_REMOTE: ObserveDataSourceConfigurationTopiaPG pgConfig = model.getPgConfig(); - dataSource = ObserveSwingApplicationContext.get().getDataSourcesManager().newDataSource(pgConfig); + dataSource = ObserveSwingApplicationContext.get().newDataSource(pgConfig); break; case USE_SERVER: ObserveDataSourceConfigurationRest restConfig = model.getRestConfig(); - dataSource = ObserveSwingApplicationContext.get().getDataSourcesManager().newDataSource(restConfig); + dataSource = ObserveSwingApplicationContext.get().newDataSource(restConfig); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/8383_importer_une_sauvegarde_apres_fermeture_connexion in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 4a9fc8dd7d64ab6c423db096305fb6a200dac1d3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 16 18:15:25 2016 +0200 fix merge --- .../ird/observe/ui/storage/StorageUIHandler.java | 70 ++++++++++------------ .../observe-application-swing_en_GB.properties | 1 + .../observe-application-swing_es_ES.properties | 1 + .../observe-application-swing_fr_FR.properties | 1 + 4 files changed, 36 insertions(+), 37 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java index b8e8f52..4c4b19d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java @@ -52,7 +52,6 @@ import fr.ird.observe.ui.storage.tabs.DataSelectionModel; import fr.ird.observe.ui.storage.tabs.RolesTableModel; import fr.ird.observe.ui.storage.tabs.SecurityModel; import fr.ird.observe.ui.storage.tabs.StorageTabUI; -import jaxx.runtime.JAXXContext; import jaxx.runtime.context.DefaultApplicationContext.AutoLoad; import jaxx.runtime.swing.wizard.WizardUILancher; import org.apache.commons.io.FileUtils; @@ -91,7 +90,7 @@ public class StorageUIHandler { * * Le service ne sera pas ouvert. * - * @param model le modèle de la source de données + * @param model le modèle de la source de données * @return le service de persistance initialisé mais non ouvert. */ public ObserveSwingDataSource newDataSourceFromModel( @@ -104,7 +103,7 @@ public class StorageUIHandler { case USE_LOCAL: configuration = model.toH2StorageConfig(t("observe.storage.label.local")); - dataSource = ObserveSwingApplicationContext.get().newDataSource(configuration); + dataSource = ObserveSwingApplicationContext.get().getDataSourcesManager().newDataSource(configuration); dataSource.addObserveSwingDataSourceListener( new ObserveSwingDataSourceListenerAdapter() { @@ -253,7 +252,7 @@ public class StorageUIHandler { if (StorageStep.SELECT_DATA == newStep && mustRecompute) { if (ObstunaAdminAction.CREATE == ui.getModel().getAdminAction() - && (model.getSelectDataModel() == null || model.getSelectDataModel().isEmpty())) { + && (model.getSelectDataModel() == null || model.getSelectDataModel().isEmpty())) { // récupération des données possibles à importer initSelectData(ui); @@ -296,7 +295,7 @@ public class StorageUIHandler { } }; } - ObserveMainUI mainUI = ObserveSwingApplicationContext.get().getObserveMainUI(); + ObserveMainUI mainUI = ObserveSwingApplicationContext.get().getMainUI(); if (mainUI == null) { if (log.isWarnEnabled()) { log.warn("Launch standalone apply action " + action); @@ -332,8 +331,7 @@ public class StorageUIHandler { /** * Utiliser le storage defini dans le modèle donné. * - * @param context le context applicatif - * @param model le model++ du storage a creer ou utiliser + * @param model le model++ du storage a creer ou utiliser */ public void doChangeStorage(StorageUIModel model) { ObserveSwingApplicationContext observeContext = ObserveSwingApplicationContext.get(); @@ -343,7 +341,7 @@ public class StorageUIHandler { // faut-il detruire la base locale ? boolean destroyLocalBase = config.isLocalStorageExist() && - model.getDbMode() == DbMode.CREATE_LOCAL; + model.getDbMode() == DbMode.CREATE_LOCAL; if (log.isDebugEnabled()) { log.debug(">>> should destroy local db ? " + destroyLocalBase); @@ -453,7 +451,7 @@ public class StorageUIHandler { } // suppression du storage local - if (localDataSource != null && localDataSource != localDataSource) { + if (localDataSource != null && localDataSource != currentDataSource) { // ce cas peut arriver lorsque l'on fait juste une backup // sans vouloir supprimer la base locale if (log.isDebugEnabled()) { @@ -484,8 +482,8 @@ public class StorageUIHandler { } - observeContext.setDataSource(currentDataSource); - observeContext.prepareMainStorage(currentDataSource); + observeContext.getDataSourcesManager().setMainDataSource(currentDataSource); + observeContext.prepareMainStorage(currentDataSource, true); if (model.getDbMode() == DbMode.CREATE_LOCAL) { @@ -510,10 +508,9 @@ public class StorageUIHandler { } config.setLocalStorageExist(false); - observeContext.setDataSource(null); - + observeContext.getDataSourcesManager().setMainDataSource(null); - throw e; + throw e; } } else { // ouverture du nouveau storage @@ -521,7 +518,7 @@ public class StorageUIHandler { } if (DbMode.CREATE_LOCAL.equals(model.getDbMode()) - && (CreationMode.IMPORT_REMOTE_STORAGE.equals(model.getCreationMode()) || CreationMode.IMPORT_SERVER_STORAGE.equals(model.getCreationMode())) + && (CreationMode.IMPORT_REMOTE_STORAGE.equals(model.getCreationMode()) || CreationMode.IMPORT_SERVER_STORAGE.equals(model.getCreationMode())) && config.isLocalStorageExist()) { // si on a creer la base locale a partir d'un import d'une base // distante, on sauvegarde la base locale comme dump initial @@ -530,16 +527,14 @@ public class StorageUIHandler { if (f.exists()) { // on supprime le dump sql de la base embarquée if (!f.delete()) { - throw new IllegalStateException("could not delete " + - f); + throw new IllegalStateException("could not delete " + f); } } if (log.isInfoEnabled()) { - log.info(">>> create initial dump with " + localDataSource + - " in " + f); + log.info(">>> create initial dump with " + localDataSource + " in " + f); } try { - SqlScriptProducerService dumpProducerService = observeContext.newService(SqlScriptProducerService.class); + SqlScriptProducerService dumpProducerService = observeContext.getMainDataSourceServicesProvider().newSqlScriptProducerService(); backupLocalDatabase(dumpProducerService, f); config.setInitialDumpExist(true); } catch (Exception e) { @@ -552,7 +547,7 @@ public class StorageUIHandler { } if (model.isStoreRemoteConfig()) { - storeRemoteConfig(context, model); + storeRemoteConfig(model); } } catch (Exception ex) { @@ -565,11 +560,10 @@ public class StorageUIHandler { * Sauvegarder dans la configuration de l'application le paramétrage de la * source de données distante donnée. * - * @param context le context applicatif - * @param model le model de la source de données + * @param model le model de la source de données */ - public void storeRemoteConfig(JAXXContext context, StorageUIModel model) { - ObserveSwingApplicationConfig config = context.getContextValue(ObserveSwingApplicationConfig.class); + public void storeRemoteConfig(StorageUIModel model) { + ObserveSwingApplicationConfig config = ObserveSwingApplicationContext.get().getConfig(); // on sauvegarde dans le parametrage dans la configuration de // l'application @@ -597,8 +591,9 @@ public class StorageUIHandler { /** * Effectue une sauvegarde de la base locale vers le fichier choisi. + * * @param dumpProducerService le service de dump - * @param dst le fichier de sauvegarde + * @param dst le fichier de sauvegarde */ public void backupLocalDatabase(SqlScriptProducerService dumpProducerService, File dst) { if (dst == null) { @@ -609,13 +604,13 @@ public class StorageUIHandler { log.debug(dst); } - SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addSchema().addReferential().addAllData(); - byte[] dataDump = dumpProducerService.produceSqlScript(request); + AddSqlScriptProducerRequest request = AddSqlScriptProducerRequest.forH2().addSchema().addReferential().addAllData(); + byte[] dataDump = dumpProducerService.produceAddSqlScript(request); try (FileOutputStream outputStream = new FileOutputStream(dst)) { outputStream.write(dataDump); - } catch (Exception e) { + } catch (Exception e) { UIHelper.handlingError(e); } } @@ -628,15 +623,16 @@ public class StorageUIHandler { * marees}. * * <b>Note:</b> Si ce paramètre vaut {@code null}, on export tout. - * @param dataSource la source de donnée qui encapsule la base locale - * @param dst le fichier de sauvegarde - * @param trips les marees a exporter (si {@code null} on exporte tout) + * + * @param dataSource la source de donnée qui encapsule la base locale + * @param dst le fichier de sauvegarde + * @param trips les marees a exporter (si {@code null} on exporte tout) */ public void backupLocalDatabase(ObserveSwingDataSource dataSource, File dst, Set<DataReference> trips) { - SqlScriptProducerService dumpService = dataSource.newService(SqlScriptProducerService.class); + SqlScriptProducerService dumpService = dataSource.newSqlScriptProducerService(); if (trips == null) { @@ -662,8 +658,8 @@ public class StorageUIHandler { ImmutableSet<String> tripIds = ImmutableSet.copyOf(Iterables.transform(trips, DataReference.getIdFunction())); - SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addSchema().addReferential().addDataIds(tripIds); - byte[] dump = dumpService.produceSqlScript(request); + AddSqlScriptProducerRequest request = AddSqlScriptProducerRequest.forH2().addSchema().addReferential().dataIdsToAdd(tripIds); + byte[] dump = dumpService.produceAddSqlScript(request); try (FileOutputStream fileOutputStream = new FileOutputStream(dst)) { @@ -783,11 +779,11 @@ public class StorageUIHandler { case USE_REMOTE: ObserveDataSourceConfigurationTopiaPG pgConfig = model.getPgConfig(); - dataSource = ObserveSwingApplicationContext.get().newDataSource(pgConfig); + dataSource = ObserveSwingApplicationContext.get().getDataSourcesManager().newDataSource(pgConfig); break; case USE_SERVER: ObserveDataSourceConfigurationRest restConfig = model.getRestConfig(); - dataSource = ObserveSwingApplicationContext.get().newDataSource(restConfig); + dataSource = ObserveSwingApplicationContext.get().getDataSourcesManager().newDataSource(restConfig); } diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties index 3622106..75b2e23 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties @@ -142,6 +142,7 @@ observe.action.stop.h2.web.server= observe.action.stop.h2.web.server.tip= observe.action.stop.server.mode= observe.action.stop.server.mode.tip= +observe.action.storage.applyAction= observe.action.test.remote=Test connexion observe.action.test.remote.tip=Click here to validate remote connexion observe.actions.config.step= diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties index 956e92f..1afbe82 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties @@ -142,6 +142,7 @@ observe.action.stop.h2.web.server=Terminar modo servidor Web (H2) observe.action.stop.h2.web.server.tip=Parar el servidor web H2 observe.action.stop.server.mode=Terminar modo servidor observe.action.stop.server.mode.tip=Parar el modo servidor de la base local +observe.action.storage.applyAction= observe.action.test.remote=Comprobar la conexión observe.action.test.remote.tip=Pulsar para comprobar la conexión con el servidor remoto observe.actions.config.step= diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index d30fb18..e32dfff 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -142,6 +142,7 @@ observe.action.stop.h2.web.server=Arrêter le serveur web observe.action.stop.h2.web.server.tip=Arrêter le serveur web H2 observe.action.stop.server.mode=Arrêter le mode serveur observe.action.stop.server.mode.tip=Arrêter le mode serveur de la base locale +observe.action.storage.applyAction=Appliquer observe.action.test.remote=Valider la connexion observe.action.test.remote.tip=Cliquer pour valider la connexion au serveur distant observe.actions.config.step=Configuration -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm