[Observe-commits] branch master-5.x updated (011e671 -> 2bd88a9)

This is an automated email from the git hooks/post-receive script. New change to branch master-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 011e671 [jgitflow-maven-plugin]merging 'release/5.0.2' into 'master' adds 00befa7 [jgitflow-maven-plugin]updating poms for 5.1-SNAPSHOT development adds 1503e4e [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 71b2494 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 0caab03 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds a2f2ad7 Use new ini format for configuration description adds 8278ce8 Use last stable of nuiton-config adds 555e473 Use new eugene apis adds 2d618f7 use commons-collections4 adds cae497f use ini model extension format + remove usage of commons-collections adds e2dabed Use last stable of eugene adds 246afa1 Remove wrong code adds 87141d9 Add missing bindings adds c4423a4 Reset cleanly quadrants (See #8588) adds 0be6f9d Encore le widget positions (Fixes #8588) adds d6aa58a Use last stable of ToPIA adds 1d38965 Use new bean transformer adds f76fb6f Use last stable of eugene adds db50d47 Use last stable of topia adds d8bb540 use c3p0 adds f942af0 [LL] Problème de copie de marée avec des pièces-jointes (Fixes #8670) adds 1b49a13 Deal with null blobs adds 160656a Fix test isolation adds 1b97f2a update xsd adds a539bb8 [ObserveLL] Trip - SensorUsed : laisser le bouton importer disponible même si un fichier a déjà été téléchargé (fixes #6470) adds cf16032 clean code adds 0ae63be Action/calculer les données : sélection de la marée par défaut (Fixes #2893) adds d4ee717 Remontée des identifiants de type d'activité adds 5f545dc Chargement des sous formulaires en adéquation avec le type d'activité bateau (LL) adds 7d68bea [LL] Piloter les fonctions/formulaires disponibles en fonction du type d'activité choisi (Fixes #6702) Merge branch 'feature/6702' into develop adds 32e4194 Utilisation d'un TimeEditor pour le temps depuis le déclenchement (écran Capture) adds 34ceb86 Utilisation d'un TimeEditor pour le temps depuis le déclenchement (écran Avançon) adds 2bdb052 [LL] Formulaire Composition détaillée / onglet "Détail Avançon" : Quelques améliorations (Fixes #6769) Merge branch 'feature/6769' into develop adds 96c9189 Clean code + create set if possible (PS) adds 4710a85 Clean code + create set if possible (LL) adds fa0a49c [LL/PS] amélioration sur l'écran activité (Fixes #6834) Merge branch 'feature/6834' into develop adds a5a646e changement du classement des navires et des ports sur l'écran de marée (PS) adds 6653381 changement du classement des navires et des ports sur l'écran de marée (LL) adds f38a75c [LL][PS] Formulaires Marée : quelques améliorations d'ergonomie (Fixes #6776) Merge branch 'feature/6776' into develop adds dd0d0c5 Remaniement de l'écran d'opération de pêche (LL) adds 06d9f4a Ne pas activer certains champs si pas de cyalumes de renseignée adds 67ee001 [LL] réorganisation du layout du formulaire Activité/Opération de pêche/Caractéristiques pour rapprocher les informations associées (Fixes #7881) Merge branch 'feature/7881' into develop adds 2290105 [LL] le champ devenir capture doit être obligatoire (fixes #7888) adds 1b0d03c Suppression de classes qui sont désormais générées adds 5ac26ae Ajout de l'option ui.coordinate.format (CoordinateFormat) adds eb2bd47 Utilisation de la valeur de la configuration pour initialiser le format d'un éditeur de positions adds 7cd954c [UI][PS][LL] Widget des positions DMD par défaut (fixes #8394) Merge branch 'feature/8394' into develop adds cd3c3c3 Arrondi à 4 décimales du poids de capture ciblé (persistence) adds 428c3a5 Arrondi à 4 décimales du poids de capture ciblé (UI) adds f07bef0 Amélioration taille colonnes tableaux adds e77e66e [UI] Masque de saisie sur les formulaires captures (et surtout) rejets de thonidés (Fixes #8395) Merge branch 'feature/8395' into develop adds 35c679d introduce node package adds de88bd5 introduce renderer package adds 2691002 Nettoyage de code adds 7640d6f Onb remonte le programme dans les marées sur les stubs adds 1b633a4 Chargement des toutes les marées (sinon on ne peut pas en connaitre le nombre par programme) adds 6568734 Remonté du nombre de routes par marée adds dd1b9ea Récupération du bon nœud de Marée adds d1ae1f0 Chargement dans l'arbre du nombre de route par marée adds 85d7849 On doit toujours recharger le nœud de la marée dès que le nombre de routes change adds a001a2c Ajouter le nombre de marées par programme et le nombre de routes par marée adds 38d7a6d Petites améliorations ergonomiques dans l'arbre (Fixes #8576) Merge branch 'feature/8576' into develop adds 6cce00a [LL] état appâts au filage doit être un champ non obligatoire (Fixes #7885) adds 8cb1ed6 [LL] taille hameçon doit être un champ non obligatoire (fixes #7884) adds 29cafc3 Move to snpashot of jaxx adds a7b26cc Ajout directive pour remplir avec des zéros les coordonnées non nulles adds a097cdd Use last stable of jaxx adds 3c6e833 [LL] défaut d'affichage coord DMD (Fixes #7891) Merge branch 'feature/7891' into develop adds 24f3443 [LL] champ boolean «rejeté avec hamecon» doit accepter une valeur NULL (Fixes #7887) adds b0b3fde Ajout des systèmes observés sur le dto ActivitySeine adds 9597e36 ajout de la validation adds 868bca2 Ajout des systèmes observés comme onglet de l'écran d'activité adds 88e8262 suppression de l'ancien écran systèmes observés et tout ce qui s'y rapporte adds 79078b2 [PS] Forcer l'utilisateur à consulter l'écran "Systèmes observés" (Fixes #6840) Merge branch 'feature/6840' into develop adds f17ffef Ajout d'une eénumration ReportType et utilisation dans l'écran de configuration des rapports adds b3e25ab Filtrage sur le type de modèle à utiliser pour sélectionner les marées disponibles adds c67f4e4 Déplacement de ReportType en ObserveModelType + ajout de ce type sur les rapports adds 8483a4e Pour les rapports, proposer un choix sur le type de marées à utiliser (Fixes #6853) Merge branch 'feature/6853' into develop adds 7a69690 [PS] Améliorer l'ergonomie de l'écran de saisie des mensurations de non target (Fixes #7511) adds 560313e [REFERENTIEL] Automatiser la réattribution de code lors de la désactivation ou la suppression d'une ligne de référentiel (fixes #8338) adds 389f441 Ajout du type de marée LL adds cabd563 amélioration de l'algorithme de détection du nœud trip adds 576bc1d Conditionner l'utilisation selon le type de marée (LL) adds 99a2471 [LL] Mode de saisie des captures 'groupé' par défaut dans le cas d'une marée auto-échantillonnage (Fixes #7889) Merge branch 'feature/7889' into develop adds ca01bdd fix tests adds ba50d32 refs #8554 : changement de la configuration du pool de connections adds eb40fd5 fix cherry-pick adds 826ea6c [maven] passage en maintenance adds d37d12f Fix tests adds cc6a18a Correction des validateurs manquants (fixes #8671) adds 059d7e8 Correction des validateurs manquants (fixes #8671) adds ffb7ad6 [jgitflow-maven-plugin]updating poms for 5.2-SNAPSHOT development adds 3400a8a [jgitflow-maven-plugin]updating poms for 5.1 branch with snapshot versions adds 5db1050 [jgitflow-maven-plugin]updating poms for branch'release/5.1' with non-snapshot versions adds f6bbcc2 Add missing license header adds 2bd88a9 [jgitflow-maven-plugin]merging 'release/5.1' into 'master-5.x' No new revisions were added by this update. Summary of changes: 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 +- .../ird/observe/services/dto/ObserveModelType.java | 14 +- .../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, 3366 insertions(+), 4081 deletions(-) create mode 100644 application-swing-configuration/src/main/config/ObserveSwingApplication.ini delete mode 100644 application-swing-configuration/src/main/config/ObserveSwingApplication.toml delete mode 100644 application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigAction.java delete mode 100644 application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigOption.java delete mode 100644 application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineObservedSystemDto-ui-update-error-validation.xml delete mode 100644 application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineObservedSystemDto-ui-update-warning-validation.xml delete mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUI.jaxx delete mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUI.jcss delete mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java delete mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUIModel.java rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/AbstrctReferenceNodeSupport.java (96%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/ActivityLonglineNode.java (93%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/ActivitySeineNode.java (93%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/DataReferenceNodeSupport.java (96%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/FloatingObjectSeineNode.java (93%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/ObserveNode.java (98%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/ProgramLonglineNode.java (72%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/ProgramSeineNode.java (71%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/ReferentialReferenceNodeSupport.java (95%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/RouteSeineNode.java (96%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/SetLonglineNode.java (93%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/SetSeineNode.java (93%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/TripLonglineNode.java (96%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/TripSeineNode.java (80%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => renderer}/AbstractObserveTreeCellRenderer.java (90%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => renderer}/DataSelectionTreeCellRenderer.java (95%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => renderer}/NavigationTreeCellRenderer.java (96%) create mode 100644 application-web-configuration/src/main/config/ObserveWebApplication.ini delete mode 100644 application-web-configuration/src/main/config/ObserveWebApplication.toml delete mode 100644 application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineObservedSystemServiceController.java create mode 100644 entities/src/main/xmi/observe.ini delete mode 100644 entities/src/main/xmi/observe.objectmodel-ext rename services-dto/src/main/java/fr/ird/observe/services/dto/{IdDtos.java => IdHelper.java} (98%) rename services-dto/src/main/java/fr/ird/observe/services/dto/{ObserveDbUserDtos.java => ObserveDbUserHelper.java} (94%) copy services/src/main/java/fr/ird/observe/services/ObserveService.java => services-dto/src/main/java/fr/ird/observe/services/dto/ObserveModelType.java (84%) rename services-dto/src/main/java/fr/ird/observe/services/dto/longline/{SectionWithTemplates.java => SectionWithTemplateHelper.java} (97%) rename services-dto/src/main/java/fr/ird/observe/services/dto/referential/{GearCaracteristicTypeDtos.java => GearCaracteristicTypeHelper.java} (97%) rename services-dto/src/main/java/fr/ird/observe/services/dto/referential/{I18nReferentialDtos.java => I18nReferentialHelper.java} (95%) rename services-dto/src/main/java/fr/ird/observe/services/dto/referential/{PersonDtos.java => PersonHelper.java} (98%) rename services-dto/src/main/java/fr/ird/observe/services/dto/referential/{ProgramDtos.java => ProgramHelper.java} (97%) rename services-dto/src/main/java/fr/ird/observe/services/dto/referential/{ReferentialDtos.java => ReferentialHelper.java} (98%) rename services-dto/src/main/java/fr/ird/observe/services/dto/referential/{VesselDtos.java => VesselHelper.java} (97%) rename services-dto/src/main/java/fr/ird/observe/services/dto/referential/longline/{VesselActivityLonglineDtos.java => VesselActivityLonglineHelper.java} (92%) rename services-dto/src/main/java/fr/ird/observe/services/dto/referential/seine/{VesselActivitySeineDtos.java => VesselActivitySeineHelper.java} (95%) rename services-dto/src/main/java/fr/ird/observe/services/dto/referential/seine/{WeightCategoryDtos.java => WeightCategoryHelper.java} (96%) rename services-dto/src/main/java/fr/ird/observe/services/dto/result/{SaveResultDtos.java => SaveResultHelper.java} (94%) rename services-dto/src/main/java/fr/ird/observe/services/dto/result/{TripChildSaveResultDtos.java => TripChildSaveResultHelper.java} (92%) rename services-dto/src/main/java/fr/ird/observe/services/dto/seine/{TargetCatchDtos.java => TargetCatchHelper.java} (94%) create mode 100644 services-dto/src/main/xmi/observe-services-dto.ini delete mode 100644 services-dto/src/main/xmi/observe-services-dto.objectmodel-ext delete mode 100644 services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineObservedSystemDtoBinder.java delete mode 100644 services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ActivitySeineObservedSystemServiceTopia.java rename services/src/main/java/fr/ird/observe/services/service/actions/validate/{ValidateResultForDtos.java => ValidateResultForDtoHelper.java} (98%) rename services/src/main/java/fr/ird/observe/services/service/actions/validate/{ValidatorDtos.java => ValidatorHelper.java} (98%) delete mode 100644 services/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.