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 ec2f51d804f6dd7522c76f7063739b2fe5302f94 Merge: 7b7da62 0af7509 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 11 12:16:07 2016 +0100 Report from v5 Merge branch 'feature/report_from_5' into develop .../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/menu/config/ShowConfigAction.java | 1 + .../menu/storage/ImportStorageFromFileAction.java | 11 +++++- .../swing/ui/admin/config/SelectDataModel.java | 6 ++-- .../swing/ui/admin/export/ExportUIHandler.java | 5 ++- .../swing/ui/admin/report/ReportModel.java | 4 +-- .../swing/ui/storage/StorageUILauncher.java | 6 +--- .../longline/TripLonglineServiceController.java | 6 ++-- .../v1/data/seine/TripSeineServiceController.java | 6 ++-- .../DataSourceMigrationForVersion_6_0.java | 2 +- .../observe/ObserveTopiaApplicationContext.java | 16 ++------- .../fr/ird/observe/ObserveTopiaConfiguration.java | 10 ++++-- pom.xml | 4 +-- .../dto/gson/ArrayListMultimapAdapter.java | 29 +++++---------- .../services/dto/gson/ImmutableMapAdapter.java | 11 ++---- .../dto/gson/ImmutableMultimapAdapter.java | 11 +----- .../services/dto/gson/ImmutableSetAdapter.java | 6 ++-- ...MapAdapter.java => MultimapAdapterSupport.java} | 32 ++++++++++------- .../dto/gson/ObserveBlobsContainerAdapter.java | 42 ++++++++++++++++++++++ .../services/dto/gson/ObserveDtoGsonSupplier.java | 23 +++++++++++- .../services/dto/gson/SetMultimapAdapter.java | 30 ++++++---------- ...tAdapter.java => DataReferenceListAdapter.java} | 16 ++++++--- .../gson/reference/DataReferenceSetAdapter.java | 8 ++++- ...java => ReferenceCollectionSupportAdapter.java} | 18 +++++----- .../reference/ReferentialReferenceSetAdapter.java | 8 ++++- ...ataReferenceSet.java => DataReferenceList.java} | 16 ++++----- .../ird/observe/services/dto/DataReferenceSet.java | 2 +- .../services/dto}/ObserveBlobsContainer.java | 2 +- ...nceSet.java => ReferenceCollectionSupport.java} | 10 +++--- .../dto/referential/LengthLengthParameterDto.java | 10 +++--- .../dto/referential/LengthWeightParameterDto.java | 10 +++--- .../dto/referential/ReferentialMultimap.java | 16 ++++----- .../dto/referential/ReferentialReferenceSet.java | 10 +++--- .../services/rest/http/ObserveResponseBuilder.java | 29 ++++++++------- .../seine/TripSeineGearUseServiceRestTest.java | 6 ++-- .../service/seine/TripSeineServiceRestTest.java | 6 ++-- .../services/topia/ObserveServiceTopia.java | 26 ++++++++++++-- .../service/data/ImportTripScriptTopiaSqlWork.java | 2 +- .../topia/service/data/NavigationServiceTopia.java | 13 ++++--- .../service/data/TripManagementServiceTopia.java | 2 +- .../data/longline/TripLonglineServiceTopia.java | 21 +++++------ .../service/data/seine/TripSeineServiceTopia.java | 15 ++++---- .../referential/ReferentialServiceTopia.java | 12 +++---- .../service/sql/SqlScriptProducerServiceTopia.java | 2 +- .../data/TripManagementServiceTopiaTest.java | 6 ++-- .../data/seine/TripSeineServiceTopiaTest.java | 6 ++-- .../services/service/data/ExportTripResult.java | 2 +- .../services/service/data/ImportTripRequest.java | 2 +- .../services/service/data/NavigationRequest.java | 4 ++- .../services/service/data/NavigationResult.java | 10 +++--- .../service/data/longline/TripLonglineService.java | 7 ++-- .../service/data/seine/TripSeineService.java | 7 ++-- .../service/sql/AddSqlScriptProducerResult.java | 1 + 56 files changed, 334 insertions(+), 243 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.