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 e7092d814afd93847aa0f869fae10d4ed4f285ad Merge: d6e6335 526b4f0 Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 10 15:42:56 2015 +0000 Merge branch 'release/3.13' README.txt | 33 +- pom.xml | 14 +- src/site/rst/dbversions.rst | 4 + src/update/tutti-application.properties | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 16 + .../fr/ifremer/tutti/TuttiConfigurationOption.java | 32 + .../tutti/persistence/TuttiPersistenceImpl.java | 92 ++- .../persistence/TuttiPersistenceNoDbImpl.java | 10 + .../persistence/entities/data/SpeciesBatchs.java | 20 + .../entities/protocol/TuttiProtocols.java | 33 + .../persistence/entities/referential/Speciess.java | 11 + .../service/BenthosBatchPersistenceService.java | 10 + .../BenthosBatchPersistenceServiceImpl.java | 24 + .../service/SpeciesBatchPersistenceService.java | 10 + .../SpeciesBatchPersistenceServiceImpl.java | 24 + .../src/main/java/fr/ifremer/tutti/util/Jdbcs.java | 31 + .../main/java/fr/ifremer/tutti/util/Numbers.java | 10 + .../i18n/tutti-persistence_en_GB.properties | 4 + .../i18n/tutti-persistence_fr_FR.properties | 6 +- .../java/fr/ifremer/tutti/util/NumbersTest.java | 50 ++ tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/PdfGeneratorService.java | 1 + .../ifremer/tutti/service/PersistenceService.java | 10 + .../java/fr/ifremer/tutti/service/SpeciesMap.java | 147 ++++ .../fr/ifremer/tutti/service/TuttiDataContext.java | 41 +- .../tutti/service/bigfin/BigfinDataRowModel.java | 138 ---- .../tutti/service/bigfin/BigfinImportContext.java | 381 ++++++++++ .../tutti/service/bigfin/BigfinImportService.java | 366 +++++----- .../fr/ifremer/tutti/service/bigfin/Signs.java | 216 ------ .../service/bigfin/{ => csv}/BigfinDataRow.java | 75 +- .../service/bigfin/csv/BigfinDataRowModel.java | 233 +++++++ .../service/bigfin/csv/SpeciesOrSpeciesBatch.java | 66 ++ .../fr/ifremer/tutti/service/bigfin/signs/Sex.java | 133 ++++ .../ifremer/tutti/service/bigfin/signs/Sign.java | 51 ++ .../ifremer/tutti/service/bigfin/signs/Size.java | 135 ++++ .../tutti/service/bigfin/signs/VracHorsVrac.java | 116 +++ .../catches/ValidateCruiseOperationsService.java | 38 +- .../service/catches/WeightComputingService.java | 15 +- .../tutti/service/export/ExportCatchContext.java | 40 +- .../ToConfirmReportBatchEntryBean.java | 88 +++ .../toconfirmreport/ToConfirmReportBean.java | 79 +++ .../ToConfirmReportFishingOperationBean.java | 84 +++ .../ToConfirmReportFishingOperationData.java | 141 ++++ .../toconfirmreport/ToConfirmReportService.java | 221 ++++++ .../resources/ftl/toConfirmSpeciesReport_fr.ftl | 189 +++++ .../resources/i18n/tutti-service_en_GB.properties | 11 + .../resources/i18n/tutti-service_fr_FR.properties | 13 +- tutti-ui-swing-updater/pom.xml | 2 +- .../tutti/ui/swing/updater/DeleteHelper.java | 27 + .../fr/ifremer/tutti/ui/swing/updater/Updater.java | 14 +- .../src/main/resources/update_runtime.bat | 29 +- .../src/main/resources/update_runtime.sh | 21 +- tutti-ui-swing/pom.xml | 69 +- .../src/main/assembly/full-linux-component.xml | 2 +- .../src/main/assembly/full-shared-component.xml | 45 +- .../src/main/assembly/full-windows-component.xml | 3 +- .../{full-windows-component.xml => launcher.xml} | 61 +- .../main/assembly/{full => launcher}/README.txt | 0 .../{full => launcher}/linux/tutti-sanity.sh | 2 +- .../assembly/{full => launcher}/linux/tutti.sh | 2 +- .../{full => launcher}/windows/tutti-sanity.bat | 0 .../assembly/{full => launcher}/windows/tutti.bat | 0 .../src/main/assembly/report/version.appup | 1 - tutti-ui-swing/src/main/assembly/standalone.xml | 39 +- .../main/assembly/standalone/launcher.properties | 9 +- .../src/main/assembly/standalone/linux/launch.sh | 8 +- .../main/assembly/standalone/windows/launch.bat | 7 +- .../src/main/filtered-resources/log4j.properties | 5 +- .../filtered-resources/tutti-help-fr.properties | 5 +- .../java/fr/ifremer/tutti/ui/swing/RunTutti.java | 7 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 48 +- .../ui/swing/action/CloseApplicationAction.java | 4 +- .../tutti/ui/swing/action/CloseDbAction.java | 5 +- .../ui/swing/action/ExportAndCleanDbAction.java | 21 +- .../tutti/ui/swing/action/ExportDbAction.java | 6 +- .../tutti/ui/swing/action/ImportDbAction.java | 6 +- .../tutti/ui/swing/action/OpenDbAction.java | 6 +- .../tutti/ui/swing/action/ReimportDbAction.java | 9 +- .../tutti/ui/swing/action/ReinstallDbAction.java | 9 +- .../tutti/ui/swing/action/ReloadTuttiAction.java | 2 +- .../action/SaveSampleCategoryModelAction.java | 2 +- ... => SpeciesToConfirmReportForCruiseAction.java} | 95 +-- .../ui/swing/action/UpdateApplicationAction.java | 2 +- .../tutti/ui/swing/action/UpdateReportAction.java | 2 +- .../swing/content/config/TuttiConfigUIHandler.java | 12 + .../tutti/ui/swing/content/home/SelectCruiseUI.css | 10 +- .../ui/swing/content/home/SelectCruiseUI.jaxx | 1 + .../operation/catches/EditCatchesSvgHandler.java | 774 +++++++++++++++++++++ .../content/operation/catches/EditCatchesUI.css | 241 ------- .../content/operation/catches/EditCatchesUI.jaxx | 200 +----- .../operation/catches/EditCatchesUIHandler.java | 634 ++--------------- .../replace/AbstractReplaceTemporaryUIModel.java | 2 +- .../validation/ValidateCruiseUIHandler.java | 13 +- .../content/validation/ValidateCruiseUIModel.java | 3 +- .../ui/swing/update/module/DbModuleUpdater.java | 79 ++- .../util/AbstractTuttiTabContainerUIHandler.java | 55 +- .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 21 +- .../tutti/ui/swing/util/catches/EnterWeightUI.jaxx | 6 +- .../swing/util/catches/EnterWeightUIHandler.java | 72 +- tutti-ui-swing/src/main/resources/EcranResume.svg | 318 +++++---- .../resources/i18n/tutti-ui-swing_en_GB.properties | 9 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 13 +- 104 files changed, 4345 insertions(+), 2163 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.