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 ab1d55b Merge branch 'release/3.12' adds 90ea858 [jgitflow-maven-plugin]updating poms for 3.13-SNAPSHOT development adds 9654d30 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 20653dc [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 9901cbc fixes #6544: [TECH] Permettre que les mises à jour fonctionnent depuis la version 3.7 adds bc27100 fixes #6542: [TECH] Disparition du .bat au démarrage + amélioration du code adds 121fee9 refs #6544 (permettre d'avoir des modules non existants au demarrage) adds 3f56288 refs #6544 (utilisation classifier bin sur tutti.exe) adds d80cceb refs #6539 add also jar laucnher in windows bundle adds 8cf23d7 refs #6539 use launcehr 1.1 adds dc657ef refs #6539 use tutti-launcher 1.0.1 adds fba7db5 refs #6540 adds 472392e fixes #6569 [ERGONOMIE] amélioration de la visibilité et du déclanchement des .csv et .pdf sur les traits adds f2701dc ajout d'une configuration pour les modules adds ff89982 description de toutes les mises à jour possibles dans le module updater (pour réutiliser ce code dans le module d'ui) adds 95b8dcb remove unsued method adds 1922f47 refactor des mises à jour adds 7d56197 fixes #6569 adds 1e5ea6f fixes #6557: [CONFIG] Erreur lors de la sauvegarde de la configuration des catégorisations fixes #6570: Ajout d'une colonne code dans l'écran de configuration des catégorisations adds 4e6cbb1 fixes #6555: [CONFIG] Erreur au chargement de l'ordre des catégorisations dans la config adds 242dea7 fixes #6374 Test sur l'import du protocole qui ne fonctionne pas adds eab1503 can save jdbc url adds d49e9c6 fixes #6573: [CAPUTRE] Ajout de la colonne Id adds 9ea0ad0 refs #6569: [ERGONOMIE] amélioration de la visibilité et du déclanchement des .csv et .pdf sur les traits (tentative d'amélioration du style) adds 5ead1e2 [jgitflow-maven-plugin]updating poms for branch '3.12.1' with snapshot versions adds 2eeed46 fix default-bundle build adds 55b77db add licene headers adds d4debfd [jgitflow-maven-plugin]updating poms for branch'release/3.12.1' with non-snapshot versions adds d6e6335 Merge branch 'release/3.12.1' No new revisions were added by this update. Summary of changes: pom.xml | 4 +- startLocalDbAsServer.sh | 6 + tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 5 +- .../data/SampleCategoryModelConverter.java | 8 +- .../entities/data/SampleCategoryModelEntry.java | 21 +- ...ngOperations.java => SampleCategoryModels.java} | 38 ++- tutti-service/pom.xml | 2 +- .../fr/ifremer/tutti/service/TuttiDataContext.java | 1 + .../protocol/ProtocolImportExportService.java | 7 +- tutti-ui-swing-updater/pom.xml | 2 +- .../tutti/ui/swing/updater/DeleteHelper.java | 4 +- .../updater/{Module.java => UpdateModule.java} | 50 ++-- .../swing/updater/UpdateModuleConfiguration.java | 79 ++++++ .../fr/ifremer/tutti/ui/swing/updater/Updater.java | 246 +++++------------ .../ui/swing/updater/UpdaterFileSystemPathes.java | 229 ++++++++++++++++ tutti-ui-swing/pom.xml | 79 +++++- .../src/main/assembly/full-shared-component.xml | 20 +- .../src/main/assembly/full-windows-component.xml | 2 +- tutti-ui-swing/src/main/assembly/help.xml | 4 +- .../src/main/assembly/{min => help}/version.appup | 0 tutti-ui-swing/src/main/assembly/i18n.xml | 4 +- .../src/main/assembly/{min => i18n}/version.appup | 0 tutti-ui-swing/src/main/assembly/ichtyometer.xml | 4 +- .../assembly/{min => ichtyometer}/version.appup | 0 tutti-ui-swing/src/main/assembly/standalone.xml | 85 +++++- .../main/assembly/{min => standalone}/README.txt | 0 .../{min => standalone}/launcher.properties | 0 .../src/main/assembly/standalone/linux/launch.sh | 7 + .../src/main/assembly/standalone/linux/update.sh | 12 + .../assembly/{min => standalone}/version.appup | 0 .../main/assembly/standalone/windows/launch.bat | 7 + .../main/assembly/standalone/windows/update.bat | 14 + .../ui/swing/TuttiApplicationUpdaterCallBack.java | 298 --------------------- .../tutti/ui/swing/TuttiReportUpdaterCallBack.java | 161 ----------- .../tutti/ui/swing/action/InstallDbAction.java | 17 +- .../tutti/ui/swing/action/OpenDbAction.java | 29 +- .../action/SaveSampleCategoryModelAction.java | 9 +- .../tutti/ui/swing/action/ShowAboutAction.java | 222 +++++++++------ .../ui/swing/action/UpdateApplicationAction.java | 31 +-- .../tutti/ui/swing/action/UpdateDbAction.java | 39 ++- .../tutti/ui/swing/action/UpdateReportAction.java | 25 +- .../fr/ifremer/tutti/ui/swing/content/MainUI.css | 2 - .../category/EditSampleCategoryModelRowModel.java | 18 +- .../EditSampleCategoryModelTableModel.java | 8 +- .../category/EditSampleCategoryModelUIHandler.java | 58 +++- .../category/EditSampleCategoryModelUIModel.java | 12 +- .../ui/swing/content/db/DbManagerUIHandler.java | 16 +- .../content/operation/EditFishingOperationUI.css | 15 +- .../content/operation/EditFishingOperationUI.jaxx | 6 +- .../content/operation/catches/EditCatchesUI.css | 15 +- .../content/operation/catches/EditCatchesUI.jaxx | 12 +- .../operation/catches/EditCatchesUIHandler.java | 73 +++-- .../catches/SpeciesAbleBatchRowHelper.java | 2 +- .../accidental/AccidentalBatchTableModel.java | 13 +- .../catches/accidental/AccidentalBatchUI.css | 15 +- .../catches/accidental/AccidentalBatchUI.jaxx | 8 +- .../accidental/AccidentalBatchUIHandler.java | 8 +- .../catches/benthos/BenthosBatchTableModel.java | 10 +- .../operation/catches/benthos/BenthosBatchUI.css | 15 +- .../operation/catches/benthos/BenthosBatchUI.jaxx | 8 +- .../catches/benthos/BenthosBatchUIHandler.java | 15 +- .../IndividualObservationBatchTableModel.java | 9 +- .../IndividualObservationBatchUI.css | 15 +- .../IndividualObservationBatchUI.jaxx | 8 +- .../IndividualObservationBatchUIHandler.java | 13 +- .../marinelitter/MarineLitterBatchTableModel.java | 11 +- .../catches/marinelitter/MarineLitterBatchUI.css | 15 +- .../catches/marinelitter/MarineLitterBatchUI.jaxx | 8 +- .../marinelitter/MarineLitterBatchUIHandler.java | 7 + .../catches/species/SpeciesBatchTableModel.java | 10 +- .../operation/catches/species/SpeciesBatchUI.css | 15 +- .../operation/catches/species/SpeciesBatchUI.jaxx | 14 +- .../catches/species/SpeciesBatchUIHandler.java | 15 +- .../ApplicationUpdateException.java} | 25 +- .../update/TuttiApplicationUpdaterCallBack.java | 59 ++++ .../ui/swing/update/TuttiDbUpdaterCallBack.java | 76 ++++++ .../swing/update/TuttiReportUpdaterCallBack.java | 53 ++++ .../swing/update/TuttiUpdaterCallBackSupport.java | 174 ++++++++++++ .../fr/ifremer/tutti/ui/swing/update/Updates.java | 85 ++++++ .../module/DbModuleUpdater.java} | 173 ++++-------- .../ui/swing/update/module/HelpModuleUpdater.java | 75 ++++++ .../ui/swing/update/module/I18NModuleUpdater.java | 76 ++++++ .../update/module/IchtyometerModuleUpdater.java | 76 ++++++ .../ui/swing/update/module/JreModuleUpdater.java | 76 ++++++ .../swing/update/module/LauncherModuleUpdater.java | 76 ++++++ .../swing/update/module/ModuleUpdaterSupport.java | 126 +++++++++ .../swing/update/module/ReportModuleUpdater.java | 75 ++++++ .../ui/swing/update/module/TuttiModuleUpdater.java | 105 ++++++++ .../ui/swing/util/AbstractTuttiUIHandler.java | 9 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 22 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 46 ++-- 93 files changed, 2498 insertions(+), 1153 deletions(-) create mode 100755 startLocalDbAsServer.sh copy tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/{FishingOperations.java => SampleCategoryModels.java} (58%) rename tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/{Module.java => UpdateModule.java} (50%) create mode 100644 tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/UpdateModuleConfiguration.java create mode 100644 tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/UpdaterFileSystemPathes.java copy tutti-ui-swing/src/main/assembly/{min => help}/version.appup (100%) copy tutti-ui-swing/src/main/assembly/{min => i18n}/version.appup (100%) copy tutti-ui-swing/src/main/assembly/{min => ichtyometer}/version.appup (100%) rename tutti-ui-swing/src/main/assembly/{min => standalone}/README.txt (100%) rename tutti-ui-swing/src/main/assembly/{min => standalone}/launcher.properties (100%) create mode 100644 tutti-ui-swing/src/main/assembly/standalone/linux/launch.sh create mode 100644 tutti-ui-swing/src/main/assembly/standalone/linux/update.sh rename tutti-ui-swing/src/main/assembly/{min => standalone}/version.appup (100%) create mode 100644 tutti-ui-swing/src/main/assembly/standalone/windows/launch.bat create mode 100644 tutti-ui-swing/src/main/assembly/standalone/windows/update.bat delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiReportUpdaterCallBack.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/{content/referential/replace/ReplaceTemporarySpeciesUIModel.java => update/ApplicationUpdateException.java} (57%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/update/TuttiApplicationUpdaterCallBack.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/update/TuttiDbUpdaterCallBack.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/update/TuttiReportUpdaterCallBack.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/update/TuttiUpdaterCallBackSupport.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/update/Updates.java rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/{TuttiDbUpdaterCallBack.java => update/module/DbModuleUpdater.java} (61%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/update/module/HelpModuleUpdater.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/update/module/I18NModuleUpdater.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/update/module/IchtyometerModuleUpdater.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/update/module/JreModuleUpdater.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/update/module/LauncherModuleUpdater.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/update/module/ModuleUpdaterSupport.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/update/module/ReportModuleUpdater.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/update/module/TuttiModuleUpdater.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.