This is an automated email from the git hooks/post-receive script. New change to branch develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from b40b4a1 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new cf888e3 Classement des marées dans l'arbre (fixes #8861) new 6215985 Impossible d'exporter des marées en mode serveur (Fixes #8862) new b8e381e Problème de chargement du fichier des talbeaux de synthèse (Fixes #8865) new d4f2db8 Mémorisation du dernier dossier utilisé (Fixes #8864) new ee023b2 [persistence] Toujours utiliser la configuration hibernate customisé même pour les services de topia (Fixes #8868) new 786cb56 [stack] updates to guava 20.0 new fed98e0 L'application ne gère pas bien le rappel du formulaire ouvert (Fixes #8858) The 7 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 fed98e069d011b16f9012da5d21f5fc102bd0233 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 10 16:10:58 2016 +0100 L'application ne gère pas bien le rappel du formulaire ouvert (Fixes #8858) commit 786cb56829fa485cf7f868b7f4fdf7cddd177f03 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 10 15:55:13 2016 +0100 [stack] updates to guava 20.0 commit ee023b2817b4022a5faa36761f18ea12cce5cb80 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 10 15:54:33 2016 +0100 [persistence] Toujours utiliser la configuration hibernate customisé même pour les services de topia (Fixes #8868) commit d4f2db82d0783e5d59d5afbdf817a611d552a426 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 10 13:27:54 2016 +0100 Mémorisation du dernier dossier utilisé (Fixes #8864) commit b8e381e6d08bc6cbe80d8c2c3309628589fe2a25 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 10 13:01:08 2016 +0100 Problème de chargement du fichier des talbeaux de synthèse (Fixes #8865) commit 62159851ad43de078968b66e6ee8b8e05056a747 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 10 12:49:51 2016 +0100 Impossible d'exporter des marées en mode serveur (Fixes #8862) commit cf888e3f3ddd959ea84dce07e74a5df87c5b975e Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 10 11:13:34 2016 +0100 Classement des marées dans l'arbre (fixes #8861) Summary of changes: .../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 + .../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 +- .../v1/longline/TripLonglineServiceController.java | 6 +-- .../v1/seine/TripSeineServiceController.java | 6 +-- .../observe/ObserveTopiaApplicationContext.java | 12 ------ .../fr/ird/observe/ObserveTopiaConfiguration.java | 6 +++ .../entities/longline/TripLonglineTopiaDao.java | 4 +- .../observe/entities/seine/TripSeineTopiaDao.java | 4 +- pom.xml | 4 +- ...ataReferenceSet.java => DataReferenceList.java} | 16 ++++---- .../ird/observe/services/dto/DataReferenceSet.java | 6 +-- .../services/dto}/ObserveBlobsContainer.java | 2 +- ...nceSet.java => ReferenceCollectionSupport.java} | 9 ++-- .../dto/gson/ObserveBlobsContainerAdapter.java | 48 ++++++++++++++++++++++ .../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/http/ObserveResponseBuilder.java | 30 +++++++------- .../seine/TripSeineGearUseServiceRestTest.java | 6 +-- .../service/seine/TripSeineServiceRestTest.java | 6 +-- .../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 +++--- .../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 +- 50 files changed, 282 insertions(+), 157 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%) create mode 100644 services-dto/src/main/java/fr/ird/observe/services/dto/gson/ObserveBlobsContainerAdapter.java 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>.