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 5be5a6d61b71c5048a2a93600c55dd0007808718 Merge: 05e9fe2 8ff80ce Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 4 16:43:44 2015 +0100 fixes 6688: [IMPORT GENERIQUE] Import générique .../java/fr/ifremer/tutti/TuttiConfiguration.java | 12 + .../fr/ifremer/tutti/TuttiConfigurationOption.java | 14 + .../tutti/persistence/TuttiPersistenceImpl.java | 31 + .../persistence/TuttiPersistenceNoDbImpl.java | 67 ++ .../tutti/persistence/entities/TuttiEntities.java | 5 +- .../tutti/persistence/entities/data/Cruises.java | 24 +- .../entities/data/FishingOperations.java | 21 +- .../entities/data/SpeciesAbleBatchs.java | 42 +- .../referential/GearWithOriginalRankOrders.java | 21 +- .../service/AccidentalBatchPersistenceService.java | 4 + .../AccidentalBatchPersistenceServiceImpl.java | 41 +- .../service/BenthosBatchPersistenceService.java | 4 + .../BenthosBatchPersistenceServiceImpl.java | 43 +- .../service/CruisePersistenceService.java | 2 + .../service/CruisePersistenceServiceImpl.java | 40 +- ...dividualObservationBatchPersistenceService.java | 4 + ...dualObservationBatchPersistenceServiceImpl.java | 63 +- .../MarineLitterBatchPersistenceService.java | 5 + .../MarineLitterBatchPersistenceServiceImpl.java | 41 +- .../service/SpeciesBatchPersistenceService.java | 4 + .../SpeciesBatchPersistenceServiceImpl.java | 48 +- .../referential/SpeciesPersistenceServiceImpl.java | 6 +- .../persistence/service/util/BatchTreeHelper.java | 4 +- .../tutti/persistence/test/CleanResourcesRule.java | 89 ++ .../tutti/persistence/test/DatabaseResource.java | 57 +- .../tutti/persistence/test/TuttiRunListener.java | 31 + .../tutti/persistence/test/TuttiTestSupport.java | 27 + .../i18n/tutti-persistence_en_GB.properties | 2 + .../i18n/tutti-persistence_fr_FR.properties | 2 + .../src/main/resources/queries-failsafe.hbm.xml | 15 + .../src/main/xmi/tutti-persistence.zargo | Bin 58181 -> 58384 bytes .../ifremer/tutti/service/PersistenceService.java | 36 +- .../fr/ifremer/tutti/service/TuttiDataContext.java | 105 +- .../ifremer/tutti/service/TuttiServiceContext.java | 8 +- .../tutti/service/TuttiValidationDataContext.java | 87 ++ .../service/TuttiValidationDataContextSupport.java | 152 +++ .../ifremer/tutti/service/ValidationService.java | 12 +- .../csv/CaracteristicValueParseException.java | 46 + .../csv/CaracteristicValueParserFormatter.java | 5 + .../service/csv/CommentListParserFormatter.java | 23 + .../tutti/service/csv/CommentParserFormatter.java | 25 + .../fr/ifremer/tutti/service/csv/CsvComsumer.java | 63 +- .../tutti/service/csv/GearListParserFormatter.java | 2 +- ...upport.java => ListParserFormatterSupport.java} | 21 +- .../service/csv/PersonListParserFormatter.java | 2 +- .../tutti/service/csv/SpeciesParserFormatter.java | 2 +- .../fr/ifremer/tutti/service/csv/TuttiCsvUtil.java | 29 +- .../service/csv/VesselListParserFormatter.java | 2 +- .../genericformat/GenericFormatArchive.java | 261 +++-- ...GenericFormatArchiveInvalidLayoutException.java | 38 + .../genericformat/GenericFormatCsvFileResult.java | 42 + .../genericformat/GenericFormatExportContext.java | 9 +- .../genericformat/GenericFormatExportService.java | 244 ++--- .../genericformat/GenericFormatFileResult.java | 91 ++ .../GenericFormatImportConfiguration.java | 75 ++ .../genericformat/GenericFormatImportContext.java | 448 ++++++++- .../GenericFormatImportCruiseContext.java | 153 +++ .../GenericFormatImportCruiseResult.java | 73 ++ .../GenericFormatImportEntityParserFactory.java | 34 +- .../GenericFormatImportOperationContext.java | 259 +++++ .../GenericFormatImportOperationResult.java | 148 +++ .../genericformat/GenericFormatImportRequest.java | 69 +- .../genericformat/GenericFormatImportResult.java | 104 +- .../genericformat/GenericFormatImportService.java | 600 ++++-------- .../GenericFormatImportValidationDataContext.java | 97 ++ .../GenericFormatImportValidationHelper.java | 193 ++++ .../GenericFormatReferentialImportResult.java | 46 +- .../genericformat/GenericFormatResultSupport.java | 231 +++++ .../genericformat/GenericFormatServiceSupport.java | 139 +++ .../GenericFormatValidateFileContext.java | 72 ++ .../GenericFormatValidateFileResult.java | 17 + .../GenericformatImportPersitenceHelper.java | 448 +++++++++ .../consumer/CruiseAlreadyExistException.java | 2 +- ...on.java => CruiseAlreadyImportedException.java} | 6 +- .../consumer/CruiseNotFoundException.java | 43 + .../consumer/CruiseNotValidException.java | 34 +- .../consumer/CsvConsumerForAccidentalCatch.java | 77 +- .../consumer/CsvConsumerForCatch.java | 262 ++++- .../consumer/CsvConsumerForGearCaracteristic.java | 64 +- .../CsvConsumerForIndividualObservation.java | 77 +- .../consumer/CsvConsumerForMarineLitter.java | 32 +- .../consumer/CsvConsumerForOperation.java | 100 +- .../consumer/CsvConsumerForParameter.java | 76 +- .../consumer/CsvConsumerForSampleCategory.java | 18 +- .../consumer/CsvConsumerForSurvey.java | 66 +- .../FishingOperationAlreadyImportedException.java | 32 + .../FishingOperationNotFoundInCruiseException.java | 33 + .../FishingOperationNotValidException.java | 46 + .../consumer/GearNotFoundInCruiseException.java | 47 + .../consumer/MismatchProgramException.java | 39 + .../genericformat/csv/AccidentalCatchModel.java | 13 +- .../genericformat/csv/AccidentalCatchRow.java | 81 +- .../service/genericformat/csv/CatchModel.java | 29 +- .../tutti/service/genericformat/csv/CatchRow.java | 199 ++-- .../genericformat/csv/ExportSampleCategory.java | 4 + .../genericformat/csv/GearCaracteristicModel.java | 11 +- .../genericformat/csv/GearCaracteristicRow.java | 52 +- .../csv/IndividualObservationModel.java | 14 +- .../csv/IndividualObservationRow.java | 78 +- .../genericformat/csv/MarineLitterModel.java | 9 +- .../service/genericformat/csv/MarineLitterRow.java | 83 +- .../service/genericformat/csv/OperationModel.java | 51 +- .../service/genericformat/csv/OperationRow.java | 455 +++++---- .../service/genericformat/csv/ParameterModel.java | 6 +- .../service/genericformat/csv/ParameterRow.java | 51 +- .../csv/RowWithCruiseContextSupport.java | 58 ++ .../csv/RowWithOperationContextSupport.java | 55 ++ .../genericformat/csv/SampleCategoryRow.java | 2 +- .../service/genericformat/csv/SurveyModel.java | 5 +- .../tutti/service/genericformat/csv/SurveyRow.java | 85 +- .../importactions/DoCheckWeightAction.java | 67 ++ .../importactions/DoCleanWeightAction.java | 64 ++ .../importactions/ImportAccidentalCatchAction.java | 69 ++ .../importactions/ImportActionSupport.java | 41 + .../importactions/ImportCatchAction.java | 70 ++ .../ImportGearCaracteristicAction.java | 69 ++ .../ImportIndividualObservationAction.java | 69 ++ .../importactions/ImportMarineLitterAction.java | 69 ++ .../importactions/ImportOperationAction.java | 76 ++ .../importactions/ImportParameterAction.java | 69 ++ .../importactions/ImportProtocolAction.java | 121 +++ .../importactions/ImportReferentialGearAction.java | 98 ++ .../ImportReferentialPersonAction.java | 99 ++ .../ImportReferentialSpeciesAction.java | 100 ++ .../ImportReferentialVesselAction.java | 95 ++ .../importactions/ImportSurveyAction.java | 73 ++ .../ValidateAccidentalCatchAction.java | 71 ++ .../importactions/ValidateCatchAction.java | 71 ++ .../ValidateGearCaracteristicAction.java | 71 ++ .../ValidateIndividualObservationAction.java | 72 ++ .../importactions/ValidateMarineLitterAction.java | 71 ++ .../importactions/ValidateOperationAction.java | 81 ++ .../importactions/ValidateParameterAction.java | 71 ++ .../ValidateSampleCategoryAction.java | 73 ++ .../importactions/ValidateSurveyAction.java | 74 ++ .../producer/CsvProducerForAccidentalCatch.java | 6 +- .../producer/CsvProducerForCatch.java | 25 +- .../producer/CsvProducerForGearCaracteristics.java | 1 + .../CsvProducerForIndividualObservation.java | 8 +- .../producer/CsvProducerForMarineLitter.java | 2 +- .../producer/CsvProducerForOperation.java | 1 + .../producer/CsvProducerForParameter.java | 11 +- .../referential/ReferentialImportRequest.java | 24 +- .../ReferentialTemporaryGearService.java | 2 +- .../ReferentialTemporaryPersonService.java | 2 +- .../ReferentialTemporarySpeciesService.java | 2 +- .../ReferentialTemporaryVesselService.java | 11 +- .../consumer/CsvConsumerForTemporaryGear.java | 80 +- .../consumer/CsvConsumerForTemporaryPerson.java | 80 +- .../consumer/CsvConsumerForTemporarySpecies.java | 80 +- .../consumer/CsvConsumerForTemporaryVessel.java | 81 +- .../csv/TemporaryReferentialEntityIdParser.java | 6 - .../resources/ftl/genericFormatImportReport_fr.ftl | 502 ++++++++++ .../ftl/genericFormatValidateReport_fr.ftl | 502 ++++++++++ .../resources/i18n/tutti-service_en_GB.properties | 195 ++-- .../resources/i18n/tutti-service_fr_FR.properties | 172 ++-- .../ifremer/tutti/service/ServiceDbResource.java | 10 +- .../tutti/service/ValidationServiceTest.java | 48 +- .../GenericFormatExportService2Test.java | 240 ----- .../GenericFormatExportServiceTest.java | 149 ++- .../GenericFormatImportServiceTest.java | 196 +++- .../GenericFormatImportServiceTestSupport.java | 89 ++ .../GenericFormatImportServiceValidTest.java | 1015 ++++++++++++++++++++ .../accidentalCatch/accidentalCatch.csv | 15 + .../badAccidentalCatchFormat/accidentalCatch.csv | 15 + .../badAccidentalCatchImport/accidentalCatch.csv | 15 + .../genericFormat/badCatchFormat/catch.csv | 433 +++++++++ .../genericFormat/badCatchImport/catch.csv | 433 +++++++++ .../gearCaracteristics.csv | 3 + .../gearCaracteristics.csv | 6 + .../individualObservation.csv | 26 + .../individualObservation.csv | 26 + .../badMarineLitterFormat/marineLitter.csv | 4 + .../badMarineLitterImport/marineLitter.csv | 4 + .../genericFormat/badOperationFormat/operation.csv | 3 + .../{empty => badOperationImport}/operation.csv | 6 +- .../protocol.tuttiProtocol | 16 +- .../protocol.tuttiProtocol | 18 +- .../sampleCategory.csv | 4 +- .../genericFormat/badSurveyFormat/survey.csv | 2 + .../{empty => badSurveyImport}/survey.csv | 4 +- .../temporaryGears.csv | 5 + .../temporaryGears.csv | 5 + .../temporaryPersons.csv | 4 + .../temporaryPersons.csv | 6 + .../temporarySpecies.csv | 2 +- .../temporarySpecies.csv | 6 +- .../temporaryVessels.csv | 5 + .../temporaryVessels.csv | 9 + .../test/resources/genericFormat/catch/catch.csv | 433 +++++++++ .../genericFormat/default/accidentalCatch.csv | 15 + .../test/resources/genericFormat/default/catch.csv | 433 +++++++++ .../genericFormat/default/gearCaracteristics.csv | 3 + .../default/individualObservation.csv | 26 + .../genericFormat/default/marineLitter.csv | 4 + .../genericFormat/{empty => default}/operation.csv | 4 +- .../resources/genericFormat/default/parameter.csv | 12 + .../genericFormat/{empty => default}/survey.csv | 2 +- .../genericFormat/empty/accidentalCatch.csv | 2 +- .../test/resources/genericFormat/empty/catch.csv | 2 +- .../genericFormat/empty/gearCaracteristics.csv | 2 +- .../genericFormat/empty/individualObservation.csv | 2 +- .../resources/genericFormat/empty/marineLitter.csv | 2 +- .../resources/genericFormat/empty/operation.csv | 2 +- .../resources/genericFormat/empty/parameter.csv | 2 +- .../test/resources/genericFormat/empty/survey.csv | 3 +- .../genericFormat/empty/temporaryVessels.csv | 1 - .../gearCaracteristic/gearCaracteristics.csv | 3 + .../individualObservation.csv | 26 + .../genericFormat/marineLitter/marineLitter.csv | 4 + .../onlyCruise/gearCaracteristics.csv | 3 + .../genericFormat/{empty => onlyCruise}/survey.csv | 2 +- .../{empty => operation}/operation.csv | 4 +- .../{empty => protocol}/protocol.tuttiProtocol | 0 .../genericFormat/referentials/temporaryGears.csv | 5 + .../{empty => referentials}/temporaryPersons.csv | 0 .../{empty => referentials}/temporarySpecies.csv | 0 .../referentials/temporaryVessels.csv | 5 + .../{empty => sampleCategory}/sampleCategory.csv | 2 +- .../sampleCategory.csv | 4 +- .../genericFormat/{empty => survey}/survey.csv | 2 +- tutti-service/src/test/resources/log4j.properties | 2 + .../src/main/filtered-resources/log4j.properties | 3 +- .../filtered-resources/tutti-help-fr.properties | 97 +- .../fr/{genericExport.html => genericFormat.html} | 20 +- tutti-ui-swing/src/main/help/fr/index.html | 2 +- .../main/help/fr/manageTemporaryReferential.html | 2 + tutti-ui-swing/src/main/help/fr/menu.html | 2 + tutti-ui-swing/src/main/help/fr/navbar.js | 2 +- .../fr/ifremer/tutti/ui/swing/TuttiScreen.java | 8 +- .../action/ExportGenericFormatCruiseAction.java | 2 +- .../ExportGenericFormatProgramCruisesAction.java | 5 +- .../ImportGenericFormatProgramCruisesAction.java | 14 +- .../action/OpenGenericFormatImportScreen.java | 41 + .../fr/ifremer/tutti/ui/swing/content/MainUI.css | 10 + .../fr/ifremer/tutti/ui/swing/content/MainUI.jaxx | 1 + .../tutti/ui/swing/content/MainUIHandler.java | 8 + .../swing/content/config/TuttiConfigUIHandler.java | 6 + .../genericformat/GenericFormatImportUI.css | 154 +++ .../genericformat/GenericFormatImportUI.jaxx | 156 +++ .../GenericFormatImportUIHandler.java | 139 +++ .../genericformat/GenericFormatImportUIModel.java | 230 +++++ .../actions/GenericFormatImportAction.java | 189 ++++ .../actions/GenericFormatValidateAction.java | 130 +++ .../OpenGenericFormatImportReportAction.java | 55 ++ .../OpenGenericFormatValidateReportAction.java | 55 ++ .../SaveGenericFormatImportReportAction.java | 78 ++ .../SaveGenericFormatValidateReportAction.java | 78 ++ .../tutti/ui/swing/content/home/SelectCruiseUI.css | 2 +- .../ui/swing/content/protocol/EditProtocolUI.css | 2 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 92 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 91 +- 252 files changed, 14289 insertions(+), 2591 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.