This is an automated email from the git hooks/post-receive script. New commit to branch develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 2bd88a9e14088daace67bf19e1033022cf0ba145 Merge: 011e671 f6bbcc2 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 5 08:12:09 2016 +0100 [jgitflow-maven-plugin]merging 'release/5.1' into 'master-5.x' application-swing-configuration/pom.xml | 7 +- .../src/main/config/ObserveSwingApplication.ini | 524 ++++++++++++++ .../src/main/config/ObserveSwingApplication.toml | 601 ---------------- .../ObserveSwingApplicationConfig.java | 90 +-- .../ObserveSwingApplicationConfigAction.java | 142 ---- .../ObserveSwingApplicationConfigOption.java | 780 --------------------- ...pplication-swing-configuration_en_GB.properties | 1 + ...pplication-swing-configuration_es_ES.properties | 1 + ...pplication-swing-configuration_fr_FR.properties | 1 + application-swing-decoration/pom.xml | 2 +- .../swing/decoration/DecoratorService.java | 2 - application-swing-validation/pom.xml | 2 +- ...tsCompositionDto-ui-update-error-validation.xml | 5 - ...CatchLonglineDto-ui-update-error-validation.xml | 5 + ...ksCompositionDto-ui-update-error-validation.xml | 7 +- ...ActivitySeineDto-ui-create-error-validation.xml | 13 + ...tivitySeineDto-ui-create-warning-validation.xml | 21 + ...ActivitySeineDto-ui-update-error-validation.xml | 13 + ...tivitySeineDto-ui-update-warning-validation.xml | 8 +- ...bservedSystemDto-ui-update-error-validation.xml | 63 -- ...ervedSystemDto-ui-update-warning-validation.xml | 50 -- .../application-swing-validation_en_GB.properties | 3 +- .../application-swing-validation_es_ES.properties | 3 +- .../application-swing-validation_fr_FR.properties | 3 +- .../validation/BeanValidatorDetectorTest.java | 6 +- application-swing-validators/pom.xml | 2 +- .../SetLonglineUniqueHomeIdDtoValidator.java | 6 +- .../SetLonglineUniqueNumberDtoValidator.java | 4 +- application-swing/pom.xml | 7 +- application-swing/src/main/assembly/bin.xml | 4 +- application-swing/src/main/assembly/map.xml | 4 +- .../observe/application/swing/ObserveCLAction.java | 6 +- .../application/swing/ObserveOpenDataManager.java | 20 +- .../observe/application/swing/db/DataContext.java | 20 +- .../swing/db/ObserveSwingDataSource.java | 6 - .../application/swing/ui/ObserveCommon.jcss | 1 + .../application/swing/ui/ObserveMainUI.jaxx | 2 +- .../application/swing/ui/ObserveMainUIHandler.java | 2 +- .../ird/observe/application/swing/ui/UIHelper.java | 7 + .../swing/ui/actions/ShowConfigAction.java | 3 +- .../swing/ui/actions/shared/AbstractUIAction.java | 2 +- .../ui/actions/shared/CancelCreateUIAction.java | 2 +- .../swing/ui/actions/shared/CloseOpenUIAction.java | 2 +- .../swing/ui/actions/shared/GoDownUIAction.java | 4 +- .../swing/ui/actions/shared/GoUpUIAction.java | 4 +- .../shared/MoveActivityLonglinesUIAction.java | 4 +- .../actions/shared/MoveActivitySeinesUIAction.java | 4 +- .../ui/actions/shared/MoveRoutesUIAction.java | 4 +- .../swing/ui/actions/shared/MoveTripsUIAction.java | 2 +- .../swing/ui/actions/shared/ReOpenUIAction.java | 2 +- .../ui/actions/shared/SelectNodeUIAction.java | 2 +- .../swing/ui/admin/AdminTabUIHandler.java | 4 - .../application/swing/ui/admin/AdminUIModel.java | 66 +- .../swing/ui/admin/config/SelectDataUI.jaxx | 2 +- .../ui/admin/consolidate/ConsolidateUIHandler.java | 13 + .../swing/ui/admin/export/ExportUIHandler.java | 2 +- .../swing/ui/admin/report/ReportConfigUI.jaxx | 15 +- .../swing/ui/admin/report/ReportConfigUI.jcss | 9 + .../swing/ui/admin/report/ReportModel.java | 48 +- .../swing/ui/admin/report/ReportUIHandler.java | 21 +- .../data/DataSynchroSelectionTreeCellRenderer.java | 6 +- .../ui/admin/synchronize/data/DataSynchroUI.jaxx | 2 +- .../validate/ValidateEntityListCellRenderer.java | 6 +- .../swing/ui/admin/validate/ValidateModel.java | 11 +- .../swing/ui/admin/validate/ValidateUIHandler.java | 10 +- .../swing/ui/content/ContentUIHandler.java | 4 +- .../swing/ui/content/ContentUIInitializer.java | 1 + .../swing/ui/content/ContentUIManager.java | 13 +- .../ui/content/impl/longline/BranchlineUI.jaxx | 3 +- .../ui/content/impl/longline/BranchlineUI.jcss | 8 +- .../content/impl/longline/BranchlineUIHandler.java | 57 +- .../content/impl/longline/BranchlineUIModel.java | 12 + .../LonglineDetailCompositionUIHandler.java | 12 +- .../LonglineGlobalCompositionUIHandler.java | 12 +- .../ui/content/impl/longline/SetLonglineUI.jaxx | 190 +++-- .../ui/content/impl/longline/SetLonglineUI.jcss | 2 + .../impl/longline/SetLonglineUIHandler.java | 63 +- .../impl/seine/ActivitySeineObservedSystemUI.jaxx | 113 --- .../impl/seine/ActivitySeineObservedSystemUI.jcss | 78 --- .../ActivitySeineObservedSystemUIHandler.java | 133 ---- .../seine/ActivitySeineObservedSystemUIModel.java | 42 -- ...ngObjectTransmittingBuoyOperationUIHandler.java | 14 +- .../impl/seine/FloatingObjectUIHandler.java | 6 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 6 +- .../ui/content/list/ContentListUIHandler.java | 4 +- .../ui/content/open/ContentOpenableUIHandler.java | 15 +- .../impl/longline/ActivityLonglineUIHandler.java | 40 +- .../impl/longline/ActivityLonglineUIModel.java | 8 +- .../content/open/impl/longline/TripLonglineUI.jaxx | 4 +- .../open/impl/longline/TripLonglineUIHandler.java | 28 +- .../content/open/impl/seine/ActivitySeineUI.jaxx | 58 +- .../content/open/impl/seine/ActivitySeineUI.jcss | 33 + .../open/impl/seine/ActivitySeineUIHandler.java | 32 +- .../open/impl/seine/ActivitySeineUIModel.java | 34 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 18 +- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 4 +- .../open/impl/seine/TripSeineUIHandler.java | 20 +- .../ui/content/ref/ContentReferenceUIHandler.java | 124 +++- .../ui/content/table/ContentTableUIHandler.java | 2 +- .../impl/GearUseFeatureMeasurementCellEditor.java | 4 +- .../GearUseFeatureMeasurementCellRenderer.java | 4 +- .../impl/longline/BaitsCompositionUIModel.java | 4 +- .../longline/BranchlinesCompositionUIModel.java | 4 +- .../impl/longline/CatchLonglineTableModel.java | 4 +- .../table/impl/longline/CatchLonglineUI.jaxx | 11 +- .../table/impl/longline/CatchLonglineUI.jcss | 18 +- .../impl/longline/CatchLonglineUIHandler.java | 92 ++- .../table/impl/longline/CatchLonglineUIModel.java | 16 + .../table/impl/longline/EncounterUIHandler.java | 4 +- .../table/impl/longline/EncounterUIModel.java | 4 +- .../longline/FloatlinesCompositionUIModel.java | 4 +- .../GearUseFeaturesLonglineTableModel.java | 4 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 8 +- ...rUseFeaturesMeasurementLonglinesTableModel.java | 4 +- .../impl/longline/HooksCompositionUIModel.java | 4 +- .../content/table/impl/longline/SensorUsedUI.jcss | 1 - .../table/impl/longline/SensorUsedUIHandler.java | 35 +- .../table/impl/longline/SensorUsedUIModel.java | 4 +- .../ui/content/table/impl/longline/TdrUI.jcss | 1 - .../content/table/impl/longline/TdrUIHandler.java | 37 +- .../ui/content/table/impl/longline/TdrUIModel.java | 4 +- ...GearUseFeaturesMeasurementSeinesTableModel.java | 4 +- .../impl/seine/GearUseFeaturesSeineTableModel.java | 4 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 8 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 8 +- .../table/impl/seine/NonTargetCatchUIModel.java | 4 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 4 +- .../table/impl/seine/NonTargetSampleUIModel.java | 4 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 4 +- .../impl/seine/ObjectObservedSpeciesUIModel.java | 4 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 4 +- .../impl/seine/ObjectSchoolEstimateUIModel.java | 4 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 4 +- .../table/impl/seine/SchoolEstimateUIModel.java | 4 +- .../ui/content/table/impl/seine/TargetCatchUI.jcss | 2 +- .../table/impl/seine/TargetCatchUIHandler.java | 14 +- .../table/impl/seine/TargetCatchUIModel.java | 4 +- .../table/impl/seine/TargetDiscardCatchUI.jcss | 2 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 16 +- .../impl/seine/TargetDiscardCatchUIModel.java | 4 +- .../table/impl/seine/TargetSampleUIHandler.java | 33 +- .../table/impl/seine/TargetSampleUIModel.java | 4 +- .../swing/ui/storage/tabs/DataSelectionModel.java | 87 ++- .../swing/ui/storage/tabs/RolesTableModel.java | 4 +- .../swing/ui/storage/tabs/SecurityModel.java | 14 +- .../swing/ui/storage/tabs/SelectDataUI.jaxx | 2 +- .../ui/tree/DataSelectionTreeSelectionModel.java | 3 + .../tree/ObserveNavigationTreeShowPopupAction.java | 1 + .../swing/ui/tree/ObserveTreeBridge.java | 1 + .../swing/ui/tree/ObserveTreeHelper.java | 63 ++ .../actions/ChangeActivityRouteActionListener.java | 2 +- .../actions/ChangeActivityTripActionListener.java | 2 +- .../actions/ChangeRouteTripActionListener.java | 2 +- .../actions/ChangeTripProgramActionListener.java | 6 +- .../ui/tree/actions/NodeChangeActionListener.java | 2 +- .../ui/tree/loadors/AbstractNodeChildLoador.java | 2 +- .../loadors/ActivityLonglineNodeChildLoador.java | 33 +- .../loadors/ActivityLonglinesNodeChildLoador.java | 4 +- .../tree/loadors/ActivitySeineNodeChildLoador.java | 14 +- .../loadors/ActivitySeinesNodeChildLoador.java | 4 +- .../loadors/FloatingObjectNodeChildLoador.java | 2 +- .../loadors/ProgramLonglineNodeChildLoador.java | 17 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 17 +- .../ui/tree/loadors/ReferenceNodeChildLoador.java | 10 +- .../swing/ui/tree/loadors/RootNodeChildLoador.java | 6 +- .../ui/tree/loadors/RoutesNodeChildLoador.java | 4 +- .../tree/loadors/SetLonglineNodeChildLoador.java | 2 +- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 2 +- .../MoveActivityLonglineNodeMenuPopulator.java | 8 +- .../menu/MoveActivitySeineNodeMenuPopulator.java | 8 +- .../swing/ui/tree/menu/MoveNodeMenuPopulator.java | 2 +- .../ui/tree/menu/MoveRouteNodeMenuPopulator.java | 8 +- .../ui/tree/menu/MoveTripNodeMenuPopulator.java | 12 +- .../{ => node}/AbstrctReferenceNodeSupport.java | 3 +- .../ui/tree/{ => node}/ActivityLonglineNode.java | 3 +- .../ui/tree/{ => node}/ActivitySeineNode.java | 3 +- .../tree/{ => node}/DataReferenceNodeSupport.java | 3 +- .../tree/{ => node}/FloatingObjectSeineNode.java | 3 +- .../swing/ui/tree/{ => node}/ObserveNode.java | 2 +- .../ui/tree/{ => node}/ProgramLonglineNode.java | 19 +- .../swing/ui/tree/{ => node}/ProgramSeineNode.java | 18 +- .../ReferentialReferenceNodeSupport.java | 3 +- .../swing/ui/tree/{ => node}/RouteSeineNode.java | 2 +- .../swing/ui/tree/{ => node}/SetLonglineNode.java | 3 +- .../swing/ui/tree/{ => node}/SetSeineNode.java | 3 +- .../swing/ui/tree/{ => node}/TripLonglineNode.java | 2 +- .../swing/ui/tree/{ => node}/TripSeineNode.java | 14 +- .../AbstractObserveTreeCellRenderer.java | 40 +- .../DataSelectionTreeCellRenderer.java | 4 +- .../{ => renderer}/NavigationTreeCellRenderer.java | 4 +- .../application/swing/ui/usage/UsagesUI.jaxx | 27 +- .../swing/ui/usage/UsagesUIHandler.java | 43 +- .../swing/ui/util/DecoratedNodeEntity.java | 2 +- .../swing/ui/util/tripMap/TripMapUIHandler.java | 6 +- .../i18n/application-swing_en_GB.properties | 13 +- .../i18n/application-swing_es_ES.properties | 13 +- .../i18n/application-swing_fr_FR.properties | 13 +- application-web-configuration/pom.xml | 2 +- .../src/main/config/ObserveWebApplication.ini | 99 +++ .../src/main/config/ObserveWebApplication.toml | 112 --- .../configuration/ObserveWebApplicationConfig.java | 39 +- application-web/pom.xml | 2 +- .../v1/ReferentialServiceController.java | 5 + ...tivitySeineObservedSystemServiceController.java | 49 -- application-web/src/main/resources/mapping | 3 +- .../db/ObserveWebDatabasesHelperTest.java | 51 +- .../user/ObserveWebUsersHelperTest.java | 3 + entities-migration/pom.xml | 2 +- entities/pom.xml | 10 +- .../observe/ObserveTopiaApplicationContext.java | 18 +- .../longline/ActivityLonglineTopiaDao.java | 6 +- .../entities/longline/TripLonglineTopiaDao.java | 32 +- .../entities/seine/ActivitySeineTopiaDao.java | 6 +- .../observe/entities/seine/TargetCatchImpl.java | 4 +- .../ird/observe/entities/seine/TripSeineImpl.java | 10 + .../observe/entities/seine/TripSeineTopiaDao.java | 36 +- entities/src/main/xmi/observe-seine.zargo | Bin 83234 -> 83418 bytes entities/src/main/xmi/observe.ini | 295 ++++++++ entities/src/main/xmi/observe.objectmodel-ext | 248 ------- pom.xml | 28 +- services-configuration-rest/pom.xml | 2 +- services-configuration-topia/pom.xml | 2 +- services-configuration/pom.xml | 2 +- services-dto/pom.xml | 11 +- .../fr/ird/observe/services/dto/DataReference.java | 4 +- .../java/fr/ird/observe/services/dto/IdDto.java | 6 +- .../services/dto/{IdDtos.java => IdHelper.java} | 4 +- ...rveDbUserDtos.java => ObserveDbUserHelper.java} | 2 +- ...8nReferentialDto.java => ObserveModelType.java} | 19 +- .../services/dto/actions/report/Report.java | 20 +- .../services/dto/constants/ReferentialLocale.java | 4 +- .../services/dto/longline/ActivityLonglineDto.java | 2 +- .../GearUseFeaturesMeasurementLonglineDto.java | 2 +- ...mplates.java => SectionWithTemplateHelper.java} | 2 +- .../longline/SetLonglineGlobalCompositionDto.java | 2 +- .../dto/reference/DataReferenceSetDefinitions.java | 45 +- .../request/ReferenceSetRequestDefinitions.java | 8 +- ...eDtos.java => GearCaracteristicTypeHelper.java} | 2 +- .../dto/referential/I18nReferentialDto.java | 2 +- ...rentialDtos.java => I18nReferentialHelper.java} | 3 +- .../{PersonDtos.java => PersonHelper.java} | 2 +- .../services/dto/referential/ProgramDto.java | 2 +- .../{ProgramDtos.java => ProgramHelper.java} | 2 +- .../services/dto/referential/ReferentialDto.java | 2 +- ...ReferentialDtos.java => ReferentialHelper.java} | 2 +- .../services/dto/referential/SpeciesListDto.java | 2 +- .../{VesselDtos.java => VesselHelper.java} | 2 +- ...Dtos.java => VesselActivityLonglineHelper.java} | 4 +- ...ineDtos.java => VesselActivitySeineHelper.java} | 4 +- ...CategoryDtos.java => WeightCategoryHelper.java} | 4 +- .../observe/services/dto/result/SaveResultDto.java | 2 +- .../{SaveResultDtos.java => SaveResultHelper.java} | 2 +- ...ultDtos.java => TripChildSaveResultHelper.java} | 2 +- .../services/dto/seine/ActivitySeineDto.java | 2 +- .../services/dto/seine/ActivitySeineStubDto.java | 2 +- .../seine/FloatingObjectTransmittingBuoyDto.java | 2 +- .../seine/GearUseFeaturesMeasurementSeineDto.java | 2 +- .../ird/observe/services/dto/seine/RouteDto.java | 8 +- .../observe/services/dto/seine/SetSeineDto.java | 2 +- ...TargetCatchDtos.java => TargetCatchHelper.java} | 4 +- .../services/dto/seine/TargetLengthDto.java | 2 +- .../observe/services/dto/seine/TripSeineDto.java | 10 +- .../src/main/xmi/observe-services-dto-seine.zargo | Bin 59520 -> 58913 bytes services-dto/src/main/xmi/observe-services-dto.ini | 265 +++++++ .../main/xmi/observe-services-dto.objectmodel-ext | 216 ------ services-rest/pom.xml | 2 +- .../seine/TripSeineGearUseServiceRestTest.java | 28 +- services-runner/pom.xml | 2 +- services-topia-validation/pom.xml | 2 +- services-topia-validators/pom.xml | 2 +- services-topia/pom.xml | 2 +- .../services/topia/ObserveSecurityHelper.java | 6 +- .../services/topia/ObserveServiceTopia.java | 6 +- .../topia/binder/BinderEngineInitializer.java | 234 +++---- .../services/topia/binder/BinderSupport.java | 8 +- .../topia/binder/data/ActivityLonglineBinder.java | 2 + .../topia/binder/data/ActivitySeineBinder.java | 6 + .../data/ActivitySeineObservedSystemDtoBinder.java | 62 -- .../topia/binder/data/DataBinderSupport.java | 8 +- .../FloatingObjectObservedSpeciesDtoBinder.java | 3 +- .../FloatingObjectSchoolEstimateDtoBinder.java | 3 +- .../FloatingObjectTransmittingBuoyDtoBinder.java | 3 +- .../topia/binder/data/NonTargetLengthBinder.java | 8 +- .../binder/data/ObjectObservedSpeciesBinder.java | 8 +- .../binder/data/ObjectSchoolEstimateBinder.java | 8 +- .../topia/binder/data/SetLonglineBinder.java | 4 + .../topia/binder/data/TargetSampleBinder.java | 2 +- .../topia/binder/data/TripLonglineBinder.java | 8 +- .../topia/binder/data/TripSeineBinder.java | 8 +- .../topia/service/DataSourceServiceTopia.java | 4 +- .../topia/service/ReferentialServiceTopia.java | 24 + .../topia/service/TripManagementServiceTopia.java | 4 +- .../longline/ActivityLonglineServiceTopia.java | 4 +- .../service/longline/SetLonglineServiceTopia.java | 18 +- .../ActivitySeineObservedSystemServiceTopia.java | 67 -- .../service/seine/ActivitySeineServiceTopia.java | 2 - .../topia/service/seine/RouteServiceTopia.java | 4 +- .../service/seine/TargetCatchServiceTopia.java | 6 +- .../topia/service/seine/TripSeineServiceTopia.java | 9 +- .../topia/binder/BinderEngineMetadataTest.java | 2 +- .../services/topia/binder/BinderEngineTest.java | 2 - .../seine/TripSeineGearUseServiceTopiaTest.java | 6 +- services/pom.xml | 2 +- .../src/main/filters/observe-reports.properties | 31 +- .../observe/services/ObserveServicesProvider.java | 3 - .../services/service/ReferentialService.java | 11 +- .../service/actions/report/ReportBuilder.java | 5 +- ...orDtos.java => ValidateResultForDtoHelper.java} | 2 +- .../{ValidatorDtos.java => ValidatorHelper.java} | 2 +- .../seine/ActivitySeineObservedSystemService.java | 47 -- .../actions/report/observe-reports-test.properties | 2 + test/pom.xml | 2 +- toolbox-maven-plugin/pom.xml | 2 +- topia-extension/pom.xml | 14 +- .../sql/batch/actions/ReplicateTablesAction.java | 102 ++- topia-templates-extension/pom.xml | 2 +- .../templates/TopiaMetadataModelGenerator.java | 10 +- 317 files changed, 3369 insertions(+), 4083 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.