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 fec7edceb8677ed8fdcbec064df8ac50f2024e19 Merge: da764ac f0cac9b Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 1 08:46:08 2014 +0200 Merge branch 'release/3.7' pom.xml | 24 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 7 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 2 +- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 4 +- .../tutti/persistence/TuttiPersistenceImpl.java | 6 +- .../persistence/TuttiPersistenceNoDbImpl.java | 2 +- .../tutti/persistence/entities/TuttiEntities.java | 465 +------------------- .../data/SampleCategoryModelConverter.java | 7 +- .../entities/data/SpeciesAbleBatchs.java | 61 +++ .../CaracteristicQualitativeValues.java | 42 ++ .../entities/referential/Caracteristics.java | 67 +++ ...acteristicQualitativeValues.java => Gears.java} | 35 +- .../persistence/entities/referential/Speciess.java | 99 +++++ .../AccidentalBatchPersistenceServiceImpl.java | 2 +- .../service/CatchBatchPersistenceServiceImpl.java | 9 +- .../service/CruisePersistenceServiceImpl.java | 47 +-- ...dualObservationBatchPersistenceServiceImpl.java | 2 +- .../service/ProtocolPersistenceServiceImpl.java | 10 +- .../service/ReferentialPersistenceServiceImpl.java | 16 +- .../SpeciesBatchPersistenceServiceImpl.java | 42 +- .../service/TechnicalPersistenceService.java | 2 +- .../service/TechnicalPersistenceServiceImpl.java | 8 +- .../service/TuttiPersistenceServiceLocator.java | 2 +- .../service/util/BatchPersistenceHelper.java | 4 +- .../service/util/MeasurementPersistenceHelper.java | 2 +- .../service/util/SamplePersistenceHelper.java | 6 +- .../tutti/persistence/test/DatabaseFixtures.java | 8 +- .../tutti/persistence/test/DatabaseResource.java | 15 +- .../main/java/fr/ifremer/tutti/util/Distances.java | 63 +++ .../src/main/java/fr/ifremer/tutti/util/Jdbcs.java | 126 ++++++ .../main/java/fr/ifremer/tutti/util/Numbers.java | 54 +++ .../main/java/fr/ifremer/tutti/util/Weights.java | 130 ++++++ ...verter => org.nuiton.converter.NuitonConverter} | 0 .../src/main/xmi/tutti-persistence.properties | 7 +- .../persistence/TuttiPersistenceWriteTest.java | 2 +- .../config/TuttiPersistenceConfigTest.java | 2 +- .../ReferentialPersistenceServiceReadTest.java | 6 +- tutti-service/pom.xml | 6 +- .../ifremer/tutti/service/PersistenceService.java | 7 +- .../fr/ifremer/tutti/service/TuttiCsvUtil.java | 13 +- .../fr/ifremer/tutti/service/TuttiDataContext.java | 4 +- .../service/catches/WeightCleaningService.java | 8 +- .../service/catches/WeightComputingService.java | 83 ++-- .../catches/multipost/MultiPostImportService.java | 6 +- .../tutti/service/export/ExportCatchContext.java | 26 +- .../service/export/generic/CatchExportModel.java | 92 ++-- .../service/export/generic/OperationExportRow.java | 77 ++-- .../service/export/generic/TuttiExportService.java | 7 +- .../export/pdf/CatchesPdfExportService.java | 32 +- .../service/export/pdf/PdfExportBatchEntry.java | 10 +- .../service/psionimport/PsionImportModel.java | 56 ++- .../service/psionimport/PsionImportService.java | 22 +- .../tutti/service/pupitri/PupitriCatch.java | 27 +- .../pupitri/PupitriImportExportService.java | 26 +- .../tutti/service/pupitri/PupitriImportResult.java | 27 +- .../fr/ifremer/tutti/service/pupitri/Signs.java | 4 +- .../src/main/resources/ftl/catchesReport_fr.ftl | 4 +- .../resources/i18n/tutti-service_en_GB.properties | 2 + .../resources/i18n/tutti-service_fr_FR.properties | 20 +- .../ifremer/tutti/service/AbstractServiceTest.java | 3 +- .../fr/ifremer/tutti/service/UpdateSchemaTest.java | 2 +- .../psionimport/PsionImportServiceTest.java | 4 +- tutti-ui-swing/pom.xml | 13 +- tutti-ui-swing/src/main/help/fr/config.html | 4 + .../src/main/help/fr/editFishingOperation.html | 96 ++++- tutti-ui-swing/src/main/help/fr/faq.html | 5 + tutti-ui-swing/src/main/help/fr/selectCruise.html | 8 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 2 +- .../ui/swing/action/ComputeBatchWeightsAction.java | 85 +++- .../ui/swing/action/CreateBenthosMelagAction.java | 7 +- .../ui/swing/action/CreateSpeciesMelagAction.java | 8 +- .../swing/action/EditFishingOperationAction.java | 22 +- .../swing/action/ExportCruiseForSumatraAction.java | 18 +- .../ExportFishingOperationForSumatraAction.java | 22 +- .../tutti/ui/swing/action/ImportDbAction.java | 2 +- .../ui/swing/action/ImportProtocolAction.java | 4 +- .../tutti/ui/swing/action/OpenDbAction.java | 2 +- .../swing/action/RemoveBenthosProtocolAction.java | 4 +- .../swing/action/RemoveSpeciesProtocolAction.java | 4 +- .../action/SelectSpeciesForBenthosBatchAction.java | 4 +- ...SpeciesForIndividualObservationBatchAction.java | 4 +- .../action/SelectSpeciesForSpeciesBatchAction.java | 4 +- .../swing/content/cruise/EditCruiseUIHandler.java | 6 +- .../ui/swing/content/db/DbManagerUIHandler.java | 2 +- .../tutti/ui/swing/content/home/SelectCruiseUI.css | 8 +- .../operation/EditFishingOperationUIHandler.java | 3 +- .../operation/EditFishingOperationUIModel.java | 3 +- .../operation/catches/EditCatchesUIHandler.java | 4 +- .../operation/catches/SampleCategoryComponent.java | 6 +- .../SpeciesBatchNaturalOrderComparator.java | 108 +++++ .../catches/benthos/BenthosBatchRowModel.java | 467 ++++++++++----------- .../catches/benthos/BenthosBatchUIHandler.java | 20 +- .../frequency/BenthosFrequencyUIHandler.java | 3 +- .../IndividualObservationBatchUIHandler.java | 10 +- .../catches/species/SpeciesBatchUIHandler.java | 20 +- .../catches/species/SpeciesBatchUIModel.java | 6 +- .../frequency/SpeciesFrequencyUIHandler.java | 32 +- .../species/frequency/SpeciesFrequencyUIModel.java | 8 + .../content/protocol/EditProtocolUIHandler.java | 5 +- .../ui/swing/util/AbstractTuttiUIHandler.java | 4 +- .../computable/ComputableDataEditorHandler.java | 4 +- .../util/computable/ComputableDataTableCell.java | 4 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 37 +- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 43 +- 105 files changed, 1869 insertions(+), 1208 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.