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 ab1d55bd009ff2c04742a054d2636a7bdbb25d13 Merge: e032832 b078a47 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 26 19:21:10 2015 +0000 Merge branch 'release/3.12' 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 +- tutti-ui-swing-updater/LICENSE.txt | 674 +++++++++++++++++ tutti-ui-swing-updater/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 | 58 ++ .../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 +- ...ll-windows-x64.xml => full-linux-component.xml} | 42 +- .../src/main/assembly/full-linux-i586.xml | 5 +- .../src/main/assembly/full-linux-x64.xml | 5 +- ...ull-component.xml => full-shared-component.xml} | 86 ++- ...windows-i586.xml => full-windows-component.xml} | 48 +- .../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 - .../src/main/assembly/min/launcher.properties | 26 + 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 +- .../tutti/ui/swing/util/catches/EnterWeightUI.css | 50 ++ .../tutti/ui/swing/util/catches/EnterWeightUI.jaxx | 65 ++ .../swing/util/catches/EnterWeightUIHandler.java | 99 +++ .../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, 3728 insertions(+), 659 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.