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 2317940a78ced0bf3d22f1d13047666a1cfc5b56 Merge: 2cbb96b fac0aa9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 16 14:24:11 2015 +0100 fixes #6612: [EXPORT GENERIQUE] Consolidation de l’export générique (merge into develop) pom.xml | 2 +- .../tutti/persistence/TuttiPersistenceImpl.java | 63 +- .../persistence/TuttiPersistenceNoDbImpl.java | 53 +- .../tutti/persistence/entities/TuttiEntities.java | 21 - .../tutti/persistence/entities/data/Cruises.java | 13 + .../tutti/persistence/entities/data/Programs.java | 21 + .../entities/protocol/TuttiProtocols.java | 40 + .../CaracteristicQualitativeValues.java | 23 +- .../persistence/entities/referential/Gears.java | 27 +- .../persistence/entities/referential/Persons.java | 28 +- .../persistence/entities/referential/Speciess.java | 44 +- .../entities/referential/TuttiLocations.java | 33 + .../persistence/entities/referential/Vessels.java | 47 +- .../service/ProtocolPersistenceService.java | 11 + .../service/ProtocolPersistenceServiceImpl.java | 20 + .../referential/GearPersistenceService.java | 29 +- .../referential/GearPersistenceServiceImpl.java | 102 +- .../referential/PersonPersistenceService.java | 29 +- .../referential/PersonPersistenceServiceImpl.java | 108 ++- .../referential/SpeciesPersistenceService.java | 29 +- .../referential/SpeciesPersistenceServiceImpl.java | 86 +- .../referential/VesselPersistenceService.java | 29 +- .../referential/VesselPersistenceServiceImpl.java | 99 +- .../src/main/resources/queries-failsafe.hbm.xml | 106 +- .../entities/protocol/TuttiProtocolsTest.java | 21 +- .../GearPersistenceServiceWriteTest.java | 4 +- .../PersonPersistenceServiceWriteTest.java | 4 +- .../SpeciesPersistenceServiceReadTest.java | 2 +- .../SpeciesPersistenceServiceWriteTest.java | 4 +- .../VesselPersistenceServiceWriteTest.java | 4 +- .../ifremer/tutti/service/PdfGeneratorService.java | 2 +- .../ifremer/tutti/service/PersistenceService.java | 77 +- .../fr/ifremer/tutti/service/TuttiCsvUtil.java | 942 ------------------ .../service/bigfin/csv/BigfinDataRowModel.java | 4 +- .../AbstractFishingOperationRowModel.java | 5 +- .../catches/multipost/AccidentalCatchRowModel.java | 51 +- .../catches/multipost/AttachmentRowModel.java | 5 +- .../catches/multipost/CaracteristicRowModel.java | 21 +- .../catches/multipost/CatchBatchRowModel.java | 2 +- .../catches/multipost/CatchFrequencyRowModel.java | 23 +- .../service/catches/multipost/CatchRowModel.java | 35 +- .../catches/multipost/CatchWeightsRowModel.java | 12 +- .../multipost/IndividualObservationRowModel.java | 32 +- .../catches/multipost/MarineLitterRowModel.java | 35 +- .../multipost/MarineLitterWeightRowModel.java | 5 +- .../catches/multipost/MultiPostImportService.java | 97 +- .../csv/AbstractTuttiImportExportModel.java | 63 ++ .../service/csv/AbstractTuttiImportModel.java | 28 + .../tutti/service/csv/BeanIndexNullableGetter.java | 50 + .../tutti/service/csv/BeanNullableGetter.java | 39 + .../tutti/service/csv/BeanPropertyFormatter.java | 37 + .../service/csv/CaracteristicParserFormatter.java | 46 + .../csv/CaracteristicValueParserFormatter.java | 114 +++ .../tutti/service/csv/CountryFormatter.java | 23 + .../fr/ifremer/tutti/service/csv/CsvComsumer.java | 107 +++ .../fr/ifremer/tutti/service/csv/CsvProducer.java | 58 ++ .../csv/EntityListParserFormatterSupport.java | 52 + .../tutti/service/csv/EntityNotFoundException.java | 39 + .../service/csv/EntityParserFormatterSupport.java | 107 +++ .../service/csv/EnumByNameParserFormatter.java | 50 + .../FishingOperationLocationParserFormatter.java | 49 + .../csv/FishingOperationStrataParserFormatter.java | 49 + .../FishingOperationSubStrataParserFormatter.java | 49 + .../service/csv/ForeignKeyListParserFormatter.java | 68 ++ .../service/csv/ForeignKeyParserFormatter.java | 57 ++ .../tutti/service/csv/GearListParserFormatter.java | 25 + .../tutti/service/csv/GearParserFormatter.java | 63 ++ .../tutti/service/csv/HarbourParserFormatter.java | 48 + .../tutti/service/csv/ImportModelWithHeader.java | 13 + .../service/csv/IntegerListParserFormatter.java | 43 + .../service/csv/PersonListParserFormatter.java | 25 + .../tutti/service/csv/PersonParserFormatter.java | 60 ++ .../tutti/service/csv/ProgramParserFormatter.java | 46 + .../tutti/service/csv/ProgramZoneFormatter.java | 23 + .../tutti/service/csv/SpeciesParserFormatter.java | 75 ++ .../tutti/service/csv/StringParserFormatter.java | 30 + .../fr/ifremer/tutti/service/csv/TuttiCsvUtil.java | 225 +++++ .../tutti/service/csv/TuttiRepeatableExport.java | 25 + .../service/csv/VesselListParserFormatter.java | 25 + .../tutti/service/csv/VesselParserFormatter.java | 63 ++ .../export/generic/AccidentalCatchExportModel.java | 167 ---- .../generic/GearCaracteristicExportModel.java | 74 -- .../generic/IndividualObservationExportModel.java | 145 --- .../export/generic/MarineLitterExportModel.java | 82 -- .../export/generic/OperationExportModel.java | 143 --- .../export/generic/ParameterExportModel.java | 92 -- .../service/export/generic/SpeciesExportModel.java | 75 -- .../service/export/generic/SurveyExportModel.java | 68 -- .../service/export/generic/TuttiExportService.java | 1014 -------------------- .../service/export/sumatra/CatchRowModel.java | 7 +- .../genericformat/GenericFormatArchive.java | 415 ++++++++ .../genericformat/GenericFormatExportContext.java | 252 +++++ .../GenericFormatExportOperationContext.java | 206 ++++ .../genericformat/GenericFormatExportService.java | 820 ++++++++++++++++ .../genericformat/GenericFormatImportContext.java | 139 +++ .../GenericFormatImportEntityParserFactory.java | 187 ++++ .../genericformat/GenericFormatImportRequest.java | 73 ++ .../genericformat/GenericFormatImportResult.java | 104 ++ .../genericformat/GenericFormatImportService.java | 552 +++++++++++ .../GenericFormatReferentialImportResult.java | 122 +++ .../consumer/CruiseAlreadyExistException.java | 32 + .../consumer/CruiseNotValidException.java | 58 ++ .../consumer/CsvConsumerForAccidentalCatch.java | 37 + .../consumer/CsvConsumerForCatch.java | 39 + .../consumer/CsvConsumerForGearCaracteristic.java | 38 + .../CsvConsumerForIndividualObservation.java | 38 + .../consumer/CsvConsumerForMarineLitter.java | 38 + .../consumer/CsvConsumerForOperation.java | 38 + .../consumer/CsvConsumerForParameter.java | 38 + .../consumer/CsvConsumerForSampleCategory.java | 79 ++ .../consumer/CsvConsumerForSurvey.java | 56 ++ .../genericformat/csv/AccidentalCatchModel.java | 119 +++ .../csv/AccidentalCatchRow.java} | 4 +- .../service/genericformat/csv/CatchModel.java | 216 +++++ .../csv/CatchRow.java} | 34 +- .../csv}/ExportSampleCategory.java | 2 +- .../genericformat/csv/GearCaracteristicModel.java | 107 +++ .../csv/GearCaracteristicRow.java} | 20 +- .../csv/IndividualObservationModel.java | 120 +++ .../csv/IndividualObservationRow.java} | 4 +- .../genericformat/csv/MarineLitterModel.java | 117 +++ .../csv/MarineLitterRow.java} | 4 +- .../service/genericformat/csv/OperationModel.java | 268 ++++++ .../csv/OperationRow.java} | 97 +- .../service/genericformat/csv/ParameterModel.java | 105 ++ .../csv/ParameterRow.java} | 4 +- .../genericformat/csv/SampleCategoryModel.java | 61 ++ .../genericformat/csv/SampleCategoryRow.java | 56 ++ .../genericformat/csv/SpeciesExportModel.java | 65 ++ .../csv}/SpeciesExportRow.java | 2 +- .../service/genericformat/csv/SurveyModel.java | 128 +++ .../csv/SurveyRow.java} | 64 +- .../producer/CsvProducerForAccidentalCatch.java | 115 +++ .../producer/CsvProducerForCatch.java} | 325 +++---- .../producer/CsvProducerForGearCaracteristics.java | 50 + .../CsvProducerForIndividualObservation.java | 100 ++ .../producer/CsvProducerForMarineLitter.java | 49 + .../producer/CsvProducerForOperation.java | 35 + .../producer/CsvProducerForParameter.java | 62 ++ .../producer/CsvProducerForSampleCategory.java | 40 + .../producer/CsvProducerForSpecies.java | 100 ++ .../producer/CsvProducerForSurvey.java | 32 + .../operationimport/ImportFromColumnFileModel.java | 19 +- .../service/protocol/CaracteristicRowModel.java | 5 +- .../tutti/service/protocol/SpeciesRowModel.java | 17 +- .../service/pupitri/PupitriImportService.java | 4 +- .../service/pupitri/csv/CarrouselRowModel.java | 5 +- .../tutti/service/pupitri/csv/SpeciesRowModel.java | 4 +- .../tutti/service/pupitri/csv/TrunkRowModel.java | 5 +- ...stResult.java => ReferentialImportRequest.java} | 33 +- .../referential/ReferentialImportResult.java | 38 +- .../referential/ReferentialImportService.java | 752 --------------- .../ReferentialTemporaryGearService.java | 209 ++-- .../ReferentialTemporaryPersonService.java | 204 ++-- .../ReferentialTemporarySpeciesService.java | 200 ++-- .../ReferentialTemporaryVesselService.java | 200 +--- .../consumer/CsvConsumerForTemporaryGear.java | 198 ++++ .../consumer/CsvConsumerForTemporaryPerson.java | 195 ++++ .../consumer/CsvConsumerForTemporarySpecies.java | 200 ++++ .../consumer/CsvConsumerForTemporaryVessel.java | 199 ++++ .../service/referential/{ => csv}/GearModel.java | 54 +- .../service/referential/{ => csv}/GearRow.java | 2 +- .../service/referential/{ => csv}/PersonModel.java | 54 +- .../service/referential/{ => csv}/PersonRow.java | 10 +- .../referential/{ => csv}/SpeciesModel.java | 54 +- .../service/referential/{ => csv}/SpeciesRow.java | 2 +- .../TemporaryReferentialEntityIdParser.java | 19 +- .../service/referential/{ => csv}/VesselModel.java | 59 +- .../service/referential/{ => csv}/VesselRow.java | 2 +- .../producer/CsvProducerForTemporaryGear.java | 38 + .../producer/CsvProducerForTemporaryPerson.java | 38 + .../producer/CsvProducerForTemporarySpecies.java | 38 + .../producer/CsvProducerForTemporaryVessel.java | 38 + .../tutti/service/report/ReportService.java | 4 +- .../resources/i18n/tutti-service_en_GB.properties | 105 +- .../resources/i18n/tutti-service_fr_FR.properties | 106 +- .../ifremer/tutti/service/ServiceDbResource.java | 15 +- .../export/generic/TuttiExportServiceTest.java | 505 ---------- .../GenericFormatExportService2Test.java} | 8 +- .../GenericFormatExportServiceAno5804Test.java} | 8 +- .../GenericFormatExportServiceTest.java | 548 +++++++++++ .../GenericFormatImportServiceTest.java | 80 ++ .../pupitri/PupitriImportServiceAno5079Test.java | 2 +- .../ReferentialTemporaryExportServiceTest.java | 3 + .../ReferentialTemporaryGearServiceTest.java | 8 +- .../ReferentialTemporaryPersonServiceTest.java | 4 +- .../ReferentialTemporarySpeciesServiceTest.java | 12 +- .../ReferentialTemporaryVesselServiceTest.java | 6 +- .../genericFormat/empty/accidentalCatch.csv | 1 + .../test/resources/genericFormat/empty/catch.csv | 1 + .../genericFormat/empty/gearCaracteristics.csv | 1 + .../genericFormat/empty/individualObservation.csv | 1 + .../resources/genericFormat/empty/marineLitter.csv | 1 + .../resources/genericFormat/empty/operation.csv | 1 + .../resources/genericFormat/empty/parameter.csv | 1 + .../genericFormat/empty/protocol.tuttiProtocol | 81 ++ .../genericFormat/empty/sampleCategory.csv | 6 + .../test/resources/genericFormat/empty/survey.csv | 2 + .../genericFormat/empty/temporaryPersons.csv | 4 + .../genericFormat/empty/temporarySpecies.csv | 9 + .../genericFormat/empty/temporaryVessels.csv | 1 + .../filtered-resources/tutti-help-fr.properties | 3 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 11 +- .../tutti/ui/swing/action/AbstractTuttiAction.java | 3 +- ...n.java => ExportGenericFormatCruiseAction.java} | 32 +- ...> ExportGenericFormatProgramCruisesAction.java} | 38 +- .../ui/swing/action/ExportProtocolAction.java | 2 +- .../ImportGenericFormatProgramCruisesAction.java | 105 ++ .../ui/swing/action/ImportProtocolAction.java | 7 +- .../action/OpenReplaceTemporaryGearUIAction.java | 3 +- .../action/OpenReplaceTemporaryVesselUIAction.java | 3 +- .../action/SelectSpeciesForBenthosBatchAction.java | 2 +- ...SpeciesForIndividualObservationBatchAction.java | 2 +- .../action/SelectSpeciesForSpeciesBatchAction.java | 2 +- .../tutti/ui/swing/content/home/SelectCruiseUI.css | 14 +- .../ui/swing/content/home/SelectCruiseUI.jaxx | 1 + .../content/protocol/EditProtocolUIHandler.java | 5 +- .../content/protocol/EditProtocolUIModel.java | 10 +- .../ManageTemporaryReferentialUIHandler.java | 17 +- .../GearCaracteristicListCellRenderer.java | 2 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 10 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 10 + 222 files changed, 11259 insertions(+), 5499 deletions(-) diff --cc tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Speciess.java index 4e8f7df,d689d30..959f61b --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Speciess.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Speciess.java @@@ -122,21 -152,10 +152,21 @@@ public class Speciess extends AbstractS return Multimaps.index(list, GET_SURVEY_CODE); } - public static Set<String> toTaxonIds(List<Species> list) { + public static Set<String> toReferenceTaxonIds(List<Species> list) { Set<String> result = list == null ? Collections.<String>emptySet() : - Sets.newHashSet(Lists.transform(list, GET_TAXON_ID)); + Sets.newHashSet(Lists.transform(list, GET_REFERECE_TAXON_ID)); return result; } -} + + public static String getSurveyCodeOrRefTaxCode(Species species) { + String code = species.getSurveyCode(); + + if (code == null) { + + // use refTaxCode + code = species.getRefTaxCode(); + } + return code; + } +} //Speciess diff --cc tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties index 573b92b,2fce70a..69e5e3b --- a/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties +++ b/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties @@@ -1,28 -1,5 +1,28 @@@ +### +# #%L +# Tutti :: UI +# $Id:$ +# $HeadURL:$ +# %% +# Copyright (C) 2012 - 2015 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo - #Thu Jan 29 11:48:31 CET 2015 + #Mon Feb 16 09:45:58 CET 2015 \ "tutti.editProtocol.action.addCaracteristicMapping.help"\ = tutti.config.help=config.html tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions diff --cc tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java index 8b086b2,01cd2e9..62f9d4b --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java @@@ -722,12 -722,12 +723,16 @@@ public class TuttiUIContext extends Abs return serviceContext.getService(CatchesPdfExportService.class); } + public ToConfirmReportService getToConfirmReportService() { + return serviceContext.getService(ToConfirmReportService.class); + } + - public TuttiExportService getTuttiExportService() { - return serviceContext.getService(TuttiExportService.class); + public GenericFormatExportService getGenericFormatExportService() { + return serviceContext.getService(GenericFormatExportService.class); + } + + public GenericFormatImportService getGenericFormatImportService() { + return serviceContext.getService(GenericFormatImportService.class); } public CatchesSumatraExportService getCatchesSumatraExportService() { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.