This is an automated email from the git hooks/post-receive script. New change to branch feature/optimize_application_swing_packages in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git discards 092be3f Move it all! adds 7507619 changement des loggeurs adds f2ef0f2 Ajouter l'heure dans les informations technique d'un référentiel adds 799b1c4 Ajout d'un FIXME qu'il faudrait mieux gérer adds e3e0875 Amélioration de gestion des associations dans les sql batch tables adds 573de56 Correction de la suppression des données adds eece9f6 Can use remote data source in simple referential synchro adds 9993341 Champs non binde :( adds a626ca7 Renommage méthode adds 32aa66b Utilisation d'un meilleur nom de rapport de validation adds 7df5e6a En fait pas besoin des droits en écriture pour l'action de validation adds 13e7865 Transforme la Date en Timestamp (etend date) pour eviter les erreur sql d'update liées aux dates désérialisées adds 309acb4 Corrige typo adds b20d87c Add entity enum + deal with blobs in import - export of trips (introduce a new api to be used soon also for bi-directionnal data synchro) adds 991b551 Improve actions layout adds a872102 Use a unique management trip service for export data and bi-synchro data adds b2ca067 Use a parameter to fix read lock timeout adds eb0ee6a Merge branch 'feature/deal_with_blobs' into develop adds 4ab6758 push back actions before export adds 6b1e172 Corrige la source utilisée pour la récupération des données à valider adds a7c7c6c Gere la désérialisation de proprieté d'objet de type AbstractReference (ex.: ValidateResultForDto) adds c6ae8f1 Corrige l'enregistrement de decorateur de type DataDto adds ddc292d Ajoute une définition et un convertisseur vers DataReference pour le type Tdr adds ba17982 Corrige les definitions enrichies pour basket et branchline en creant des dto specifiques adds bd0289e Corrige l'ajout d'une définition en vérifiant qu'il n'existe pas déjà une définition pour l'entité concernée adds 25b381c Refactorise les entités BasketWithSection et BranchlineWithBasket et corrige les erreurs de compilation adds 571d9c3 Corrige les tests suite à l'ajout des nouveaux bean BasketWithSectionDto et BranchlineWithBasketDto adds 56da77d Renomme également les dto (ex: BasketWithSectionDto -> BasketWithSectionIdDto) adds 9724b0d Corrige les libellés vide concernant les objets invalides dans le fichier de rapport généré adds b62f5c6 Merge branch 'feature/7493_corrige_action_validation_serveur_distant' into 'develop' adds 89aaf3b Dedoublonne les messages de validations adds 5440aa2 Merge branch 'feature/7493_doublons_messages_validation' into 'develop' adds 464c328 Corrige la selection de requete dans le tableau des rapports adds 205fc78 Merge branch 'feature/7498_selection_rapport_tableau_synthese' into 'develop' adds 38a6aa9 Corrige les erreurs liées à la sérialisation/deserialisation des objets adds a2adfbe Merge branch 'feature/4309_correction_synchro_ref_avancee_serveur_distant' into 'develop' adds 51bc418 Remplace ImmutableSet<ReferentilDto> par des ReferntialMultimap dans UnidirectionalReferentialSynchronizeRequest afin de permettre la deserialisation de cet objet adds 6b22754 Corrige les erreurs d'injection des objets de type Request/Result en implémentant le contrat ObserveDto adds 6fcd167 Merge branch 'feature/7677_action_export_donnees_server_distant' into develop adds 5c3df7e Crée le composant BeanTreeHeader visant à offrir un group d'actions facilitant l'utilisation des composants arbre par l'utilisateur adds e4b93d7 Implementation du comportement des boutons de la toolbar du BeanTreeHeader dans le handler adds 1ed5b9c Ajoute des icones sur les boutons du BeanTreeHeader adds 9fc29ff Ajoute le BeanTreeHeader au panneau de sélection des données adds 516acaa Configure le label du BeanTreeHeader avec un attibut de composant 'labelText' adds a3306d0 merge i18n adds 580a86a Optimize css adds d9e1936 Be able to show or not actions (fold or select) of the tree header adds 8df0ff0 Rename tree header id adds 23aa01c Add tree header in other places in application adds b1bd63c Merge branch 'feature/7553_ajoute_un_widget_pour_les_arbres' into develop new 6426a14 Move it all! new 0a827ce fix merges new 6c5d458 Move TreeHEader to new optimized package This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (092be3f) \ N -- N -- N refs/heads/feature/optimize_application_swing_packages (6c5d458) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 3 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 6c5d45806562b1a2e71cc14a54629f530c3fc9d5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 27 13:34:39 2016 +0200 Move TreeHEader to new optimized package commit 0a827cebd4bd4547272034c1bee1331c350979fe Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 27 13:34:21 2016 +0200 fix merges commit 6426a14855b54f2688b03c72dceb207c7e6f6d83 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 23 14:19:34 2016 +0200 Move it all! Summary of changes: .../swing/decoration/DecoratorService.java | 20 +- observe-application-swing/pom.xml | 1 + .../src/main/filters/observe-ui.properties | 7 +- .../ObserveSwingApplicationConfig.java | 3 - .../swing/db/ObserveSwingDataSource.java | 12 +- .../application/swing/ui/ObserveMainUI.jaxx | 9 +- .../application/swing/ui/ObserveMainUI.jcss | 24 ++- .../application/swing/ui/admin/AdminStep.java | 3 +- .../swing/ui/admin/AdminTabUIHandler.java | 96 +++++++++- .../application/swing/ui/admin/AdminUIModel.java | 12 +- .../swing/ui/admin/config/SelectDataUI.jaxx | 8 +- .../swing/ui/admin/export/ExportModel.java | 2 +- .../swing/ui/admin/export/ExportUIHandler.java | 129 +++++-------- .../swing/ui/admin/export/TripEntry.java | 11 ++ .../swing/ui/admin/report/ReportUIHandler.java | 7 - .../swing/ui/admin/save/SaveLocalUIHandler.java | 3 +- .../ui/admin/synchronize/data/DataSynchroUI.jaxx | 8 +- .../synchronize/data/DataSynchroUIHandler.java | 189 +++++++++++-------- .../referential/ng/ReferentialSynchroUI.jaxx | 8 +- .../swing/ui/admin/validate/ValidateModel.java | 9 +- .../swing/ui/admin/validate/ValidateUIHandler.java | 3 +- .../ui/content/ref/ContentReferenceUIHandler.java | 4 +- .../impl/longline/LonglinePositionHelper.java | 10 +- .../swing/ui/storage/StorageUIHandler.java | 4 +- .../swing/ui/storage/StorageUIModel.java | 2 +- .../swing/ui/util/tree/BeanTreeHeader.jaxx | 47 +++++ .../tree/BeanTreeHeader.jcss} | 46 +++-- .../swing/ui/util/tree/BeanTreeHeaderHandler.java | 103 ++++++++++ .../observe-application-swing_en_GB.properties | 20 +- .../observe-application-swing_es_ES.properties | 21 ++- .../observe-application-swing_fr_FR.properties | 24 ++- .../src/main/resources/icons/action-collapse.png | Bin 0 -> 372 bytes .../src/main/resources/icons/action-expand.png | Bin 0 -> 371 bytes .../src/main/resources/icons/action-select.png | Bin 0 -> 392 bytes .../src/main/resources/icons/action-unselect.png | Bin 0 -> 311 bytes .../src/main/resources/log4j.properties | 2 +- .../src/main/resources/observe-log4j.properties | 1 + .../v1/SqlScriptProducerServiceController.java | 3 +- .../export/ReplicateTripServiceController.java | 52 ------ .../data/DataSynchronizeServiceController.java | 32 ---- .../v1/trip/TripManagementServiceController.java | 61 ++++++ .../observe/ObserveTopiaConfigurationFactory.java | 4 +- .../observe/ObserveTopiaPersistenceContext.java | 3 +- .../observe/services/ObserveServicesProvider.java | 7 +- .../service/AddSqlScriptProducerResult.java | 27 +++ .../service/DeleteSqlScriptProducerRequest.java | 21 +-- .../services/service/ObserveBlobsContainer.java | 37 ++++ .../services/service/SqlScriptProducerService.java | 2 +- .../export/ReplicateTripsExportRequest.java | 99 ---------- .../actions/export/ReplicateTripsExportResult.java | 100 ---------- .../actions/export/ReplicateTripsImportResult.java | 90 --------- .../synchro/data/DataSynchronizeRequest.java | 103 ---------- .../synchro/data/DataSynchronizeService.java | 52 ------ .../synchro/data/task/DataSynchronizeCopyTask.java | 14 -- .../data/task/DataSynchronizeDeleteTask.java | 14 -- .../diff/ReferentialSynchronizeDiffService.java | 1 + ...nidirectionalReferentialSynchronizeRequest.java | 35 +++- ...UnidirectionalReferentialSynchronizeResult.java | 3 +- .../ng/ReferentialSynchronizeRequest.java | 9 +- ...entialSynchronizeServiceProduceSqlsRequest.java | 3 +- ...rentialSynchronizeServiceProduceSqlsResult.java | 4 +- .../ng/ReferentialSynchronizeSqlsRequest.java | 3 +- .../DeleteTripRequest.java} | 14 +- .../services/service/trip/DeleteTripResult.java | 26 +++ .../ExportTripRequest.java} | 14 +- .../services/service/trip/ExportTripResult.java | 51 +++++ .../services/service/trip/ImportTripRequest.java | 42 +++++ .../services/service/trip/ImportTripResult.java | 51 +++++ .../TripManagementService.java} | 16 +- ...pAdapter.java => ImmutableMultimapAdapter.java} | 38 +++- .../services/dto/gson/ObserveDtoGsonSupplier.java | 5 + .../dto/gson/ReferentialMultimapAdapter.java | 5 +- .../gson/reference/UnknownReferenceAdapter.java | 69 +++++++ ...{BasketDto.java => BasketWithSectionIdDto.java} | 4 +- ...lineDto.java => BranchlineWithBasketIdDto.java} | 4 +- .../dto/reference/DataReferenceSetDefinitions.java | 33 +++- .../dto/referential/ReferentialMultimap.java | 29 +++ .../services/binder/BinderEngineInitializer.java | 6 + .../services/binder/data/TargetLengthBinder.java | 12 +- .../observe/services/binder/data/TdrBinder.java | 13 +- .../binder/data/TransmittingBuoyBinder.java | 8 +- .../services/service/DataSourceServiceTopia.java | 18 +- .../service/SqlScriptProducerServiceTopia.java | 15 +- .../actions/export/ReplicateTripServiceTopia.java | 115 ------------ .../synchro/data/DataSynchronizeServiceTopia.java | 108 ----------- .../ReferentialSynchronizeDiffServiceTopia.java | 5 +- .../sql/UpdateSqlStatementGenerator.java | 2 +- .../validate/ValidationMessageDetector.java | 19 +- .../service/trip/ImportTripScriptTopiaSqlWork.java | 68 +++++++ .../service/trip/TripManagementServiceTopia.java | 207 +++++++++++++++++++++ .../services/binder/BinderEngineMetadataTest.java | 2 +- .../AddSqlScriptProducerServiceTopiaTest.java | 2 +- .../services/service/MigrateTestsDatabases.java | 6 +- .../persistence/metadata/TopiaMetadataEntity.java | 16 ++ .../nuiton/topia/service/sql/batch/SqlResult.java | 23 +++ .../service/sql/batch/TopiaSqlBatchService.java | 6 +- .../sql/batch/TopiaSqlBatchServiceImpl.java | 75 ++++++-- .../sql/batch/actions/AbstractSqlAction.java | 52 ++++-- .../sql/batch/actions/AbstractTablesAction.java | 48 +---- .../service/sql/batch/actions/BlobsContainer.java | 80 ++++++++ .../sql/batch/actions/DeleteTablesAction.java | 13 +- .../sql/batch/actions/ReplicateTablesAction.java | 71 ++++++- .../service/sql/batch/tables/TopiaSqlTable.java | 36 +++- .../service/sql/batch/tables/TopiaSqlTables.java | 114 +++++++----- .../sql/batch/tables/TopiaSqlTablesFactory.java | 5 +- 105 files changed, 1885 insertions(+), 1288 deletions(-) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tree/BeanTreeHeader.jaxx copy observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/{content/ref/impl/GearCaracteristicUI.jcss => util/tree/BeanTreeHeader.jcss} (57%) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tree/BeanTreeHeaderHandler.java create mode 100644 observe-application-swing/src/main/resources/icons/action-collapse.png create mode 100644 observe-application-swing/src/main/resources/icons/action-expand.png create mode 100644 observe-application-swing/src/main/resources/icons/action-select.png create mode 100644 observe-application-swing/src/main/resources/icons/action-unselect.png delete mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/export/ReplicateTripServiceController.java delete mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/data/DataSynchronizeServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/trip/TripManagementServiceController.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/AddSqlScriptProducerResult.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/ObserveBlobsContainer.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripsExportRequest.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripsExportResult.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripsImportResult.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/data/DataSynchronizeRequest.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/data/DataSynchronizeService.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/data/task/DataSynchronizeCopyTask.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/data/task/DataSynchronizeDeleteTask.java copy observe-services-api/src/main/java/fr/ird/observe/services/service/{actions/synchro/data/task/DataSynchronizeTaskSupport.java => trip/DeleteTripRequest.java} (51%) create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/trip/DeleteTripResult.java rename observe-services-api/src/main/java/fr/ird/observe/services/service/{actions/synchro/data/task/DataSynchronizeTaskSupport.java => trip/ExportTripRequest.java} (51%) create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/trip/ExportTripResult.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/trip/ImportTripRequest.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/trip/ImportTripResult.java rename observe-services-api/src/main/java/fr/ird/observe/services/service/{actions/export/ReplicateTripService.java => trip/TripManagementService.java} (75%) copy observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/{ImmutableMapAdapter.java => ImmutableMultimapAdapter.java} (56%) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/UnknownReferenceAdapter.java rename observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/{BasketDto.java => BasketWithSectionIdDto.java} (88%) rename observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/{BranchlineDto.java => BranchlineWithBasketIdDto.java} (87%) delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripServiceTopia.java delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/data/DataSynchronizeServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/trip/ImportTripScriptTopiaSqlWork.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/trip/TripManagementServiceTopia.java create mode 100644 observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/SqlResult.java create mode 100644 observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/BlobsContainer.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.