This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 05e9fe2 fixes #6690: [TECH] activer via Entrée un bouton qui à le focus Merge branch 'feature/6690' into develop adds c923a9f fix Cruises.equals method adds 1497a43 Introduce an object to persist while importing adds 0ac8b0d convert gears to geraWithOriginalOrder to avoid Class cast exceptions adds c3bbf77 improve caracteristic value parser adds 16e39ff validate cruise adds 1121f0c validate gear caracteristics adds 5a199fa improve API + persist cruises and gear caracteristics adds 6c09cdf debut d'import des operations adds 6f85685 fix build adds a27b75c fix cast adds 55b1d04 ajout jeu de données d'operations adds 2e6ff34 import des opérations adds 9b4e670 ajout d'un equals sur les operations adds 2257939 nettoyage context d'export adds 39c37e4 renommage de la methode de validation d'une ligne + ajout de la methode de preparation pour les autres fichiers adds 150c45e ca continue l'import... adds ed04df0 introduce TuttiValidationDataContextSupport to be able to use it inside import without using the data context adds baf3d18 validation service is a simple service (no usage at all of the service context) adds 091198b fix validation service test using a customize validation data context adds d223279 be able to change the validation data context in the value stack adds 4091623 introduce validation helper + continue importing operations adds 6ba064f fix test campaign adds 1b8c7f3 do not want to see some logs from nowhere... adds 03f7d78 fix list parser when empty value (gave a empty entry) adds a262617 do not test start date to compare fishing operations adds f4a020e add caracteristic type in fishing operation parameters import/export adds 8f74ae4 import of fishing operation parameters is done adds 4dee86b add some methods to create a collections of entities adds 3c9f2a8 only parse referent species adds 0b4d72a introduce some row support (for cruise context and operation context) + adapts csv rows for import adds 2a79044 impact row changes to producers adds b106048 introduce operation import context adds 18186d9 open api adds d560f0c add another caracteristic parser (with protected one) adds 2f27401 add usefull validation method for consumers + continue import for marine litter, accidental catches and individual observations adds a4c4ba4 add more data for test adds 984e593 use immutable list and not set + remove todo adds c280091 fix log level to show batch tree adds efbe375 delete no more used test (db associated was lost...) adds 1b320da fix marine litter pb adds 90d909e add engin_id + fix computed flag (they must be nullable) adds 5642b0d fix tests + update test data adds edacc60 reformat + imporve gear rank order import-export adds 44f5de5 check engin + rank oder are in cruise adds e55d5ea fix header name adds bb4050a gear rank order can be null (if no gear) adds f063f8d operation parameters were not saved adds d5878b9 add comment and list comment parser formatter adds 092e141 refactor list parser formatter adds 21abd49 add fishingOperation on SpeciesAbleBatch + usefull method to create one from his parent adds 31c1f61 fix test when no gear adds f3c6b23 add catch test data adds f9212e6 import catches (stabilize csv model + do the process math) adds fe12fd6 fix batch creation adds 923d204 generic import is ok \o/ adds 86c2f9e - normalize i18n keys - finalize import - improve import result API - imporve import context API - add clean weights + ccheck weights on imported operations adds 0a5891a - amélioration du calcul du nombre d'étapes - mise en place de la progression - amélioration de l'API de requete et resultat adds b040b43 prepare test mecanism adds 61aa270 do not log when using progression model adds d6a5667 fix export check cruise adds 903b37d fix i18n adds d4b1000 introduce a import configuration object adds c1635ba fix get linked species code adds e0a945a improve test API adds 25823e4 improve how to lanche generic format import test adds be49961 fix NPE when no test descirption register adds 5791b0d fix referential entity id parser adds ed69b29 add gears and vessels temporary entities to import adds fe19de0 test involution when importing temporary referentials adds 5ce290a add getAllCruiseId to only grab ids of cruise adds bd6f2ef can override cruise + test for it adds a1b9ead make Serializable some objects (to include them in a ui model) + add a valid result state adds d64ac8d make serializable configuration adds c2188a8 change rank order to short for gear + only check gear on operation if there is one adds 573a659 review howto validate the layout of an archive adds 7bf0b6e add report file in configuration adds 5cfc0ce be able to adapt progression total adds 3f35fa2 fix archive api (to be serializable) adds b7d0d75 add validate import file methods in service adds de1b81b ajout d'une option de configuration pour le répertoire de sauvegarde des rapports lors de l'import générique adds 63d7e08 update TODO in doc adds cb8517a mise en place des rapports de validation adds ae34247 fix css adds 11bdb67 ecran d'import au format generique adds 30ace56 add failFast option in csvconsumer adds 83babc1 add new line of temporary files (should fix this one...) adds 1e67a06 introduce file result adds bd1fccc -mmissing vessel linked adds 92390da use failfats mode in normal temporary referential import adds 7e02fa9 count file lines adds acb35e6 add failfast option when loading files + show inmport configuration for report generation adds 17510cb introduce result support + begin of validate report adds 8605d60 continue validation adds 97dfac1 suppression de l'engin dans les fichiers non requis adds fcb325d improve errors messages for referential imports adds 841732a improve file result api and add a file result for any files (protocol included) adds 91e36e3 continue import validation + add more tests on it adds 3d10fbc validate surey.csv file + improve validation result adds 7854d55 ajout de la structure pour tester les cas nomimaux (reste juste à bien tous les écrire...) adds 9b258b7 use atomic actions for validate and import steps to be able to skip them more easely adds 88ebc3e continue report + i18n adds 6e3e891 fix report extension in save report actions adds 3ca60d5 ajout d'une option pour ne pas sauvegarder à chaque import adds 4db4913 executer les actions uniquement si demandé adds fe3aa03 correction i18n adds 0ee5874 amélioration chargement des référentiels si besoin adds 8ff80ce finir l'interface d'import new 5be5a6d fixes 6688: [IMPORT GENERIQUE] Import générique The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: 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 Summary of changes: .../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(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/CleanResourcesRule.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/TuttiTestSupport.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiValidationDataContext.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiValidationDataContextSupport.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CaracteristicValueParseException.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CommentListParserFormatter.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CommentParserFormatter.java rename tutti-service/src/main/java/fr/ifremer/tutti/service/csv/{EntityListParserFormatterSupport.java => ListParserFormatterSupport.java} (60%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatArchiveInvalidLayoutException.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatCsvFileResult.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatFileResult.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportConfiguration.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportCruiseContext.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportCruiseResult.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportOperationContext.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportOperationResult.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportValidationDataContext.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportValidationHelper.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatResultSupport.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatServiceSupport.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatValidateFileContext.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatValidateFileResult.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericformatImportPersitenceHelper.java copy tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/{CruiseAlreadyExistException.java => CruiseAlreadyImportedException.java} (68%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CruiseNotFoundException.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/FishingOperationAlreadyImportedException.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/FishingOperationNotFoundInCruiseException.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/FishingOperationNotValidException.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/GearNotFoundInCruiseException.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/MismatchProgramException.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/RowWithCruiseContextSupport.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/RowWithOperationContextSupport.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/DoCheckWeightAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/DoCleanWeightAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportAccidentalCatchAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportActionSupport.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportCatchAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportGearCaracteristicAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportIndividualObservationAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportMarineLitterAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportOperationAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportParameterAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportProtocolAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportReferentialGearAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportReferentialPersonAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportReferentialSpeciesAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportReferentialVesselAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportSurveyAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ValidateAccidentalCatchAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ValidateCatchAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ValidateGearCaracteristicAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ValidateIndividualObservationAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ValidateMarineLitterAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ValidateOperationAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ValidateParameterAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ValidateSampleCategoryAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ValidateSurveyAction.java create mode 100644 tutti-service/src/main/resources/ftl/genericFormatImportReport_fr.ftl create mode 100644 tutti-service/src/main/resources/ftl/genericFormatValidateReport_fr.ftl delete mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportService2Test.java create mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportServiceTestSupport.java create mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportServiceValidTest.java create mode 100644 tutti-service/src/test/resources/genericFormat/accidentalCatch/accidentalCatch.csv create mode 100644 tutti-service/src/test/resources/genericFormat/badAccidentalCatchFormat/accidentalCatch.csv create mode 100644 tutti-service/src/test/resources/genericFormat/badAccidentalCatchImport/accidentalCatch.csv create mode 100644 tutti-service/src/test/resources/genericFormat/badCatchFormat/catch.csv create mode 100644 tutti-service/src/test/resources/genericFormat/badCatchImport/catch.csv create mode 100644 tutti-service/src/test/resources/genericFormat/badGearCaracteristicFormat/gearCaracteristics.csv create mode 100644 tutti-service/src/test/resources/genericFormat/badGearCaracteristicImport/gearCaracteristics.csv create mode 100644 tutti-service/src/test/resources/genericFormat/badIndividualObservationFormat/individualObservation.csv create mode 100644 tutti-service/src/test/resources/genericFormat/badIndividualObservationImport/individualObservation.csv create mode 100644 tutti-service/src/test/resources/genericFormat/badMarineLitterFormat/marineLitter.csv create mode 100644 tutti-service/src/test/resources/genericFormat/badMarineLitterImport/marineLitter.csv create mode 100644 tutti-service/src/test/resources/genericFormat/badOperationFormat/operation.csv copy tutti-service/src/test/resources/genericFormat/{empty => badOperationImport}/operation.csv (51%) copy tutti-service/src/test/resources/genericFormat/{empty => badProtocolFormat}/protocol.tuttiProtocol (88%) copy tutti-service/src/test/resources/genericFormat/{empty => badProtocolImport}/protocol.tuttiProtocol (87%) copy tutti-service/src/test/resources/genericFormat/{empty => badSampleCategoryFormat}/sampleCategory.csv (60%) create mode 100644 tutti-service/src/test/resources/genericFormat/badSurveyFormat/survey.csv copy tutti-service/src/test/resources/genericFormat/{empty => badSurveyImport}/survey.csv (51%) create mode 100644 tutti-service/src/test/resources/genericFormat/badTemporaryReferentialGearFormat/temporaryGears.csv create mode 100644 tutti-service/src/test/resources/genericFormat/badTemporaryReferentialGearImport/temporaryGears.csv create mode 100644 tutti-service/src/test/resources/genericFormat/badTemporaryReferentialPersonFormat/temporaryPersons.csv create mode 100644 tutti-service/src/test/resources/genericFormat/badTemporaryReferentialPersonImport/temporaryPersons.csv copy tutti-service/src/test/resources/genericFormat/{empty => badTemporaryReferentialSpeciesFormat}/temporarySpecies.csv (72%) copy tutti-service/src/test/resources/genericFormat/{empty => badTemporaryReferentialSpeciesImport}/temporarySpecies.csv (67%) create mode 100644 tutti-service/src/test/resources/genericFormat/badTemporaryReferentialVesselFormat/temporaryVessels.csv create mode 100644 tutti-service/src/test/resources/genericFormat/badTemporaryReferentialVesselImport/temporaryVessels.csv create mode 100644 tutti-service/src/test/resources/genericFormat/catch/catch.csv create mode 100644 tutti-service/src/test/resources/genericFormat/default/accidentalCatch.csv create mode 100644 tutti-service/src/test/resources/genericFormat/default/catch.csv create mode 100644 tutti-service/src/test/resources/genericFormat/default/gearCaracteristics.csv create mode 100644 tutti-service/src/test/resources/genericFormat/default/individualObservation.csv create mode 100644 tutti-service/src/test/resources/genericFormat/default/marineLitter.csv copy tutti-service/src/test/resources/genericFormat/{empty => default}/operation.csv (64%) create mode 100644 tutti-service/src/test/resources/genericFormat/default/parameter.csv copy tutti-service/src/test/resources/genericFormat/{empty => default}/survey.csv (84%) delete mode 100644 tutti-service/src/test/resources/genericFormat/empty/temporaryVessels.csv create mode 100644 tutti-service/src/test/resources/genericFormat/gearCaracteristic/gearCaracteristics.csv create mode 100644 tutti-service/src/test/resources/genericFormat/individualObservation/individualObservation.csv create mode 100644 tutti-service/src/test/resources/genericFormat/marineLitter/marineLitter.csv create mode 100644 tutti-service/src/test/resources/genericFormat/onlyCruise/gearCaracteristics.csv copy tutti-service/src/test/resources/genericFormat/{empty => onlyCruise}/survey.csv (83%) copy tutti-service/src/test/resources/genericFormat/{empty => operation}/operation.csv (64%) rename tutti-service/src/test/resources/genericFormat/{empty => protocol}/protocol.tuttiProtocol (100%) create mode 100644 tutti-service/src/test/resources/genericFormat/referentials/temporaryGears.csv rename tutti-service/src/test/resources/genericFormat/{empty => referentials}/temporaryPersons.csv (100%) rename tutti-service/src/test/resources/genericFormat/{empty => referentials}/temporarySpecies.csv (100%) create mode 100644 tutti-service/src/test/resources/genericFormat/referentials/temporaryVessels.csv copy tutti-service/src/test/resources/genericFormat/{empty => sampleCategory}/sampleCategory.csv (87%) rename tutti-service/src/test/resources/genericFormat/{empty => sampleCategoryFormatMismatch}/sampleCategory.csv (87%) copy tutti-service/src/test/resources/genericFormat/{empty => survey}/survey.csv (84%) rename tutti-ui-swing/src/main/help/fr/{genericExport.html => genericFormat.html} (98%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenGenericFormatImportScreen.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUI.css create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUI.jaxx create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUIHandler.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUIModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/GenericFormatImportAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/GenericFormatValidateAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/OpenGenericFormatImportReportAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/OpenGenericFormatValidateReportAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/SaveGenericFormatImportReportAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/SaveGenericFormatValidateReportAction.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.