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 bc41c04c3be8c6983ebe0235b82992c61f3cbf00 Merge: f91779d 882cc71 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 25 11:45:48 2014 +0000 Merge branch 'release/3.9' pom.xml | 27 +- src/site/rst/update.rst.vm | 4 +- src/site/site_fr.xml | 6 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../src/license/THIRD-PARTY.properties | 4 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 16 +- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 7 + .../tutti/persistence/TuttiPersistenceImpl.java | 80 +- .../persistence/TuttiPersistenceNoDbImpl.java | 26 +- .../tutti/persistence/entities/TuttiEntities.java | 12 +- .../entities/protocol/TuttiProtocols.java | 49 +- .../persistence/entities/referential/Gears.java | 8 + .../persistence/entities/referential/Persons.java | 11 + .../persistence/entities/referential/Speciess.java | 7 + .../persistence/entities/referential/Vessels.java | 8 + .../service/CatchBatchPersistenceServiceImpl.java | 10 +- .../referential/GearPersistenceService.java | 12 +- .../referential/GearPersistenceServiceImpl.java | 10 +- .../referential/PersonPersistenceService.java | 8 +- .../referential/PersonPersistenceServiceImpl.java | 10 +- .../referential/SpeciesPersistenceService.java | 22 +- .../referential/SpeciesPersistenceServiceImpl.java | 34 +- .../referential/VesselPersistenceService.java | 12 +- .../referential/VesselPersistenceServiceImpl.java | 10 +- .../java/fr/ifremer/tutti/type/WeightUnit.java | 24 + .../i18n/tutti-persistence_en_GB.properties | 1 + .../i18n/tutti-persistence_fr_FR.properties | 1 + .../GearPersistenceServiceWriteTest.java | 8 +- .../PersonPersistenceServiceWriteTest.java | 8 +- .../SpeciesPersistenceServiceWriteTest.java | 8 +- .../VesselPersistenceServiceWriteTest.java | 8 +- tutti-service/pom.xml | 2 +- tutti-service/src/license/THIRD-PARTY.properties | 6 +- .../ifremer/tutti/service/PdfGeneratorService.java | 108 +++ .../ifremer/tutti/service/PersistenceService.java | 64 +- .../service/catches/multipost/CatchBatchRow.java | 94 +++ .../catches/multipost/CatchBatchRowModel.java | 52 ++ .../catches/multipost/MultiPostConstants.java | 58 ++ .../catches/multipost/MultiPostExportService.java | 81 +- .../catches/multipost/MultiPostImportService.java | 194 ++++- .../export/pdf/CatchesPdfExportService.java | 90 +-- .../pupitri/{SpeciesRowModel.java => BoxType.java} | 39 +- .../pupitri/CarrouselImportRequestResult.java | 145 ++++ .../tutti/service/pupitri/PupitriCatch.java | 143 ---- .../service/pupitri/PupitriExportService.java | 84 +++ .../tutti/service/pupitri/PupitriImportResult.java | 295 +++++--- ...xportService.java => PupitriImportService.java} | 458 ++++++------ .../tutti/service/pupitri/PupitriSignContext.java | 89 +++ .../service/pupitri/PupitriSpeciesContext.java | 285 +++++++ .../service/pupitri/{ => csv}/CarrouselRow.java | 14 +- .../pupitri/{ => csv}/CarrouselRowModel.java | 23 +- .../service/pupitri/{ => csv}/SpeciesRow.java | 2 +- .../service/pupitri/{ => csv}/SpeciesRowModel.java | 2 +- .../tutti/service/pupitri/{ => csv}/TrunkRow.java | 3 +- .../service/pupitri/{ => csv}/TrunkRowModel.java | 3 +- .../pupitri/report/PupitriImportReportModel.java | 150 ++++ .../pupitri/report/PupitriImportReportRow.java | 108 +++ .../tutti/service/referential/GearModel.java | 6 - .../ifremer/tutti/service/referential/GearRow.java | 71 +- .../service/referential/ImportRequestResult.java | 111 +++ .../tutti/service/referential/PersonModel.java | 5 - .../tutti/service/referential/PersonRow.java | 58 +- .../referential/ReferentialExportService.java | 375 ---------- .../referential/ReferentialImportService.java | 832 ++++++++++----------- .../ReferentialTemporaryGearService.java | 305 ++++++++ .../ReferentialTemporaryPersonService.java | 292 ++++++++ .../ReferentialTemporarySpeciesService.java | 293 ++++++++ .../ReferentialTemporaryVesselService.java | 311 ++++++++ .../tutti/service/referential/SpeciesModel.java | 10 - .../tutti/service/referential/SpeciesRow.java | 45 +- .../tutti/service/referential/VesselModel.java | 1 - .../tutti/service/referential/VesselRow.java | 73 +- .../src/main/resources/ftl/pupitriReport_fr.ftl | 234 ++++++ .../resources/i18n/tutti-service_en_GB.properties | 16 +- .../resources/i18n/tutti-service_fr_FR.properties | 23 +- .../pupitri/PupitriImportServiceAno3898Test.java | 61 +- .../pupitri/PupitriImportServiceAno5032Test.java | 63 +- .../pupitri/PupitriImportServiceAno5079Test.java | 67 +- .../pupitri/PupitriImportServiceEvo5060Test.java | 59 +- .../pupitri/PupitriImportServiceEvo5062Test.java | 59 +- .../pupitri/PupitriImportServiceEvo6149Test.java | 203 +++++ ...viceTest.java => PupitriImportServiceTest.java} | 68 +- .../pupitri/PupitryImportServiceTestSupport.java | 77 ++ .../referential/ReferentialImportServiceTest.java | 464 ------------ ... => ReferentialTemporaryExportServiceTest.java} | 71 +- .../ReferentialTemporaryGearServiceTest.java | 172 +++++ .../ReferentialTemporaryPersonServiceTest.java | 122 +++ .../ReferentialTemporarySpeciesServiceTest.java | 207 +++++ .../ReferentialTemporaryVesselServiceTest.java | 137 ++++ .../src/test/resources/pupitri/evo-6149.car | 8 + .../src/test/resources/pupitri/evo-6149.tnk | 32 + .../test/resources/pupitri/evo-6149.tuttiProtocol | 154 ++++ tutti-ui-swing/pom.xml | 2 +- tutti-ui-swing/src/license/THIRD-PARTY.properties | 6 +- .../filtered-resources/tutti-help-fr.properties | 4 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 33 +- .../action/AbstractExportMultiPostAction.java | 93 --- .../action/AbstractImportMultiPostAction.java | 110 --- .../ui/swing/action/CreateBenthosMelagAction.java | 154 ++-- .../ui/swing/action/CreateSpeciesMelagAction.java | 158 ++-- .../swing/action/EditFishingOperationAction.java | 13 + .../tutti/ui/swing/action/ExportCruiseAction.java | 6 +- .../swing/action/ExportCruiseForSumatraAction.java | 6 +- .../action/ExportExistingTemporaryGearAction.java | 5 +- .../ExportExistingTemporaryPersonAction.java | 4 +- .../ExportExistingTemporarySpeciesAction.java | 4 +- .../ExportExistingTemporaryVesselAction.java | 4 +- .../ExportFishingOperationForSumatraAction.java | 12 +- ...n.java => ExportMultiPostAccidentalAction.java} | 22 +- .../swing/action/ExportMultiPostActionSupport.java | 200 +++++ ...tion.java => ExportMultiPostBenthosAction.java} | 20 +- .../swing/action/ExportMultiPostCatchAction.java | 87 +++ ...xportMultiPostIndividualObservationAction.java} | 22 +- ...java => ExportMultiPostMarineLitterAction.java} | 20 +- ...tion.java => ExportMultiPostSpeciesAction.java} | 20 +- .../tutti/ui/swing/action/ExportProgramAction.java | 6 +- .../tutti/ui/swing/action/ExportPupitriAction.java | 9 +- .../action/ExportTemporaryGearExampleAction.java | 5 +- .../action/ExportTemporaryPersonExampleAction.java | 5 +- .../ExportTemporarySpeciesExampleAction.java | 5 +- .../action/ExportTemporaryVesselExampleAction.java | 5 +- .../swing/action/ImportBenthosMultiPostAction.java | 126 ---- .../tutti/ui/swing/action/ImportCasinoAction.java | 44 -- ...n.java => ImportMultiPostAccidentalAction.java} | 22 +- .../swing/action/ImportMultiPostActionSupport.java | 262 +++++++ .../swing/action/ImportMultiPostBenthosAction.java | 111 +++ .../swing/action/ImportMultiPostCatchAction.java | 120 +++ ...mportMultiPostIndividualObservationAction.java} | 22 +- ...java => ImportMultiPostMarineLitterAction.java} | 67 +- .../swing/action/ImportMultiPostSpeciesAction.java | 112 +++ .../tutti/ui/swing/action/ImportPupitriAction.java | 89 ++- .../swing/action/ImportSpeciesMultiPostAction.java | 126 ---- .../ui/swing/action/ImportTemporaryGearAction.java | 4 +- .../swing/action/ImportTemporaryPersonAction.java | 4 +- .../swing/action/ImportTemporarySpeciesAction.java | 6 +- .../swing/action/ImportTemporaryVesselAction.java | 6 +- .../action/ReplaceTemporarySpeciesAction.java | 1 + .../swing/content/config/TuttiConfigUIHandler.java | 3 + .../tutti/ui/swing/content/home/SelectCruiseUI.css | 2 - .../content/operation/catches/EditCatchesUI.css | 19 + .../content/operation/catches/EditCatchesUI.jaxx | 2 + .../operation/catches/EditCatchesUIHandler.java | 23 +- .../operation/catches/SampleCategoryComponent.java | 35 +- ...wHelper.java => SpeciesAbleBatchRowHelper.java} | 54 +- .../catches/accidental/AccidentalBatchUI.css | 8 +- .../catches/accidental/AccidentalBatchUI.jaxx | 4 + .../accidental/AccidentalBatchUIHandler.java | 1 + .../catches/benthos/BenthosBatchTableModel.java | 2 +- .../operation/catches/benthos/BenthosBatchUI.css | 8 +- .../operation/catches/benthos/BenthosBatchUI.jaxx | 4 + .../catches/benthos/BenthosBatchUIHandler.java | 128 +--- .../IndividualObservationBatchUI.css | 8 +- .../IndividualObservationBatchUI.jaxx | 4 + .../IndividualObservationBatchUIHandler.java | 1 + .../catches/marinelitter/MarineLitterBatchUI.css | 8 +- .../catches/marinelitter/MarineLitterBatchUI.jaxx | 4 + .../marinelitter/MarineLitterBatchUIHandler.java | 2 +- .../catches/species/ImportPupitriPopupUI.css | 10 +- .../catches/species/ImportPupitriPopupUI.jaxx | 10 +- .../species/ImportPupitriPopupUIHandler.java | 86 ++- .../catches/species/SpeciesBatchTableModel.java | 14 +- .../operation/catches/species/SpeciesBatchUI.css | 8 +- .../operation/catches/species/SpeciesBatchUI.jaxx | 4 + .../catches/species/SpeciesBatchUIHandler.java | 72 +- .../content/protocol/EditProtocolUIHandler.java | 10 +- .../referential/ManageTemporaryReferentialUI.css | 2 +- .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 14 + .../util/attachment/AttachmentEditorUIHandler.java | 10 +- .../ui/swing/util/attachment/ButtonAttachment.java | 20 +- .../util/species/EnterMelagWeightUIHandler.java | 7 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 54 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 61 +- 173 files changed, 7610 insertions(+), 3386 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.