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 297abc7 [jgitflow-maven-plugin]merging 'release/5.1.3' into 'master-5.x' adds cdb9862 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 721a9b6 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' adds b08bf92 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 3817bcf Exception si tentative de suppression d'une espèce (Fixes #8878) adds d390496 Problèmes d'affichage des formulaires depuis la 5.1.3 (Fixes #8877) adds da2cd13 Erreur sur suppression d'une espèce (avec remplacement) (fixes #8880) adds 1ee38e0 Plantage de la synchro avancée de référentiel (Fixes #8882) adds 0c706f9 Use Topia 3.2 and Hibernate 5.1.3 (fixes #8889) adds f0b461c Le transfert de 4 nouvelles marées de droite à gauche n'aboutit pas (Fixes #8887) adds bd1be8b [iso] improve log of error adds b069328 Nouvelle icône (Fixes #8886) adds 8badf21 optimize dependencies adds 35273c5 Mise à jour des libraries (Fixes #8891) adds 07dc206 Rendre le dialogue de désactivation plus explicite (fixes #8879) adds 67a4c13 Synchro avancée de référentiel : griser les boutons des modes de fonctionnement non pertinents (Fixes #8881) adds d6af5b0 Droits sur synchro avancée de marée (Fixes #8884) adds 1fac842 [jgitflow-maven-plugin]updating poms for 5.1.4 branch with snapshot versions adds 90c5fac [jgitflow-maven-plugin]updating poms for branch'release/5.1.4' with non-snapshot versions adds 61050b6 Add missing license header adds a024bdb [jgitflow-maven-plugin]merging 'release/5.1.4' into 'master-5.x' No new revisions were added by this update. Summary of changes: application-swing-configuration/pom.xml | 2 +- application-swing-decoration/pom.xml | 2 +- .../swing/decoration/DecoratorService.java | 4 +- application-swing-validation/pom.xml | 2 +- application-swing-validators/pom.xml | 2 +- application-swing/pom.xml | 2 +- .../application/swing/ui/ObserveMainUI.jcss | 2 +- .../ird/observe/application/swing/ui/UIHelper.java | 86 ++++++++++ .../swing/ui/actions/ShowAboutAction.java | 4 +- .../application/swing/ui/admin/AdminUIModel.java | 22 ++- .../synchronize/data/DataSynchroUIHandler.java | 19 ++- .../ng/ReferentialSynchroUIHandler.java | 35 +++- .../swing/ui/content/ContentUIManager.java | 1 + .../ui/content/ref/ContentReferenceUIHandler.java | 73 ++++----- .../ref/usage/UsageForDeleteUI.jaxx} | 64 +++----- .../content/ref/usage/UsageForDeleteUIHandler.java | 70 ++++++++ .../ref/usage/UsageForDesactivateUI.jaxx} | 66 +++----- .../ref/usage/UsageForDesactivateUIHandler.java | 71 ++++++++ .../ui/content/ref/usage/UsageForDisplayUI.jaxx | 62 +++++++ .../ref/usage/UsageForDisplayUIHandler.java | 33 ++-- .../ref/usage/UsageUIHandlerSupport.java} | 180 +++++++++++---------- .../i18n/application-swing_en_GB.properties | 1 + .../i18n/application-swing_es_ES.properties | 1 + .../i18n/application-swing_fr_FR.properties | 1 + .../src/main/resources/icons/logo OT_rvb.png | Bin 143337 -> 0 bytes .../src/main/resources/icons/logo-OT_web.png | Bin 34309 -> 0 bytes .../src/main/resources/icons/logo-small.png | Bin 0 -> 46914 bytes .../src/main/resources/icons/logo.png | Bin 0 -> 232898 bytes application-web-configuration/pom.xml | 2 +- application-web/pom.xml | 2 +- entities-migration/pom.xml | 2 +- entities/pom.xml | 13 +- .../observe/ObserveTopiaApplicationContext.java | 10 +- .../fr/ird/observe/ObserveTopiaConfiguration.java | 15 +- .../entities/migration/ObserveMigrationEngine.java | 4 +- pom.xml | 60 ++++--- services-configuration-rest/pom.xml | 2 +- services-configuration-topia/pom.xml | 2 +- services-configuration/pom.xml | 2 +- services-dto/pom.xml | 2 +- services-rest/pom.xml | 2 +- services-runner/pom.xml | 2 +- services-topia-validation/pom.xml | 2 +- services-topia-validators/pom.xml | 2 +- services-topia/pom.xml | 2 +- .../services/topia/ObserveServiceFactoryTopia.java | 4 +- services/pom.xml | 2 +- .../ng/ReferentialSynchronizeService.java | 9 +- src/site/resources/images/logo-OT_web.png | Bin 34309 -> 0 bytes src/site/resources/images/logo-small.png | Bin 0 -> 46914 bytes src/site/resources/images/logo.png | Bin 0 -> 232898 bytes src/site/rst/index.rst | 8 +- src/site/site_fr.xml | 2 +- test/pom.xml | 2 +- toolbox-maven-plugin/pom.xml | 2 +- topia-extension/pom.xml | 10 +- .../sql/batch/TopiaSqlBatchServiceImpl.java | 39 ++--- .../sql/batch/actions/AbstractSchemaAction.java | 38 +++++ .../sql/batch/actions/AbstractSqlAction.java | 2 +- .../sql/batch/actions/CreateSchemaAction.java | 24 +-- .../sql/batch/actions/DropSchemaAction.java | 36 ++--- .../sql/batch/actions/ReplicateTablesAction.java | 22 ++- topia-templates-extension/pom.xml | 2 +- 63 files changed, 753 insertions(+), 380 deletions(-) copy application-swing/src/main/java/fr/ird/observe/application/swing/ui/{usage/UsagesUI.jaxx => content/ref/usage/UsageForDeleteUI.jaxx} (53%) create mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDeleteUIHandler.java rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/{usage/UsagesUI.jaxx => content/ref/usage/UsageForDesactivateUI.jaxx} (53%) create mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDesactivateUIHandler.java create mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDisplayUI.jaxx copy entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineImpl.java => application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDisplayUIHandler.java (58%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/{usage/UsagesUIHandler.java => content/ref/usage/UsageUIHandlerSupport.java} (50%) delete mode 100644 application-swing/src/main/resources/icons/logo OT_rvb.png delete mode 100644 application-swing/src/main/resources/icons/logo-OT_web.png create mode 100644 application-swing/src/main/resources/icons/logo-small.png create mode 100644 application-swing/src/main/resources/icons/logo.png delete mode 100644 src/site/resources/images/logo-OT_web.png create mode 100644 src/site/resources/images/logo-small.png create mode 100644 src/site/resources/images/logo.png -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.