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 f91779d105b880791ae2c69af1a42357c1fbc8fa Merge: 27f1241 32eaad0 Author: Maven Release <maven-release@codelutin.com> Date: Sat Nov 8 15:02:23 2014 +0000 Merge branch 'release/3.8' pom.xml | 18 +- .../AllegroCampagne-Specifications.odt | Bin 703314 -> 776831 bytes .../AllegroCampagne-Specifications.pdf | Bin 1287715 -> 1400148 bytes tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../tutti/persistence/TuttiPersistence.java | 16 +- .../tutti/persistence/TuttiPersistenceImpl.java | 366 +++++++--- .../persistence/TuttiPersistenceNoDbImpl.java | 78 ++- .../entities/data/SpeciesAbleBatchs.java | 31 + .../persistence/entities/data/SpeciesBatchs.java | 1 - .../persistence/entities/referential/Gears.java | 24 + .../referential/{Gears.java => Persons.java} | 30 +- .../persistence/entities/referential/Speciess.java | 25 + .../{Gears.java => TuttiReferentialEntities.java} | 30 +- .../referential/{Gears.java => Vessels.java} | 35 +- .../AccidentalBatchPersistenceServiceImpl.java | 32 +- .../service/AttachmentPersistenceServiceImpl.java | 6 +- .../BenthosBatchPersistenceServiceImpl.java | 162 +++-- .../service/CatchBatchPersistenceServiceImpl.java | 56 +- .../service/CruisePersistenceServiceImpl.java | 37 +- .../FishingOperationPersistenceServiceImpl.java | 45 +- ...dualObservationBatchPersistenceServiceImpl.java | 21 +- .../MarineLitterBatchPersistenceServiceImpl.java | 9 +- .../service/ProgramPersistenceServiceImpl.java | 3 - .../service/ReferentialPersistenceService.java | 145 +++- .../service/ReferentialPersistenceServiceImpl.java | 291 +++++++- .../SpeciesBatchPersistenceServiceImpl.java | 220 +++--- .../service/TechnicalPersistenceService.java | 3 + .../service/TechnicalPersistenceServiceImpl.java | 15 + .../service/TuttiPersistenceServiceLocator.java | 48 +- .../CaracteristicPersistenceService.java | 107 +++ .../CaracteristicPersistenceServiceImpl.java | 323 +++++++++ .../referential/GearPersistenceService.java | 102 +++ .../referential/GearPersistenceServiceImpl.java | 231 ++++++ .../referential/LocationPersistenceService.java | 134 ++++ .../LocationPersistenceServiceImpl.java | 228 ++++++ .../ObjectTypePersistenceService.java} | 49 +- .../ObjectTypePersistenceServiceImpl.java | 78 +++ .../referential/PersonPersistenceService.java | 104 +++ .../referential/PersonPersistenceServiceImpl.java | 231 ++++++ .../ReferentialPersistenceServiceSupport.java | 80 +++ .../referential/SpeciesPersistenceService.java | 141 ++++ .../referential/SpeciesPersistenceServiceImpl.java | 288 ++++++++ .../referential/VesselPersistenceService.java | 125 ++++ .../referential/VesselPersistenceServiceImpl.java | 343 +++++++++ .../service/util/BatchPersistenceHelper.java | 129 +++- .../service/util/MeasurementPersistenceHelper.java | 22 +- .../service/util/SamplePersistenceHelper.java | 8 +- .../tutti/persistence/test/DatabaseFixtures.java | 40 +- .../src/main/resources/queries-failsafe.hbm.xml | 153 ++++ .../resources/tutti-db-enumerations.properties | 10 - .../src/main/xmi/tutti-persistence.zargo | Bin 56700 -> 56767 bytes ...AccidentalBatchPersistenceServiceWriteTest.java | 23 +- .../BenthosBatchPersistenceServiceWriteTest.java | 25 +- .../CatchBatchPersistenceServiceWriteTest.java | 3 - .../service/CruisePersistenceServiceWriteTest.java | 27 +- ...ishingOperationPersistenceServiceWriteTest.java | 21 +- ...bservationBatchPersistenceServiceWriteTest.java | 22 +- ...rineLitterBatchPersistenceServiceWriteTest.java | 12 +- .../ProgramPersistenceServiceWriteTest.java | 7 +- .../ReferentialPersistenceServiceReadTest.java | 366 ---------- .../ReferentialPersistenceServiceWriteTest.java | 242 ------- .../SpeciesBatchPersistenceServiceWriteTest.java | 19 +- .../CaracteristicPersistenceServiceReadTest.java | 118 ++++ .../GearPersistenceServiceReadTest.java | 61 ++ .../GearPersistenceServiceWriteTest.java | 104 +++ .../LocationPersistenceServiceReadTest.java | 101 +++ .../ObjectTypePersistenceServiceReadTest.java | 57 ++ .../PersonPersistenceServiceReadTest.java} | 34 +- .../PersonPersistenceServiceWriteTest.java | 111 +++ ...ferentialPersistenceServiceReadTestSupport.java | 88 +++ ...rentialPersistenceServiceWriteTestSupport.java} | 25 +- .../SpeciesPersistenceServiceReadTest.java | 99 +++ .../SpeciesPersistenceServiceWriteTest.java | 105 +++ .../VesselPersistenceServiceReadTest.java | 82 +++ .../VesselPersistenceServiceWriteTest.java | 107 +++ tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/PersistenceService.java | 143 +++- .../catches/WeightComputingService.java.orig | 778 --------------------- .../tutti/service/referential/GearModel.java | 27 +- .../ifremer/tutti/service/referential/GearRow.java | 61 ++ .../tutti/service/referential/PersonModel.java | 24 +- .../{PersonModel.java => PersonRow.java} | 46 +- .../referential/ReferentialExportService.java | 375 ++++++++++ .../ReferentialImportExportService.java | 444 ------------ .../referential/ReferentialImportResult.java | 91 +++ .../referential/ReferentialImportService.java | 764 ++++++++++++++++++++ .../tutti/service/referential/SpeciesModel.java | 23 +- .../{SpeciesModel.java => SpeciesRow.java} | 47 +- .../TemporaryReferentialEntityIdParser.java | 60 ++ .../tutti/service/referential/VesselModel.java | 47 +- .../tutti/service/referential/VesselRow.java | 62 ++ .../resources/i18n/tutti-service_en_GB.properties | 24 + .../resources/i18n/tutti-service_fr_FR.properties | 28 +- .../tutti/service/PersistenceServiceTest.java | 20 +- .../referential/ReferentialExportServiceTest.java | 139 ++++ .../ReferentialImportExportServiceTest.java | 285 -------- .../referential/ReferentialImportServiceTest.java | 464 ++++++++++++ tutti-service/src/test/resources/log4j.properties | 3 + tutti-ui-swing/pom.xml | 7 +- .../filtered-resources/tutti-help-fr.properties | 6 +- tutti-ui-swing/src/main/help/en/config.html | 1 + tutti-ui-swing/src/main/help/fr/config.html | 1 + .../src/main/help/fr/editFishingOperation.html | 6 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 11 +- .../AbstractOpenReplaceTemporaryUIAction.java | 14 +- .../action/AbstractReplaceTemporaryUIAction.java | 32 +- ...java => ExportExistingTemporaryGearAction.java} | 27 +- ...va => ExportExistingTemporaryPersonAction.java} | 28 +- ...a => ExportExistingTemporarySpeciesAction.java} | 28 +- ...va => ExportExistingTemporaryVesselAction.java} | 28 +- .../action/ExportTemporaryGearExampleAction.java | 8 +- .../action/ExportTemporaryPersonExampleAction.java | 10 +- .../ExportTemporarySpeciesExampleAction.java | 10 +- .../action/ExportTemporaryVesselExampleAction.java | 10 +- .../ui/swing/action/ImportTemporaryGearAction.java | 24 +- .../swing/action/ImportTemporaryPersonAction.java | 26 +- .../swing/action/ImportTemporarySpeciesAction.java | 26 +- .../swing/action/ImportTemporaryVesselAction.java | 26 +- .../ui/swing/action/NewFishingOperationAction.java | 7 +- .../action/OpenReplaceTemporaryGearUIAction.java | 16 + .../action/OpenReplaceTemporaryPersonUIAction.java | 15 + .../OpenReplaceTemporarySpeciesUIAction.java | 16 + .../action/OpenReplaceTemporaryVesselUIAction.java | 16 + .../swing/action/ReplaceTemporaryGearAction.java | 15 +- .../swing/action/ReplaceTemporaryPersonAction.java | 15 +- .../action/ReplaceTemporarySpeciesAction.java | 14 +- .../swing/action/ReplaceTemporaryVesselAction.java | 14 +- .../swing/content/cruise/EditCruiseUIHandler.java | 2 +- .../swing/content/home/SelectCruiseUIHandler.java | 11 +- .../catches/benthos/BenthosBatchRowModel.java | 3 +- .../BenthosFrequencyLogCellComponent.java | 170 +++++ .../frequency/BenthosFrequencyLogRowModel.java | 67 ++ .../frequency/BenthosFrequencyLogsTableModel.java | 58 ++ .../frequency/BenthosFrequencyTableModel.java | 9 +- .../benthos/frequency/BenthosFrequencyUI.css | 20 + .../benthos/frequency/BenthosFrequencyUI.jaxx | 18 +- .../frequency/BenthosFrequencyUIHandler.java | 162 ++++- .../catches/species/SpeciesBatchRowModel.java | 2 +- .../SpeciesFrequencyLogCellComponent.java | 172 +++++ .../frequency/SpeciesFrequencyLogRowModel.java | 69 ++ .../frequency/SpeciesFrequencyLogsTableModel.java | 65 ++ .../frequency/SpeciesFrequencyTableModel.java | 11 +- .../species/frequency/SpeciesFrequencyUI.css | 20 + .../species/frequency/SpeciesFrequencyUI.jaxx | 18 +- .../frequency/SpeciesFrequencyUIHandler.java | 178 ++++- .../referential/ManageTemporaryReferentialUI.css | 76 +- .../referential/ManageTemporaryReferentialUI.jaxx | 60 +- .../ManageTemporaryReferentialUIHandler.java | 147 +++- .../ManageTemporaryReferentialUIModel.java | 92 +++ .../replace/AbstractReplaceTemporaryUI.css | 7 + .../replace/AbstractReplaceTemporaryUI.jaxx | 7 + .../replace/AbstractReplaceTemporaryUIModel.java | 13 + .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 13 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 46 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 83 ++- .../src/main/resources/icons/action-delete.png | Bin 715 -> 949 bytes tutti-ui-swing/src/main/resources/test.shp | Bin 0 -> 448188 bytes 158 files changed, 9451 insertions(+), 3098 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.