This is an automated email from the git hooks/post-receive script. New change to branch master in repository tutti. See http://git.codelutin.com/tutti.git from e032832 Merge branch 'release/3.11.4' adds ad35264 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 5d7c8d6 Merge branch 'master' into develop adds 36bc899 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 9824b90 use jaxx 2.22 and codelutinpom 1.8 adds 4a77534 do not fix statuses id adds 1972ba4 use codelutinpom 1.8.1 adds c757e5b use codelutinpom 1.8.1 adds 0a15155 - add svg background for the weights - update weights in the svg dynamically adds fe05bc2 - popup de saisie des poids - i18n pour les labels adds a000b7e resize text boxes dynamically adds 259cbfd ajout du champ vrac trié adds 3458fbf refs #6453 [CAPTURE] compléter l'écran résumé avec un poids adds 189b50d fix dependencies adds 328fd81 add getDataorComputedData method adds 28d0af6 clean code adds afe0a89 fix weight popup dimension adds 63a362b clean code adds a754747 use new API adds 2a4947f improve code adds 5748d32 center panel + add FIXME on validator adds 43ef7e4 refs #6453 [CAPTURE] compléter l'écran résumé avec un poids label non modifiables en italique adds dfcc32b refs #6453 resize the svg dinacally adds 5022287 refs #6453 ajout des fractions + coloration de certains champs sous certaines conditions adds e13dc4b refs #6453 ajout du nombre d'espèces adds 410b9db refactor adds 709bf74 utilisation d'alias dans les configurations (cela simplifie l'ecriture des scripts de lancement) adds 2d95c75 ajout du module de lancement adds c5e667d ajout du module de mise à jour adds fe6e892 mise en place des nouveaux modules et du packaging adds 70df547 nettoyage scripts adds df7ada6 lors de la suppression d'une base, nettoyage aussi des pieces jointes associées adds b1e3b89 be able to change distro url adds c1a7d2f launcher does not have the same version (and even should not be part of main build) adds 6c1600f at release time ask for version of each module adds cdf020f suppression du module launcher (c'est un proet à part) adds 84d4aaf amelioration de la definition de distrourl adds 818d7b6 utilisation de tutti-launcher (mais pas inclut comme dépendance du module ui) adds c4735b6 copie du launcher au bon endroit adds 1b67b84 fix application directory adds c6126b5 amelioration du code de mise à jour adds 008931c do not use bin classifier on launcher + fix updater dependency scope adds 7f0238d improve code adds e80e9eb add report null module + fix assembly adds aec898a fix report path adds 9ea20f1 fix readme adds 35cd499 Do not delete i18n component when updates tutti adds e2a97c5 improve updater code adds 06fc14d remove code adds 02e8bf4 improve assembly files adds 416435e use tutti-launcher 1.0 adds 06037f2 merge 6376 to develop adds 34daab3 still deliver .bat scripts, .exe does not work sometimes adds 4aa9c54 ajout de la propriete code sur une categorie adds b9e932b changement de la propriete de la categorie dans l'export generique adds c9adf89 fixes #6373 adds cb4e313 [jgitflow-maven-plugin]updating poms for branch '3.12' with snapshot versions adds e85a294 prepare release adds b078a47 [jgitflow-maven-plugin]updating poms for branch'release/3.12' with non-snapshot versions adds ab1d55b Merge branch 'release/3.12' No new revisions were added by this update. Summary of changes: pom.xml | 128 +++- src/site/rst/referential.rst | 6 +- src/update/tutti-application.properties | 15 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 6 + .../fr/ifremer/tutti/TuttiConfigurationOption.java | 2 +- .../data/SampleCategoryModelConverter.java | 13 +- .../entities/data/SampleCategoryModelEntry.java | 20 +- .../src/main/xmi/tutti-persistence.zargo | Bin 57987 -> 58181 bytes .../config/TuttiPersistenceConfigTest.java | 8 + tutti-service/pom.xml | 2 +- tutti-service/src/license/THIRD-PARTY.properties | 19 +- .../service/catches/WeightComputingService.java | 27 +- .../service/export/generic/CatchExportModel.java | 2 +- .../resources/i18n/tutti-service_fr_FR.properties | 2 +- LICENSE.txt => tutti-ui-swing-updater/LICENSE.txt | 0 .../README.txt | 0 tutti-ui-swing-updater/pom.xml | 71 ++ .../tutti/ui/swing/updater/DeleteHelper.java | 167 +++++ .../fr/ifremer/tutti/ui/swing/updater/Module.java | 50 +- .../fr/ifremer/tutti/ui/swing/updater/Updater.java | 368 +++++++++ .../src/main/resources/update_runtime.bat | 31 + .../src/main/resources/update_runtime.sh | 36 + tutti-ui-swing/pom.xml | 112 ++- tutti-ui-swing/src/license/THIRD-PARTY.properties | 17 +- .../{help.xml => full-linux-component.xml} | 43 +- .../src/main/assembly/full-linux-i586.xml | 5 +- .../src/main/assembly/full-linux-x64.xml | 5 +- ...ull-component.xml => full-shared-component.xml} | 86 ++- .../src/main/assembly/full-windows-component.xml | 61 +- .../src/main/assembly/full-windows-i586.xml | 5 +- .../src/main/assembly/full-windows-x64.xml | 5 +- tutti-ui-swing/src/main/assembly/full/README.txt | 6 +- .../src/main/assembly/full/linux/tutti-sanity.sh | 10 + .../src/main/assembly/full/linux/tutti.sh | 10 + .../src/main/assembly/full/tutti-sanity.bat | 44 -- .../src/main/assembly/full/tutti-sanity.sh | 41 - tutti-ui-swing/src/main/assembly/full/tutti.bat | 44 -- tutti-ui-swing/src/main/assembly/full/tutti.sh | 41 - .../main/assembly/full/windows/tutti-sanity.bat | 13 + .../src/main/assembly/full/windows/tutti.bat | 12 + .../src/main/assembly/launcher/version.appup | 1 + tutti-ui-swing/src/main/assembly/min/launch.bat | 10 - tutti-ui-swing/src/main/assembly/min/launch.sh | 15 - .../min/launcher.properties} | 17 +- tutti-ui-swing/src/main/assembly/min/update.bat | 84 --- tutti-ui-swing/src/main/assembly/min/update.sh | 74 -- .../main/assembly/{full => }/report/version.appup | 0 tutti-ui-swing/src/main/assembly/standalone.xml | 6 +- .../ui/swing/TuttiApplicationUpdaterCallBack.java | 8 - .../content/operation/catches/EditCatchesUI.jaxx | 25 +- .../operation/catches/EditCatchesUIHandler.java | 536 ++++++++++++- .../operation/catches/EditCatchesUIModel.java | 84 ++- .../catches/benthos/BenthosBatchUIHandler.java | 19 +- .../catches/benthos/BenthosBatchUIModel.java | 23 + .../marinelitter/MarineLitterBatchUIHandler.java | 8 +- .../catches/species/SpeciesBatchUIHandler.java | 21 +- .../catches/species/SpeciesBatchUIModel.java | 23 + .../ui/swing/util/AbstractTuttiBeanUIModel.java | 6 +- .../EnterWeightUI.css} | 51 +- .../EnterWeightUI.jaxx} | 24 +- .../EnterWeightUIHandler.java} | 27 +- .../ui/swing/util/computable/ComputableData.java | 47 +- .../ui/swing/util/species/EnterMelagWeightUI.css | 72 +- tutti-ui-swing/src/main/resources/EcranResume.svg | 831 +++++++++++++++++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 20 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 29 +- 68 files changed, 2843 insertions(+), 755 deletions(-) copy LICENSE.txt => tutti-ui-swing-updater/LICENSE.txt (100%) copy {tutti-ichtyometer => tutti-ui-swing-updater}/README.txt (100%) create mode 100644 tutti-ui-swing-updater/pom.xml create mode 100644 tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/DeleteHelper.java copy tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/FishingOperations.java => tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/Module.java (53%) create mode 100644 tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/Updater.java create mode 100644 tutti-ui-swing-updater/src/main/resources/update_runtime.bat create mode 100644 tutti-ui-swing-updater/src/main/resources/update_runtime.sh copy tutti-ui-swing/src/main/assembly/{help.xml => full-linux-component.xml} (59%) rename tutti-ui-swing/src/main/assembly/{tutti-full-component.xml => full-shared-component.xml} (69%) copy tutti-ichtyometer/src/main/assembly/tools.xml => tutti-ui-swing/src/main/assembly/full-windows-component.xml (53%) create mode 100644 tutti-ui-swing/src/main/assembly/full/linux/tutti-sanity.sh create mode 100644 tutti-ui-swing/src/main/assembly/full/linux/tutti.sh delete mode 100644 tutti-ui-swing/src/main/assembly/full/tutti-sanity.bat delete mode 100644 tutti-ui-swing/src/main/assembly/full/tutti-sanity.sh delete mode 100644 tutti-ui-swing/src/main/assembly/full/tutti.bat delete mode 100644 tutti-ui-swing/src/main/assembly/full/tutti.sh create mode 100644 tutti-ui-swing/src/main/assembly/full/windows/tutti-sanity.bat create mode 100644 tutti-ui-swing/src/main/assembly/full/windows/tutti.bat create mode 100644 tutti-ui-swing/src/main/assembly/launcher/version.appup delete mode 100644 tutti-ui-swing/src/main/assembly/min/launch.bat delete mode 100755 tutti-ui-swing/src/main/assembly/min/launch.sh copy tutti-ui-swing/src/main/{filtered-resources/tutti.config => assembly/min/launcher.properties} (67%) delete mode 100644 tutti-ui-swing/src/main/assembly/min/update.bat delete mode 100644 tutti-ui-swing/src/main/assembly/min/update.sh rename tutti-ui-swing/src/main/assembly/{full => }/report/version.appup (100%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/{species/SelectSpeciesUI.css => catches/EnterWeightUI.css} (51%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/{species/EnterMelagWeightUI.jaxx => catches/EnterWeightUI.jaxx} (74%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/{species/EnterMelagWeightUIHandler.java => catches/EnterWeightUIHandler.java} (72%) create mode 100644 tutti-ui-swing/src/main/resources/EcranResume.svg -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.