This is an automated email from the git hooks/post-receive script. New commit to branch feature/6575 in repository tutti. See http://git.codelutin.com/tutti.git commit 249cea2ed9bb3f8339abfef1feb3c2300486131c Merge: 3cf2fbc b6c955c Author: Kevin Morin <morin@codelutin.com> Date: Thu Feb 5 15:40:30 2015 +0100 Merge branches 'develop' and 'feature/6575' of https://git.codelutin.com/tutti into feature/6575 README.txt | 33 +- pom.xml | 12 +- src/site/rst/dbversions.rst | 4 + src/update/tutti-application.properties | 2 +- .../tutti/persistence/TuttiPersistenceImpl.java | 31 +- .../persistence/entities/data/SpeciesBatchs.java | 20 + .../src/main/java/fr/ifremer/tutti/util/Jdbcs.java | 31 + .../fr/ifremer/tutti/service/TuttiDataContext.java | 41 +- .../tutti/service/bigfin/BigfinDataRowModel.java | 138 ---- .../tutti/service/bigfin/BigfinImportContext.java | 357 ++++++++ .../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 | 231 ++++++ .../service/bigfin/csv/SpeciesOrSpeciesBatch.java | 42 + .../fr/ifremer/tutti/service/bigfin/signs/Sex.java | 109 +++ .../ifremer/tutti/service/bigfin/signs/Sign.java | 27 + .../ifremer/tutti/service/bigfin/signs/Size.java | 111 +++ .../tutti/service/bigfin/signs/VracHorsVrac.java | 92 +++ .../catches/ValidateCruiseOperationsService.java | 38 +- .../resources/i18n/tutti-service_en_GB.properties | 5 + .../resources/i18n/tutti-service_fr_FR.properties | 9 +- .../tutti/ui/swing/updater/DeleteHelper.java | 27 + .../src/main/resources/update_runtime.bat | 5 +- .../src/main/resources/update_runtime.sh | 7 +- tutti-ui-swing/pom.xml | 67 ++ .../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 +- .../java/fr/ifremer/tutti/ui/swing/RunTutti.java | 7 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 43 +- .../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 +- .../ui/swing/action/UpdateApplicationAction.java | 2 +- .../tutti/ui/swing/action/UpdateReportAction.java | 2 +- .../operation/catches/EditCatchesUIHandler.java | 903 ++++++++++++--------- .../validation/ValidateCruiseUIHandler.java | 13 +- .../content/validation/ValidateCruiseUIModel.java | 3 +- .../ui/swing/update/module/DbModuleUpdater.java | 79 +- .../util/AbstractTuttiTabContainerUIHandler.java | 55 +- tutti-ui-swing/src/main/resources/EcranResume.svg | 112 ++- 60 files changed, 2299 insertions(+), 1265 deletions(-) diff --cc tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java index 6e4284f,1b6db2c..10dcf6d --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java @@@ -53,8 -53,8 +53,9 @@@ import fr.ifremer.tutti.service.referen import fr.ifremer.tutti.service.referential.ReferentialTemporaryVesselService; import fr.ifremer.tutti.service.referential.TuttiReferentialSynchronizeService; import fr.ifremer.tutti.service.report.ReportService; +import fr.ifremer.tutti.service.toconfirmreport.ToConfirmReportService; import fr.ifremer.tutti.ui.swing.content.MainUI; + import fr.ifremer.tutti.ui.swing.updater.DeleteHelper; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.UIMessageNotifier; import fr.ifremer.tutti.ui.swing.util.auth.AuthenticationInfo; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.