This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit d6e6335d081177bc92cadda724d5bf873b659cd3 Merge: ab1d55b d4debfd Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 28 18:57:51 2015 +0000 Merge branch 'release/3.12.1' 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 +- .../entities/data/SampleCategoryModels.java | 56 ++-- 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 +- .../swing/update/ApplicationUpdateException.java | 44 ++- .../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(+), 1190 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.