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 e6e7c4e9bc54cdcd0275e57fc0444cbcb725ef17 Merge: 121d594 b69873e Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 12 08:45:54 2014 +0200 Merge branch 'release/3.7.3' README.txt | 10 - pom.xml | 36 +- src/site/rst/update.rst.vm | 47 +- src/update/tutti-application-dev.properties | 66 --- src/update/tutti-application.properties | 4 - tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../core/dao/referential/pmfm/MatrixId2.java | 195 ------- .../core/dao/referential/pmfm/ObjectTypeCode2.java | 274 --------- .../adagio/core/dao/referential/pmfm/PmfmId2.java | 621 +++++---------------- .../dao/referential/pmfm/QualitativeValueId2.java | 246 -------- .../tutti/persistence/TuttiPersistenceImpl.java | 6 +- .../persistence/TuttiPersistenceNoDbImpl.java | 6 +- .../tutti/persistence/entities/TuttiEntities.java | 3 +- .../entities/protocol/TuttiProtocols.java | 19 +- .../AccidentalBatchPersistenceServiceImpl.java | 7 +- .../service/AttachmentPersistenceService.java | 8 +- .../service/AttachmentPersistenceServiceImpl.java | 8 +- .../service/CruisePersistenceServiceImpl.java | 17 +- .../FishingOperationPersistenceServiceImpl.java | 77 ++- ...dualObservationBatchPersistenceServiceImpl.java | 4 +- .../service/ReferentialPersistenceServiceImpl.java | 43 +- .../service/util/BatchPersistenceHelper.java | 26 +- .../persistence/service/util/BatchTreeHelper.java | 36 +- .../service/util/MeasurementPersistenceHelper.java | 8 +- .../service/util/SamplePersistenceHelper.java | 4 +- .../main/java/fr/ifremer/tutti/util/DateTimes.java | 70 +++ .../resources/tutti-db-enumerations.properties | 13 +- .../src/main/xmi/tutti-persistence.zargo | Bin 56716 -> 56700 bytes .../AttachmentPersistenceServiceWriteTest.java | 12 +- .../BenthosBatchPersistenceServiceReadTest.java | 4 +- .../BenthosBatchPersistenceServiceWriteTest.java | 20 +- .../SpeciesBatchPersistenceServiceReadTest.java | 4 +- .../SpeciesBatchPersistenceServiceWriteTest.java | 20 +- tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/PersistenceService.java | 8 +- .../service/catches/WeightComputingService.java | 5 +- ...rvice.java => WeightComputingService.java.orig} | 11 +- .../catches/multipost/MultiPostExportService.java | 14 +- .../catches/multipost/MultiPostImportService.java | 16 +- .../service/export/generic/CatchExportModel.java | 41 +- .../service/export/generic/OperationExportRow.java | 4 +- .../service/psionimport/PsionImportService.java | 42 +- .../pupitri/PupitriImportExportService.java | 10 +- .../fr/ifremer/tutti/service/pupitri/Signs.java | 17 +- .../ifremer/tutti/service/pupitri/SpeciesRow.java | 42 +- .../resources/i18n/tutti-service_en_GB.properties | 1 + .../resources/i18n/tutti-service_fr_FR.properties | 3 +- .../psionimport/PsionImportServiceTest.java | 4 +- tutti-ui-swing/pom.xml | 2 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 12 + .../tutti/ui/swing/action/ImportPupitriAction.java | 4 +- .../ui/swing/action/NewFishingOperationAction.java | 1 + .../category/EditSampleCategoryModelUIModel.java | 4 +- .../ui/swing/content/cruise/EditCruiseUIModel.java | 6 +- .../operation/EditFishingOperationUIHandler.java | 8 +- .../operation/EditFishingOperationUIModel.java | 6 +- .../operation/catches/EditCatchesUIModel.java | 6 +- .../accidental/AccidentalBatchRowModel.java | 6 +- .../catches/benthos/BenthosBatchRowModel.java | 16 +- .../frequency/BenthosFrequencyCellComponent.java | 1 + .../benthos/frequency/BenthosFrequencyUI.css | 14 +- .../benthos/frequency/BenthosFrequencyUI.jaxx | 5 +- .../frequency/BenthosFrequencyUIHandler.java | 3 +- .../benthos/frequency/BenthosFrequencyUIModel.java | 46 +- .../IndividualObservationBatchRowModel.java | 6 +- .../CreateIndividualObservationBatchUIHandler.java | 3 +- .../marinelitter/MarineLitterBatchRowModel.java | 6 +- .../catches/species/SpeciesBatchRowModel.java | 16 +- .../frequency/SpeciesFrequencyCellComponent.java | 1 + .../species/frequency/SpeciesFrequencyUI.css | 14 +- .../species/frequency/SpeciesFrequencyUI.jaxx | 5 +- .../frequency/SpeciesFrequencyUIHandler.java | 26 +- .../species/frequency/SpeciesFrequencyUIModel.java | 46 +- .../util/attachment/AttachmentModelAware.java | 4 +- .../swing/util/editor/TuttiLocationTableCell.java | 4 +- .../ui/swing/util/editor/VesselTableCell.java | 4 +- .../BenthosFrequencyUIModel-error-validation.xml | 11 + ...BenthosFrequencyUIModel-warning-validation.xml} | 31 +- .../SpeciesFrequencyUIModel-error-validation.xml | 11 + ...SpeciesFrequencyUIModel-warning-validation.xml} | 31 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 4 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 4 + 83 files changed, 770 insertions(+), 1735 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.