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 857c8ac [jgitflow-maven-plugin]merging 'release/5.1.1' into 'master-5.x' adds b30fd20 Problèmes lors de la synchro du référentiel de bases locales (Fixes #8853) adds b1ead72 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 141f868 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' adds b40b4a1 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds cf888e3 Classement des marées dans l'arbre (fixes #8861) adds 6215985 Impossible d'exporter des marées en mode serveur (Fixes #8862) adds b8e381e Problème de chargement du fichier des talbeaux de synthèse (Fixes #8865) adds d4f2db8 Mémorisation du dernier dossier utilisé (Fixes #8864) adds ee023b2 [persistence] Toujours utiliser la configuration hibernate customisé même pour les services de topia (Fixes #8868) adds 786cb56 [stack] updates to guava 20.0 adds fed98e0 L'application ne gère pas bien le rappel du formulaire ouvert (Fixes #8858) adds 57fb691 Problème d'interprétation de coordonnée en DMD par le widget (fixes #8860) adds 54648e1 [stack] use last stable of topia adds b2dd0c1 [jgitflow-maven-plugin]updating poms for 5.1.2 branch with snapshot versions adds 57eaede [jgitflow-maven-plugin]updating poms for branch'release/5.1.2' with non-snapshot versions adds 9094028 Add missing license header adds 1e828f8 [jgitflow-maven-plugin]merging 'release/5.1.2' into 'master-5.x' No new revisions were added by this update. Summary of changes: application-swing-configuration/pom.xml | 2 +- .../src/main/config/ObserveSwingApplication.ini | 8 +++++ ...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 +- application-swing-validation/pom.xml | 2 +- application-swing-validators/pom.xml | 2 +- application-swing/pom.xml | 2 +- .../ui/actions/ImportStorageFromFileAction.java | 8 +++++ .../swing/ui/actions/ShowConfigAction.java | 1 + .../application/swing/ui/admin/AdminUIModel.java | 6 ++-- .../swing/ui/admin/report/ReportModel.java | 3 +- .../list/impl/longline/TripLonglinesUIHandler.java | 13 ++++---- .../list/impl/seine/TripSeinesUIHandler.java | 13 ++++---- .../ui/content/open/ContentOpenableUIHandler.java | 15 +++++++++ .../swing/ui/storage/tabs/DataSelectionModel.java | 14 ++++---- .../swing/ui/tree/ObserveTreeHelper.java | 5 ++- .../loadors/ProgramLonglineNodeChildLoador.java | 4 +-- .../tree/loadors/ProgramSeineNodeChildLoador.java | 4 +-- application-web-configuration/pom.xml | 2 +- application-web/pom.xml | 2 +- .../v1/longline/TripLonglineServiceController.java | 6 ++-- .../v1/seine/TripSeineServiceController.java | 6 ++-- entities-migration/pom.xml | 2 +- entities/pom.xml | 2 +- .../observe/ObserveTopiaApplicationContext.java | 12 ------- .../fr/ird/observe/ObserveTopiaConfiguration.java | 6 ++++ .../entities/longline/TripLonglineTopiaDao.java | 4 +-- .../observe/entities/seine/TripSeineTopiaDao.java | 4 +-- pom.xml | 8 ++--- services-configuration-rest/pom.xml | 2 +- services-configuration-topia/pom.xml | 2 +- services-configuration/pom.xml | 2 +- services-dto/pom.xml | 2 +- ...ataReferenceSet.java => DataReferenceList.java} | 16 ++++----- .../ird/observe/services/dto/DataReferenceSet.java | 6 ++-- .../services/dto}/ObserveBlobsContainer.java | 2 +- ...nceSet.java => ReferenceCollectionSupport.java} | 9 ++--- ...pter.java => ObserveBlobsContainerAdapter.java} | 39 +++++++++++++--------- .../services/dto/gson/ObserveDtoGsonSupplier.java | 5 +++ ...tAdapter.java => DataReferenceListAdapter.java} | 16 ++++++--- .../gson/reference/DataReferenceSetAdapter.java | 8 ++++- ...java => ReferenceCollectionSupportAdapter.java} | 18 +++++----- .../reference/ReferentialReferenceSetAdapter.java | 8 ++++- .../dto/referential/ReferentialReferenceSet.java | 10 +++--- services-rest/pom.xml | 2 +- .../services/rest/http/ObserveResponseBuilder.java | 30 ++++++++--------- .../seine/TripSeineGearUseServiceRestTest.java | 6 ++-- .../service/seine/TripSeineServiceRestTest.java | 6 ++-- services-runner/pom.xml | 2 +- services-topia-validation/pom.xml | 2 +- services-topia-validators/pom.xml | 2 +- services-topia/pom.xml | 2 +- .../services/topia/ObserveServiceTopia.java | 38 ++++++++++++++++----- .../service/ImportTripScriptTopiaSqlWork.java | 2 +- .../topia/service/ReferentialServiceTopia.java | 4 +-- .../service/SqlScriptProducerServiceTopia.java | 2 +- .../topia/service/TripManagementServiceTopia.java | 2 +- .../service/longline/TripLonglineServiceTopia.java | 18 +++++----- .../topia/service/seine/TripSeineServiceTopia.java | 12 ++++--- .../service/TripManagementServiceTopiaTest.java | 5 +-- .../service/seine/TripSeineServiceTopiaTest.java | 12 +++---- services/pom.xml | 2 +- .../service/AddSqlScriptProducerResult.java | 1 + .../service/longline/TripLonglineService.java | 6 ++-- .../services/service/seine/TripSeineService.java | 6 ++-- .../services/service/trip/ExportTripResult.java | 2 +- .../services/service/trip/ImportTripRequest.java | 2 +- test/pom.xml | 2 +- toolbox-maven-plugin/pom.xml | 2 +- topia-extension/pom.xml | 2 +- topia-templates-extension/pom.xml | 2 +- 73 files changed, 283 insertions(+), 197 deletions(-) copy services-dto/src/main/java/fr/ird/observe/services/dto/{DataReferenceSet.java => DataReferenceList.java} (62%) rename {services/src/main/java/fr/ird/observe/services/service => services-dto/src/main/java/fr/ird/observe/services/dto}/ObserveBlobsContainer.java (97%) rename services-dto/src/main/java/fr/ird/observe/services/dto/{AbstractReferenceSet.java => ReferenceCollectionSupport.java} (83%) copy services-dto/src/main/java/fr/ird/observe/services/dto/gson/{ImmutableMapAdapter.java => ObserveBlobsContainerAdapter.java} (53%) copy services-dto/src/main/java/fr/ird/observe/services/dto/gson/reference/{DataReferenceSetAdapter.java => DataReferenceListAdapter.java} (71%) rename services-dto/src/main/java/fr/ird/observe/services/dto/gson/reference/{AbstractReferenceSetAdapter.java => ReferenceCollectionSupportAdapter.java} (73%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.