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 88fdffcffee03b94f6ac856cd18b44481c4638b0 Merge: 6f970c0 c938eca Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Nov 7 13:27:30 2016 +0100 Lors d'un import sql.gz vers la base centrale, possibilité d'ajouter dans la base centrale les références manquantes (Fixes #7994) Merge branch 'feature/7994' into develop .../swing/db/ObserveSwingDataSource.java | 74 +++--- .../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 +- .../swing/ui/admin/AdminTabUIHandler.java | 6 +- .../application/swing/ui/admin/AdminUIModel.java | 4 +- .../swing/ui/admin/export/ExportModel.java | 10 + .../swing/ui/admin/export/ExportUI.jaxx | 3 + .../swing/ui/admin/export/ExportUI.jcss | 5 + .../swing/ui/admin/export/ExportUIHandler.java | 105 +++++++- .../swing/ui/admin/save/SaveLocalUIHandler.java | 4 +- .../synchronize/data/DataSynchroUIHandler.java | 14 +- .../LonglineDetailCompositionUIHandler.java | 2 +- .../LonglineGlobalCompositionUIHandler.java | 2 +- .../impl/longline/SetLonglineUIHandler.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 | 2 +- .../open/impl/seine/ActivitySeineUIHandler.java | 2 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 3 +- .../open/impl/seine/TripSeineUIHandler.java | 2 +- .../ui/content/ref/ContentReferenceUIHandler.java | 2 +- .../impl/longline/CatchLonglineUIHandler.java | 6 +- .../table/impl/longline/EncounterUIHandler.java | 4 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 4 +- .../table/impl/longline/SensorUsedUIHandler.java | 2 +- .../content/table/impl/longline/TdrUIHandler.java | 4 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 4 +- .../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 +- .../swing/ui/storage/StorageBackupUILauncher.java | 8 +- .../swing/ui/storage/StorageUIHandler.java | 4 +- .../swing/ui/storage/StorageUIModel.java | 4 +- .../swing/ui/storage/tabs/DataSelectionModel.java | 4 +- .../actions/ChangeActivityRouteActionListener.java | 2 +- .../actions/ChangeActivityTripActionListener.java | 2 +- .../actions/ChangeRouteTripActionListener.java | 2 +- .../actions/ChangeTripProgramActionListener.java | 4 +- .../loadors/ActivityLonglinesNodeChildLoador.java | 2 +- .../tree/loadors/ActivitySeineNodeChildLoador.java | 2 +- .../loadors/ActivitySeinesNodeChildLoador.java | 2 +- .../loadors/ProgramLonglineNodeChildLoador.java | 2 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 2 +- .../ui/tree/loadors/RoutesNodeChildLoador.java | 2 +- .../swing/ui/tree/node/ActivityLonglineNode.java | 2 +- .../swing/ui/tree/node/ActivitySeineNode.java | 2 +- .../ui/tree/node/FloatingObjectSeineNode.java | 2 +- .../swing/ui/tree/node/ProgramLonglineNode.java | 2 +- .../swing/ui/tree/node/ProgramSeineNode.java | 2 +- .../swing/ui/tree/node/RouteSeineNode.java | 2 +- .../swing/ui/tree/node/SetLonglineNode.java | 2 +- .../swing/ui/tree/node/SetSeineNode.java | 2 +- .../swing/ui/tree/node/TripLonglineNode.java | 2 +- .../swing/ui/tree/node/TripSeineNode.java | 2 +- .../swing/validation/ValidationContext.java | 18 +- .../i18n/application-swing_en_GB.properties | 14 +- .../i18n/application-swing_es_ES.properties | 14 +- .../i18n/application-swing_fr_FR.properties | 14 +- .../TripManagementServiceController.java | 16 +- ...ActivityLongLineEncounterServiceController.java | 4 +- ...ctivityLongLineSensorUsedServiceController.java | 4 +- .../ActivityLonglineServiceController.java | 4 +- .../longline/BranchlineServiceController.java | 4 +- .../SetLonglineCatchServiceController.java | 4 +- ...LonglineDetailCompositionServiceController.java | 4 +- ...LonglineGlobalCompositionServiceController.java | 4 +- .../longline/SetLonglineServiceController.java | 4 +- .../{ => data}/longline/TdrServiceController.java | 4 +- .../TripLonglineGearUseServiceController.java | 4 +- .../longline/TripLonglineServiceController.java | 4 +- .../seine/ActivitySeineServiceController.java | 4 +- .../seine/FloatingObjectServiceController.java | 4 +- .../seine/NonTargetCatchServiceController.java | 4 +- .../seine/NonTargetSampleServiceController.java | 4 +- .../ObjectObservedSpeciesServiceController.java | 4 +- .../ObjectSchoolEstimateServiceController.java | 4 +- .../{ => data}/seine/RouteServiceController.java | 4 +- .../seine/SchoolEstimateServiceController.java | 4 +- .../seine/SetSeineServiceController.java | 4 +- .../seine/TargetCatchServiceController.java | 4 +- .../seine/TargetSampleServiceController.java | 4 +- ...TransmittingBuoyOperationServiceController.java | 4 +- .../seine/TripSeineGearUseServiceController.java | 4 +- .../seine/TripSeineServiceController.java | 4 +- .../ReferentialServiceController.java | 24 +- .../SqlScriptProducerServiceController.java | 11 +- .../ObserveReferenceSetRequestInjector.java | 2 +- .../injector/SqlScriptProducerRequestInjector.java | 2 +- application-web/src/main/resources/mapping | 287 +++++++++++---------- .../observe/ObserveTopiaApplicationContext.java | 6 + pom.xml | 6 +- .../service/ReferenceValuesSetServiceRestTest.java | 4 +- .../rest/service/ReferentialServiceRestTest.java | 2 +- .../seine/TripSeineGearUseServiceRestTest.java | 4 +- .../service/seine/TripSeineServiceRestTest.java | 2 +- .../topia/service/DataSourceServiceTopia.java | 4 +- .../consolidate/ConsolidateDataServiceTopia.java | 2 +- .../{ => data}/ImportTripScriptTopiaSqlWork.java | 4 +- .../{ => data}/TripManagementServiceTopia.java | 26 +- .../ActivityLongLineEncounterServiceTopia.java | 4 +- .../ActivityLongLineSensorUsedServiceTopia.java | 4 +- .../longline/ActivityLonglineServiceTopia.java | 4 +- .../longline/BranchlineServiceTopia.java | 4 +- .../longline/LonglinePositionSetDtoHelper.java | 2 +- .../longline/SetLonglineCatchServiceTopia.java | 4 +- .../SetLonglineDetailCompositionServiceTopia.java | 4 +- .../SetLonglineGlobalCompositionServiceTopia.java | 4 +- .../longline/SetLonglineServiceTopia.java | 4 +- .../{ => data}/longline/TdrServiceTopia.java | 4 +- .../longline/TripLonglineGearUseServiceTopia.java | 4 +- .../longline/TripLonglineServiceTopia.java | 4 +- .../seine/ActivitySeineServiceTopia.java | 4 +- .../seine/FloatingObjectServiceTopia.java | 4 +- .../seine/NonTargetCatchServiceTopia.java | 4 +- .../seine/NonTargetSampleServiceTopia.java | 5 +- .../seine/ObjectObservedSpeciesServiceTopia.java | 4 +- .../seine/ObjectSchoolEstimateServiceTopia.java | 4 +- .../{ => data}/seine/RouteServiceTopia.java | 4 +- .../seine/SchoolEstimateServiceTopia.java | 4 +- .../{ => data}/seine/SetSeineServiceTopia.java | 4 +- .../{ => data}/seine/TargetCatchServiceTopia.java | 4 +- .../{ => data}/seine/TargetSampleServiceTopia.java | 4 +- .../TransmittingBuoyOperationServiceTopia.java | 4 +- .../seine/TripSeineGearUseServiceTopia.java | 4 +- .../{ => data}/seine/TripSeineServiceTopia.java | 4 +- .../{ => referential}/ReferentialServiceTopia.java | 85 +++++- .../referential/ReferentialsShellBuilder.java | 116 +++++++++ .../{ => sql}/SqlScriptProducerServiceTopia.java | 49 +++- .../services/topia/TopiaTestMethodResource.java | 2 +- .../topia/service/AbstractServiceTopiaTest.java | 2 +- .../topia/service/DataSourceServiceTopiaTest.java | 2 +- .../topia/service/ReferentialServiceTopiaTest.java | 3 +- .../observe/services/topia/service/RigthTest.java | 4 +- .../service/TripManagementServiceTopiaTest.java | 16 +- ...tLonglineDetailCompositionServiceTopiaTest.java | 2 +- .../topia/service/seine/RouteServiceTopiaTest.java | 2 +- .../seine/TargetSampleServiceTopiaTest.java | 2 +- .../seine/TripSeineGearUseServiceTopiaTest.java | 4 +- .../service/seine/TripSeineServiceTopiaTest.java | 4 +- .../service/{ => sql}/MigrateTestsDatabases.java | 9 +- .../SqlScriptProducerServiceTopiaTest.java} | 21 +- .../observe/services/ObserveServicesProvider.java | 56 ++-- .../service/{trip => data}/DeleteTripRequest.java | 2 +- .../service/{trip => data}/DeleteTripResult.java | 2 +- .../service/{trip => data}/ExportTripRequest.java | 2 +- .../service/{trip => data}/ExportTripResult.java | 4 +- .../service/{trip => data}/ImportTripRequest.java | 4 +- .../service/{trip => data}/ImportTripResult.java | 2 +- .../{trip => data}/TripManagementService.java | 2 +- .../longline/ActivityLongLineEncounterService.java | 2 +- .../ActivityLongLineSensorUsedService.java | 2 +- .../longline/ActivityLonglineService.java | 2 +- .../{ => data}/longline/BranchlineService.java | 2 +- .../longline/SetLonglineCatchService.java | 2 +- .../SetLonglineDetailCompositionService.java | 2 +- .../SetLonglineGlobalCompositionService.java | 2 +- .../{ => data}/longline/SetLonglineService.java | 2 +- .../service/{ => data}/longline/TdrService.java | 2 +- .../longline/TripLonglineGearUseService.java | 2 +- .../{ => data}/longline/TripLonglineService.java | 2 +- .../{ => data}/seine/ActivitySeineService.java | 2 +- .../{ => data}/seine/FloatingObjectService.java | 2 +- .../{ => data}/seine/NonTargetCatchService.java | 2 +- .../{ => data}/seine/NonTargetSampleService.java | 2 +- .../seine/ObjectObservedSpeciesService.java | 2 +- .../seine/ObjectSchoolEstimateService.java | 2 +- .../service/{ => data}/seine/RouteService.java | 2 +- .../{ => data}/seine/SchoolEstimateService.java | 2 +- .../service/{ => data}/seine/SetSeineService.java | 2 +- .../{ => data}/seine/TargetCatchService.java | 2 +- .../{ => data}/seine/TargetSampleService.java | 2 +- .../seine/TransmittingBuoyOperationService.java | 2 +- .../{ => data}/seine/TripSeineGearUseService.java | 2 +- .../service/{ => data}/seine/TripSeineService.java | 2 +- .../referential/MissingReferentialResult.java | 33 +++ .../{ => referential}/ObserveReferentialCache.java | 2 +- .../{ => referential}/ReferenceSetsRequest.java | 2 +- .../{ => referential}/ReferentialService.java | 19 +- .../{ => sql}/AddSqlScriptProducerRequest.java | 37 ++- .../{ => sql}/AddSqlScriptProducerResult.java | 2 +- .../{ => sql}/DeleteSqlScriptProducerRequest.java | 2 +- .../service/{ => sql}/ObserveBlobsContainer.java | 2 +- .../{ => sql}/SqlScriptProducerService.java | 2 +- 198 files changed, 1035 insertions(+), 564 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.