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 1bea001b6c5a9773ea2f84d166139dc6dee68c1b Merge: b335414 af09d6f Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 26 15:24:44 2014 +0200 Merge branch 'release/3.7.5' pom.xml | 4 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../persistence/entities/data/SpeciesBatchs.java | 42 +- .../tutti/persistence/test/DatabaseResource.java | 31 +- .../i18n/tutti-persistence_en_GB.properties | 24 + .../i18n/tutti-persistence_fr_FR.properties | 26 +- .../config/TuttiPersistenceConfigTest.java | 2 +- .../resources/tutti-test-read-dbEmpty.properties | 27 - .../src/test/resources/tutti-test-read.properties | 27 - tutti-service/pom.xml | 2 +- .../fr/ifremer/tutti/service/TuttiCsvUtil.java | 4 + .../tutti/service/bigfin/BigfinDataRow.java | 130 ++ .../tutti/service/bigfin/BigfinDataRowModel.java | 154 ++ .../tutti/service/bigfin/BigfinImportResult.java | 92 + .../tutti/service/bigfin/BigfinImportService.java | 635 +++++ .../fr/ifremer/tutti/service/bigfin/Signs.java | 217 ++ .../service/export/generic/CatchExportModel.java | 2 +- .../export/pdf/CatchesPdfExportService.java | 4 +- .../protocol/ProtocolImportExportService.java | 97 +- .../tutti/service/pupitri/CarrouselRow.java | 14 +- .../tutti/service/pupitri/CarrouselRowModel.java | 5 +- .../fr/ifremer/tutti/service/pupitri/TrunkRow.java | 14 +- .../tutti/service/pupitri/TrunkRowModel.java | 5 +- .../resources/i18n/tutti-service_en_GB.properties | 15 + .../resources/i18n/tutti-service_fr_FR.properties | 10 + .../ifremer/tutti/service/ServiceDbResource.java | 27 +- .../service/bigfin/BigfinImportServiceTest.java | 213 ++ .../generic/TuttiExportServiceAno5804Test.java | 106 + .../export/generic/TuttiExportServiceTest.java | 10 +- .../test/resources/bigfin/importbigfin-errors.csv | 4 + .../test/resources/bigfin/importbigfin-valid.csv | 36 + .../resources/bigfin/importbigfin-warnings.csv | 5 + .../test/resources/bigfin/protocol.tuttiProtocol | 2426 ++++++++++++++++++++ .../resources/tutti-test-read-dbCGFS.properties | 26 - .../resources/tutti-test-read-dbExport.properties | 26 - .../resources/tutti-test-read-dbMedits.properties | 25 - tutti-ui-swing/pom.xml | 2 +- .../filtered-resources/tutti-help-fr.properties | 3 +- tutti-ui-swing/src/main/help/fr/dbMapping.html | 4 +- .../java/fr/ifremer/tutti/ui/swing/RunTutti.java | 8 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 33 +- .../action/EditCruiseInValidationUIAction.java | 6 +- .../EditFishingOperationInValidationUIAction.java | 6 +- .../ExportCruiseValidationMessagesAction.java | 6 +- .../ExportOperationValidationMessagesAction.java | 6 +- ...ortPsionAction.java => ImportBigfinAction.java} | 68 +- .../swing/action/ImportProtocolBenthosAction.java | 24 +- .../swing/action/ImportProtocolSpeciesAction.java | 24 +- .../tutti/ui/swing/action/ImportPsionAction.java | 6 +- .../action/SaveCruiseToReadyToSynchAction.java | 6 +- .../action/SelectSpeciesForBenthosBatchAction.java | 2 +- .../action/SelectSpeciesForSpeciesBatchAction.java | 2 +- .../tutti/ui/swing/action/ShowAboutAction.java | 2 +- .../ui/swing/action/ValidateCatchesAction.java | 4 +- .../tutti/ui/swing/content/MainUIHandler.java | 11 +- .../swing/content/config/TuttiConfigUIHandler.java | 58 +- .../operation/EditFishingOperationUIHandler.java | 25 +- .../benthos/frequency/BenthosFrequencyUI.jaxx | 12 +- .../operation/catches/species/SpeciesBatchUI.css | 9 + .../operation/catches/species/SpeciesBatchUI.jaxx | 1 + .../catches/species/SpeciesBatchUIHandler.java | 11 +- .../species/frequency/SpeciesFrequencyUI.jaxx | 138 +- .../species/split/SplitSpeciesBatchUIHandler.java | 8 +- .../fishing/GearUseFeatureTabUIHandler.java | 7 + .../fishing/VesselUseFeatureTabUIHandler.java | 6 + .../{cruise => validation}/ValidateCruiseUI.css | 0 .../{cruise => validation}/ValidateCruiseUI.jaxx | 1 + .../ValidateCruiseUIHandler.java | 9 +- .../ValidateCruiseUIModel.java | 2 +- .../tree/CruiseTreeNode.java | 24 +- .../tree/MessageTreeNode.java | 16 +- .../tree/OperationTreeNode.java | 35 +- .../tree/TuttiMessageNodeSupport.java} | 36 +- .../tree/ValidationTreeCellRenderer.java | 12 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 24 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 27 +- .../main/resources/icons/action-bigfin-import.png | Bin 0 -> 532 bytes .../icons/action-cruise-ready-to-sync.png | Bin 328 -> 465 bytes .../main/resources/icons/action-cruise-waiting.png | Bin 465 -> 328 bytes 80 files changed, 4704 insertions(+), 471 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.