This is an automated email from the git hooks/post-receive script. New change to branch master in repository tutti. See http://git.codelutin.com/tutti.git from 34cdce6 Merge branch 'release/3.13.1' adds bf0c0a0 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 1f2476d Merge branch 'master' into develop adds 93dc760 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds cacc7e8 fixes #6665: [TECHNIQUE] migration 3.13.1 erreur adds 2b7bb42 fixes #6672: [RAPPORT] Le rapport birt ne fonctionne plus adds 2cbb96b Specifications version 5.2 adds e9f3ca6 - ajout de l'export de fichiers techniques (protocol, reférentiels temporaires) - amélioration du packaging - nettoyage de code adds 9ff4adc suppression d'un service obsolete adds 44d8d32 Ajout d'une méthode pour obtenir directement la liste des référentiels temporaires (aussi utilisé pour l'export générique) adds 380246f ajout traductions pour export des fichiers techniques lors de l'export generique adds a4943ca use new API adds 55bd07d utilisation de methode de service pour creer le modele de progression adds 26f5e75 suppression de code mort adds de12bb0 ajout de methodes utilitaires sur les entities adds 844ccd4 ajout des methodes getAllGears et getAllVessel sur PersistenceService adds 5eff240 introduction du paquetage tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/csv adds 17d0b67 nettoyage export generique et debut d'implatation de l'import generique adds 586a67d introduction du paquetage tutti-service/src/main/java/fr/ifremer/tutti/service/csv et utilisation adds 679c814 introduce csv package + clean code adds 427c9fe - introduce CsvProducer API - use it also for referential export - move TuttiCsvUtil to his new csv package adds f2d8893 utilisation label du pays à la place de son libellé adds f409b58 correction du nom du fichier d'export adds 7aefa1d normalisation nom colonne sur les taxons adds f7d688e ajout gearRankOrder sur export des caractéristiques des engins adds 9a4b1ab ajout parser formatter de Short -a deplacer dans nuiton-csv adds a0db8aa fix i18n adds ad5140d revue de comment on export les navires associés adds 045aa84 renommage formater adds dcf7654 ajout EnginRankOrder + renommage formatters adds eec1890 uniformisation des colonnes de l'export + ajout d'EnginRankOrder adds 6492f78 no more need of decoratorService to export vessels adds e03f99d - add Benthos column on catch export - clean code adds 9b885ba use more precise function name adds cacb25e - introduce technical parser formatter - introduce none technical formatter for all entities used in generic ie (if anything need to be modified, let's do it in formatter but not in model) adds 1462d44 remover unused method + add shortcut other one adds 80507ac use same parser formatter + clean multipost code adds c311d9c remove not used export model adds 8debd31 add technical column + finish import model definition adds dff04e6 revert Speciess modification (see commit 9b885ba813850b9fc816e604210b8ee1ccbf2e5d) adds 6d806d4 add a nice precondition to be sure to use always a list of referent species while invoking the method Speciess#splitReferenceSpeciesByReferenceTaxonId adds 282106f fix full name function adds 6347e72 can have null caracteristic to export adds c53c640 fix column names adds 008a8b1 add sample category export + fix species export (do not use id but referenceTaxonId) adds d03e0b3 check cruises for program export + improve export shared code adds 0057c45 fix when adding total to progression model adds 7005b0c better API adds dc315ea introduce CsvConsumer adds 15694c0 use CsvConsumer API for referential import + improve then import code adds 059f692 -madd import usefull method to get a rwo all errors adds c05dbc0 rename generic format actions adds f08120f improve CsvProducer API adds d2f57a7 fix tests adds 78a89c7 introduce GenericFormatArchive object adds f186460 use GenericFormatArchive object adds fb5d240 add Cruises.equals method adds b1b5135 introduce generic format import service and some of his objects adds 6447002 prove consumer api for referentiel import adds 793f6f3 CsvConsumer is abstract adds 4186ce5 can add check errors on ImportRow adds 2847669 sampleCategoryModel is in input context adds c921cea expose cruise adds 56fdeb2 review referentiel import API adds d183c76 add a method to get next available protocol names adds d7cb746 continue import adds fc0efde use nuiton-csv adds 1f18450 move to CsvConsumer some API adds 4260acc unify parser formatter adds 1b62195 fix missing API adds fbf064c remove from TuttiCsvUtil (push to nuiton-csv adds 092414d fix new formatters adds 500e4d3 finalize import - export model adds 2f6db55 add once for all a unique method to know if an id is temporary adds 5170fca split import referential method in add and update method introduce link referential concept (for generic import) adds 90316a1 fix some tests adds fb06996 fix some lost code :( adds 5ff652a fix queries adds 0a96398 revue des imports de référentiels adds 1214c50 normalize export service classes adds 578969e add a referential import result object for generic format import adds adc7f2c normalize generic format import service classes adds b085910 - introduce id translation map for temporary referentials - reformat package adds 8d955c1 add persistence service method to get first available protocol name adds f22fe99 translate taxon ids in protocol if required adds 6062cb5 validate sample category model adds 4520b67 do not create directory, already done adds 8383c87 load program in data context adds c54286e compute nb step in export adds 86352e5 fix NPE when adding errors with no field adds 90d5975 adapt caracteristt parser (pass directly list of caracteristic to use) adds 50033a9 improve archive object adds 27daf67 - normalize entity list parser formatter - make samplecategorymodel import ok - survey are ok to be imported now - start writting test of import adds 49c9951 fix NPE if no referential import done adds c76757f fix test data adds 00f53fb fix test data adds 956cc40 fix path adds f455a89 fix bad path adds 7452db3 fix gear export adds 30aad20 add referential import result adds 65950d7 rename i18n adds aba3d82 add generic format import adds f2a00b8 fix i18n keys adds fac0aa9 fix i18n adds 2317940 fixes #6612: [EXPORT GENERIQUE] Consolidation de l’export générique (merge into develop) adds 1012fd7 fix launcher version adds 730f20d ajout de l'objet TaxonCache adds 2f8a884 centralisation des méthodes utiles sur le protocol adds 653c2f8 -mproduire une erreur si le code espèce n'existe pas adds d9ebd30 utilisation des méthodes utilitaire du protocol adds 1f32a0c suppression SpeciesMap (remplacé par TaxonCache) adds adc517f utilisation des méthodes utilitaires du protocol adds d5580b6 utilisation de TaxonCache dans les handler d'ui adds bf3128e utilisation TaxonCache dans les services adds aa9e693 fixes #6677 [TECH] Assainissement de l'utilisation des codes campagnes dans les taxons Merge branch 'feature/6677' into develop adds f88907d fix loading protocol, remove too much stuff adds 56a11f0 pas de write si pas de données adds e68e5ae amélioration de l'export générique (meilleur découpage de l'export + progression plus fluide) adds 177d344 refs #6612 add Serie_Id on each csv file adds ab7f43e remove System.out.println adds 9a1d0d5 ajout de méthodes utiles pour créer des actions adds 284541a ajout sur les boutons d'un racourci clavier (touche entrer) adds 236d7c7 utilisation helper d'action et ajout todos adds 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 adds 5be5a6d fixes 6688: [IMPORT GENERIQUE] Import générique adds 06c10a2 fixes #6725 [IMPORT GENERIQUE] Ajouter un export du modèle de catégorisation adds 658d57e fix typo + unused logger adds 846d31b updates some versions adds 5e1f3a1 prepare release 3.14 adds dc3e5bc [jgitflow-maven-plugin]updating poms for branch'release/3.14' with non-snapshot versions adds 8b8262b Merge branch 'release/3.14' No new revisions were added by this update. Summary of changes: pom.xml | 15 +- .../AllegroCampagne-Specifications.odt | Bin 766872 -> 841456 bytes .../AllegroCampagne-Specifications.pdf | Bin 1420873 -> 1494390 bytes src/update/tutti-application.properties | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 12 + .../fr/ifremer/tutti/TuttiConfigurationOption.java | 14 + .../tutti/persistence/TuttiPersistenceImpl.java | 131 ++- .../persistence/TuttiPersistenceNoDbImpl.java | 120 ++- .../tutti/persistence/entities/TuttiEntities.java | 26 +- .../tutti/persistence/entities/data/Cruises.java | 33 + .../entities/data/FishingOperations.java | 21 +- .../data/{FishingOperations.java => Programs.java} | 25 +- .../entities/data/SpeciesAbleBatchs.java | 42 +- .../entities/protocol/TuttiProtocols.java | 180 +++- .../CaracteristicQualitativeValues.java | 23 +- .../referential/GearWithOriginalRankOrders.java | 21 +- .../persistence/entities/referential/Gears.java | 27 +- .../persistence/entities/referential/Persons.java | 28 +- .../persistence/entities/referential/Speciess.java | 56 +- .../entities/referential/TaxonCache.java | 125 +++ .../entities/referential/TaxonCaches.java | 129 +++ .../entities/referential/TuttiLocations.java | 57 ++ .../persistence/entities/referential/Vessels.java | 47 +- .../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/ProtocolPersistenceService.java | 11 + .../service/ProtocolPersistenceServiceImpl.java | 20 + .../service/SpeciesBatchPersistenceService.java | 4 + .../SpeciesBatchPersistenceServiceImpl.java | 48 +- .../referential/GearPersistenceService.java | 29 +- .../referential/GearPersistenceServiceImpl.java | 102 +- .../referential/PersonPersistenceService.java | 29 +- .../referential/PersonPersistenceServiceImpl.java | 108 +- .../referential/SpeciesPersistenceService.java | 29 +- .../referential/SpeciesPersistenceServiceImpl.java | 84 +- .../referential/VesselPersistenceService.java | 29 +- .../referential/VesselPersistenceServiceImpl.java | 99 +- .../persistence/service/util/BatchTreeHelper.java | 4 +- .../tutti/persistence/test/CleanResourcesRule.java | 113 +++ .../tutti/persistence/test/DatabaseResource.java | 57 +- .../tutti/persistence/test/TuttiRunListener.java | 31 + .../TuttiTestSupport.java} | 29 +- .../i18n/tutti-persistence_en_GB.properties | 3 + .../i18n/tutti-persistence_fr_FR.properties | 3 + .../src/main/resources/queries-failsafe.hbm.xml | 121 ++- .../src/main/xmi/tutti-persistence.zargo | Bin 58181 -> 58384 bytes .../entities/protocol/TuttiProtocolsTest.java | 21 +- .../GearPersistenceServiceWriteTest.java | 4 +- .../PersonPersistenceServiceWriteTest.java | 4 +- .../SpeciesPersistenceServiceReadTest.java | 2 +- .../SpeciesPersistenceServiceWriteTest.java | 4 +- .../VesselPersistenceServiceWriteTest.java | 4 +- tutti-service/pom.xml | 22 +- .../ifremer/tutti/service/PdfGeneratorService.java | 2 +- .../ifremer/tutti/service/PersistenceService.java | 283 ++---- .../java/fr/ifremer/tutti/service/SpeciesMap.java | 147 --- .../fr/ifremer/tutti/service/TuttiCsvUtil.java | 942 ------------------ .../fr/ifremer/tutti/service/TuttiDataContext.java | 117 +-- .../ifremer/tutti/service/TuttiServiceContext.java | 8 +- .../tutti/service/TuttiValidationDataContext.java | 111 +++ .../service/TuttiValidationDataContextSupport.java | 176 ++++ .../ifremer/tutti/service/ValidationService.java | 12 +- .../service/bigfin/csv/BigfinDataRowModel.java | 4 +- .../service/catches/WeightComputingService.java | 97 -- .../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 | 87 ++ .../service/csv/AbstractTuttiImportModel.java | 52 + .../tutti/service/csv/BeanIndexNullableGetter.java | 74 ++ .../tutti/service/csv/BeanNullableGetter.java | 63 ++ .../tutti/service/csv/BeanPropertyFormatter.java | 61 ++ .../service/csv/CaracteristicParserFormatter.java | 70 ++ .../csv/CaracteristicValueParseException.java | 70 ++ .../csv/CaracteristicValueParserFormatter.java | 143 +++ .../service/csv/CommentListParserFormatter.java | 31 +- .../tutti/service/csv/CommentParserFormatter.java | 31 +- .../tutti/service/csv/CountryFormatter.java | 37 +- .../fr/ifremer/tutti/service/csv/CsvComsumer.java | 184 ++++ .../fr/ifremer/tutti/service/csv/CsvProducer.java | 84 ++ .../tutti/service/csv/EntityNotFoundException.java | 63 ++ .../service/csv/EntityParserFormatterSupport.java | 131 +++ .../service/csv/EnumByNameParserFormatter.java | 74 ++ .../FishingOperationLocationParserFormatter.java | 73 ++ .../csv/FishingOperationStrataParserFormatter.java | 73 ++ .../FishingOperationSubStrataParserFormatter.java | 73 ++ .../service/csv/ForeignKeyListParserFormatter.java | 92 ++ .../service/csv/ForeignKeyParserFormatter.java | 81 ++ .../tutti/service/csv/GearListParserFormatter.java | 49 + .../tutti/service/csv/GearParserFormatter.java | 87 ++ .../tutti/service/csv/HarbourParserFormatter.java | 72 ++ .../ImportModelWithHeader.java} | 25 +- .../service/csv/IntegerListParserFormatter.java | 67 ++ .../service/csv/ListParserFormatterSupport.java | 79 ++ .../service/csv/PersonListParserFormatter.java | 49 + .../tutti/service/csv/PersonParserFormatter.java | 84 ++ .../tutti/service/csv/ProgramParserFormatter.java | 70 ++ .../tutti/service/csv/ProgramZoneFormatter.java | 37 +- .../tutti/service/csv/SpeciesParserFormatter.java | 99 ++ .../tutti/service/csv/StringParserFormatter.java | 44 +- .../fr/ifremer/tutti/service/csv/TuttiCsvUtil.java | 228 +++++ .../tutti/service/csv/TuttiRepeatableExport.java | 33 +- .../service/csv/VesselListParserFormatter.java | 49 + .../tutti/service/csv/VesselParserFormatter.java | 87 ++ .../export/generic/AccidentalCatchExportModel.java | 167 ---- .../generic/GearCaracteristicExportModel.java | 74 -- .../generic/IndividualObservationExportModel.java | 145 --- .../export/generic/MarineLitterExportModel.java | 82 -- .../export/generic/MarineLitterExportRow.java | 119 --- .../export/generic/OperationExportModel.java | 143 --- .../service/export/generic/OperationExportRow.java | 462 --------- .../export/generic/ParameterExportModel.java | 92 -- .../service/export/generic/SpeciesExportModel.java | 75 -- .../service/export/generic/SurveyExportModel.java | 68 -- .../service/export/generic/TuttiExportService.java | 1014 ------------------- .../export/pdf/CatchesPdfExportService.java | 163 +-- .../service/export/sumatra/CatchRowModel.java | 7 +- .../sumatra/CatchesSumatraExportService.java | 96 +- .../toconfirmreport/ToConfirmReportService.java | 18 +- .../genericformat/GenericFormatArchive.java | 504 ++++++++++ ...GenericFormatArchiveInvalidLayoutException.java | 62 ++ .../genericformat/GenericFormatCsvFileResult.java | 66 ++ .../genericformat/GenericFormatExportContext.java | 312 ++++++ .../GenericFormatExportOperationContext.java | 304 ++++++ .../genericformat/GenericFormatExportService.java | 759 ++++++++++++++ .../genericformat/GenericFormatFileResult.java | 115 +++ .../GenericFormatImportConfiguration.java | 99 ++ .../genericformat/GenericFormatImportContext.java | 527 ++++++++++ .../GenericFormatImportCruiseContext.java | 177 ++++ .../GenericFormatImportCruiseResult.java | 97 ++ .../GenericFormatImportEntityParserFactory.java | 217 ++++ .../GenericFormatImportOperationContext.java | 281 ++++++ .../GenericFormatImportOperationResult.java | 170 ++++ .../genericformat/GenericFormatImportRequest.java | 146 +++ .../genericformat/GenericFormatImportResult.java | 106 ++ .../genericformat/GenericFormatImportService.java | 384 ++++++++ .../GenericFormatImportValidationDataContext.java | 121 +++ .../GenericFormatImportValidationHelper.java | 217 ++++ .../GenericFormatReferentialImportResult.java | 166 ++++ .../genericformat/GenericFormatResultSupport.java | 255 +++++ .../genericformat/GenericFormatServiceSupport.java | 163 +++ .../GenericFormatValidateFileContext.java | 96 ++ .../GenericFormatValidateFileResult.java} | 33 +- .../GenericformatImportPersitenceHelper.java | 472 +++++++++ .../consumer/CruiseAlreadyExistException.java | 36 +- .../consumer/CruiseAlreadyImportedException.java | 36 +- .../consumer/CruiseNotFoundException.java | 67 ++ .../consumer/CruiseNotValidException.java | 70 ++ .../consumer/CsvConsumerForAccidentalCatch.java | 126 +++ .../consumer/CsvConsumerForCatch.java | 313 ++++++ .../consumer/CsvConsumerForGearCaracteristic.java | 114 +++ .../CsvConsumerForIndividualObservation.java | 127 +++ .../consumer/CsvConsumerForMarineLitter.java | 82 ++ .../consumer/CsvConsumerForOperation.java | 150 +++ .../consumer/CsvConsumerForParameter.java | 126 +++ .../consumer/CsvConsumerForSampleCategory.java | 103 ++ .../consumer/CsvConsumerForSurvey.java | 122 +++ .../FishingOperationAlreadyImportedException.java | 56 ++ .../FishingOperationNotFoundInCruiseException.java | 57 ++ .../FishingOperationNotValidException.java | 70 ++ .../consumer/GearNotFoundInCruiseException.java | 71 ++ .../consumer/MismatchProgramException.java | 63 ++ .../genericformat/csv/AccidentalCatchModel.java | 114 +++ .../csv/AccidentalCatchRow.java} | 83 +- .../service/genericformat/csv/CatchModel.java | 215 ++++ .../csv/CatchRow.java} | 211 ++-- .../csv}/ExportSampleCategory.java | 6 +- .../genericformat/csv/GearCaracteristicModel.java | 104 ++ .../csv/GearCaracteristicRow.java} | 42 +- .../csv/IndividualObservationModel.java | 114 +++ .../csv/IndividualObservationRow.java} | 80 +- .../genericformat/csv/MarineLitterModel.java | 112 +++ .../service/genericformat/csv/MarineLitterRow.java | 100 ++ .../service/genericformat/csv/OperationModel.java | 263 +++++ .../service/genericformat/csv/OperationRow.java | 602 ++++++++++++ .../service/genericformat/csv/ParameterModel.java | 107 ++ .../csv/ParameterRow.java} | 53 +- .../csv/RowWithCruiseContextSupport.java} | 64 +- .../csv/RowWithOperationContextSupport.java | 79 ++ .../genericformat/csv/SampleCategoryModel.java | 85 ++ .../genericformat/csv/SampleCategoryRow.java | 80 ++ .../genericformat/csv/SpeciesExportModel.java | 65 ++ .../csv}/SpeciesExportRow.java | 2 +- .../service/genericformat/csv/SurveyModel.java | 125 +++ .../csv/SurveyRow.java} | 83 +- .../importactions/DoCheckWeightAction.java | 91 ++ .../importactions/DoCleanWeightAction.java | 88 ++ .../importactions/ImportAccidentalCatchAction.java | 93 ++ .../importactions/ImportActionSupport.java | 65 ++ .../importactions/ImportCatchAction.java | 94 ++ .../ImportGearCaracteristicAction.java | 93 ++ .../ImportIndividualObservationAction.java | 93 ++ .../importactions/ImportMarineLitterAction.java | 93 ++ .../importactions/ImportOperationAction.java | 100 ++ .../importactions/ImportParameterAction.java | 93 ++ .../importactions/ImportProtocolAction.java | 145 +++ .../importactions/ImportReferentialGearAction.java | 122 +++ .../ImportReferentialPersonAction.java | 123 +++ .../ImportReferentialSpeciesAction.java | 124 +++ .../ImportReferentialVesselAction.java | 119 +++ .../importactions/ImportSurveyAction.java | 97 ++ .../ValidateAccidentalCatchAction.java | 95 ++ .../importactions/ValidateCatchAction.java | 95 ++ .../ValidateGearCaracteristicAction.java | 95 ++ .../ValidateIndividualObservationAction.java | 96 ++ .../importactions/ValidateMarineLitterAction.java | 95 ++ .../importactions/ValidateOperationAction.java | 105 ++ .../importactions/ValidateParameterAction.java | 95 ++ .../ValidateSampleCategoryAction.java | 97 ++ .../importactions/ValidateSurveyAction.java | 98 ++ .../producer/CsvProducerForAccidentalCatch.java | 143 +++ .../producer/CsvProducerForCatch.java} | 332 +++---- .../producer/CsvProducerForGearCaracteristics.java | 75 ++ .../CsvProducerForIndividualObservation.java | 128 +++ .../producer/CsvProducerForMarineLitter.java | 73 ++ .../producer/CsvProducerForOperation.java | 60 ++ .../producer/CsvProducerForParameter.java | 91 ++ .../producer/CsvProducerForSampleCategory.java | 64 ++ .../producer/CsvProducerForSpecies.java | 124 +++ .../producer/CsvProducerForSurvey.java | 56 ++ .../operationimport/ImportFromColumnFileModel.java | 19 +- .../service/protocol/CaracteristicRowModel.java | 5 +- .../tutti/service/protocol/SpeciesRowModel.java | 17 +- .../service/psionimport/PsionImportService.java | 10 +- .../service/pupitri/PupitriImportService.java | 77 +- .../service/pupitri/csv/CarrouselRowModel.java | 5 +- .../tutti/service/pupitri/csv/SpeciesRowModel.java | 4 +- .../tutti/service/pupitri/csv/TrunkRowModel.java | 5 +- ...stResult.java => ReferentialImportRequest.java} | 57 +- .../referential/ReferentialImportResult.java | 38 +- .../referential/ReferentialImportService.java | 752 -------------- .../ReferentialTemporaryGearService.java | 209 ++-- .../ReferentialTemporaryPersonService.java | 204 ++-- .../ReferentialTemporarySpeciesService.java | 200 ++-- .../ReferentialTemporaryVesselService.java | 207 ++-- .../consumer/CsvConsumerForTemporaryGear.java | 238 +++++ .../consumer/CsvConsumerForTemporaryPerson.java | 235 +++++ .../consumer/CsvConsumerForTemporarySpecies.java | 240 +++++ .../consumer/CsvConsumerForTemporaryVessel.java | 238 +++++ .../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 | 21 +- .../service/referential/{ => csv}/VesselModel.java | 59 +- .../service/referential/{ => csv}/VesselRow.java | 2 +- .../producer/CsvProducerForTemporaryGear.java | 62 ++ .../producer/CsvProducerForTemporaryPerson.java | 62 ++ .../producer/CsvProducerForTemporarySpecies.java | 62 ++ .../producer/CsvProducerForTemporaryVessel.java | 62 ++ .../tutti/service/report/ReportService.java | 4 +- .../resources/ftl/genericFormatImportReport_fr.ftl | 502 ++++++++++ .../ftl/genericFormatValidateReport_fr.ftl | 502 ++++++++++ .../resources/i18n/tutti-service_en_GB.properties | 211 +++- .../resources/i18n/tutti-service_fr_FR.properties | 197 +++- .../ifremer/tutti/service/ServiceDbResource.java | 23 +- .../tutti/service/ValidationServiceTest.java | 48 +- .../export/generic/TuttiExportService2Test.java | 240 ----- .../export/generic/TuttiExportServiceTest.java | 505 ---------- .../GenericFormatExportServiceAno5804Test.java} | 8 +- .../GenericFormatExportServiceTest.java | 444 +++++++++ .../GenericFormatImportServiceTest.java | 230 +++++ .../GenericFormatImportServiceTestSupport.java | 113 +++ .../GenericFormatImportServiceValidTest.java | 1039 ++++++++++++++++++++ .../pupitri/PupitriImportServiceAno5079Test.java | 2 +- .../ReferentialTemporaryExportServiceTest.java | 3 + .../ReferentialTemporaryGearServiceTest.java | 8 +- .../ReferentialTemporaryPersonServiceTest.java | 4 +- .../ReferentialTemporarySpeciesServiceTest.java | 12 +- .../ReferentialTemporaryVesselServiceTest.java | 6 +- .../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 + .../genericFormat/badOperationImport/operation.csv | 5 + .../badProtocolFormat/protocol.tuttiProtocol | 81 ++ .../badProtocolImport/protocol.tuttiProtocol | 81 ++ .../badSampleCategoryFormat/sampleCategory.csv | 6 + .../genericFormat/badSurveyFormat/survey.csv | 2 + .../genericFormat/badSurveyImport/survey.csv | 4 + .../temporaryGears.csv | 5 + .../temporaryGears.csv | 5 + .../temporaryPersons.csv | 4 + .../temporaryPersons.csv | 6 + .../temporarySpecies.csv | 9 + .../temporarySpecies.csv | 13 + .../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 + .../resources/genericFormat/default/operation.csv | 3 + .../resources/genericFormat/default/parameter.csv | 12 + .../resources/genericFormat/default/survey.csv | 2 + .../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 + .../test/resources/genericFormat/empty/survey.csv | 1 + .../gearCaracteristic/gearCaracteristics.csv | 3 + .../individualObservation.csv | 26 + .../genericFormat/marineLitter/marineLitter.csv | 4 + .../onlyCruise/gearCaracteristics.csv | 3 + .../resources/genericFormat/onlyCruise/survey.csv | 2 + .../genericFormat/operation/operation.csv | 3 + .../genericFormat/protocol/protocol.tuttiProtocol | 81 ++ .../genericFormat/referentials/temporaryGears.csv | 5 + .../referentials/temporaryPersons.csv | 4 + .../referentials/temporarySpecies.csv | 9 + .../referentials/temporaryVessels.csv | 5 + .../sampleCategory/sampleCategory.csv | 6 + .../sampleCategory.csv | 6 + .../test/resources/genericFormat/survey/survey.csv | 2 + tutti-service/src/test/resources/log4j.properties | 2 + tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 25 +- .../src/main/filtered-resources/log4j.properties | 3 +- .../filtered-resources/tutti-help-fr.properties | 76 +- .../src/main/help/fr/editSampleCategory.html | 2 + .../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 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 11 +- .../tutti/ui/swing/action/AbstractTuttiAction.java | 3 +- ...n.java => ExportGenericFormatCruiseAction.java} | 36 +- ...> ExportGenericFormatProgramCruisesAction.java} | 46 +- .../ui/swing/action/ExportProtocolAction.java | 2 +- .../ImportGenericFormatProgramCruisesAction.java | 137 +++ .../ui/swing/action/ImportProtocolAction.java | 68 +- .../action/OpenGenericFormatImportScreen.java | 65 ++ .../action/OpenReplaceTemporaryGearUIAction.java | 3 +- .../action/OpenReplaceTemporaryVesselUIAction.java | 3 +- .../action/SelectSpeciesForBenthosBatchAction.java | 2 +- ...SpeciesForIndividualObservationBatchAction.java | 2 +- .../action/SelectSpeciesForSpeciesBatchAction.java | 2 +- .../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 + .../content/category/EditSampleCategoryModelUI.css | 12 +- .../category/EditSampleCategoryModelUI.jaxx | 1 + .../actions/ExportSampleCategoryModelAction.java | 102 ++ .../actions}/SaveSampleCategoryModelAction.java | 3 +- .../swing/content/config/TuttiConfigUIHandler.java | 6 + .../genericformat/GenericFormatImportUI.css | 177 ++++ .../genericformat/GenericFormatImportUI.jaxx | 156 +++ .../GenericFormatImportUIHandler.java | 163 +++ .../genericformat/GenericFormatImportUIModel.java | 254 +++++ .../actions/GenericFormatImportAction.java | 213 ++++ .../actions/GenericFormatValidateAction.java | 154 +++ .../OpenGenericFormatImportReportAction.java | 79 ++ .../OpenGenericFormatValidateReportAction.java | 79 ++ .../SaveGenericFormatImportReportAction.java | 102 ++ .../SaveGenericFormatValidateReportAction.java | 102 ++ .../tutti/ui/swing/content/home/SelectCruiseUI.css | 14 +- .../ui/swing/content/home/SelectCruiseUI.jaxx | 1 + .../operation/EditFishingOperationUIModel.java | 2 - .../frequency/BenthosFrequencyUIHandler.java | 30 +- .../CreateIndividualObservationBatchUIHandler.java | 18 +- .../frequency/SpeciesFrequencyUIHandler.java | 43 +- .../ui/swing/content/protocol/EditProtocolUI.css | 2 +- .../content/protocol/EditProtocolUIHandler.java | 5 +- .../content/protocol/EditProtocolUIModel.java | 10 +- .../ManageTemporaryReferentialUIHandler.java | 17 +- .../ui/swing/util/AbstractTuttiUIHandler.java | 50 +- .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 56 +- .../util/attachment/AttachmentEditorUIHandler.java | 1 + .../GearCaracteristicListCellRenderer.java | 2 +- .../swing/util/catches/EnterWeightUIHandler.java | 18 +- .../swing/util/comment/CommentEditorUIHandler.java | 1 + .../resources/i18n/tutti-ui-swing_en_GB.properties | 110 +++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 107 +- 409 files changed, 28681 insertions(+), 7866 deletions(-) copy tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/{FishingOperations.java => Programs.java} (58%) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/TaxonCache.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/TaxonCaches.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/TuttiLocations.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/CleanResourcesRule.java copy tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/{entities/data/FishingOperations.java => test/TuttiTestSupport.java} (54%) delete mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/SpeciesMap.java delete mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.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/AbstractTuttiImportExportModel.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/csv/AbstractTuttiImportModel.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/csv/BeanIndexNullableGetter.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/csv/BeanNullableGetter.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/csv/BeanPropertyFormatter.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CaracteristicParserFormatter.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/CaracteristicValueParserFormatter.java copy tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/FishingOperations.java => tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CommentListParserFormatter.java (50%) copy tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/FishingOperations.java => tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CommentParserFormatter.java (53%) copy tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/FishingOperations.java => tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CountryFormatter.java (53%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CsvComsumer.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CsvProducer.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/csv/EntityNotFoundException.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/csv/EntityParserFormatterSupport.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/csv/EnumByNameParserFormatter.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/csv/FishingOperationLocationParserFormatter.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/csv/FishingOperationStrataParserFormatter.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/csv/FishingOperationSubStrataParserFormatter.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/csv/ForeignKeyListParserFormatter.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/csv/ForeignKeyParserFormatter.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/csv/GearListParserFormatter.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/csv/GearParserFormatter.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/csv/HarbourParserFormatter.java copy tutti-service/src/main/java/fr/ifremer/tutti/service/{pupitri/csv/SpeciesRowModel.java => csv/ImportModelWithHeader.java} (54%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/csv/IntegerListParserFormatter.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/csv/ListParserFormatterSupport.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/csv/PersonListParserFormatter.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/csv/PersonParserFormatter.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/csv/ProgramParserFormatter.java copy tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/FishingOperations.java => tutti-service/src/main/java/fr/ifremer/tutti/service/csv/ProgramZoneFormatter.java (53%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/csv/SpeciesParserFormatter.java copy tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/FishingOperations.java => tutti-service/src/main/java/fr/ifremer/tutti/service/csv/StringParserFormatter.java (52%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/csv/TuttiCsvUtil.java copy tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/FishingOperations.java => tutti-service/src/main/java/fr/ifremer/tutti/service/csv/TuttiRepeatableExport.java (53%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/csv/VesselListParserFormatter.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/csv/VesselParserFormatter.java delete mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/AccidentalCatchExportModel.java delete mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/GearCaracteristicExportModel.java delete mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/IndividualObservationExportModel.java delete mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/MarineLitterExportModel.java delete mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/MarineLitterExportRow.java delete mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/OperationExportModel.java delete mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/OperationExportRow.java delete mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/ParameterExportModel.java delete mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/SpeciesExportModel.java delete mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/SurveyExportModel.java delete mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatArchive.java 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/GenericFormatExportContext.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportOperationContext.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportService.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/GenericFormatImportContext.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/GenericFormatImportEntityParserFactory.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/GenericFormatImportRequest.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportResult.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportService.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/GenericFormatReferentialImportResult.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 copy tutti-service/src/main/java/fr/ifremer/tutti/service/{export/generic/SpeciesExportRow.java => genericformat/GenericFormatValidateFileResult.java} (54%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericformatImportPersitenceHelper.java copy tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/FishingOperations.java => tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CruiseAlreadyExistException.java (51%) copy tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/FishingOperations.java => tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CruiseAlreadyImportedException.java (51%) 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/CruiseNotValidException.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForAccidentalCatch.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForCatch.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForGearCaracteristic.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForIndividualObservation.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForMarineLitter.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForOperation.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForParameter.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForSampleCategory.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForSurvey.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/AccidentalCatchModel.java rename tutti-service/src/main/java/fr/ifremer/tutti/service/{export/generic/AccidentalCatchExportRow.java => genericformat/csv/AccidentalCatchRow.java} (52%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchModel.java rename tutti-service/src/main/java/fr/ifremer/tutti/service/{export/generic/CatchExportRow.java => genericformat/csv/CatchRow.java} (50%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{export/generic => genericformat/csv}/ExportSampleCategory.java (95%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/GearCaracteristicModel.java copy tutti-service/src/main/java/fr/ifremer/tutti/service/{export/generic/GearCaracteristicExportRow.java => genericformat/csv/GearCaracteristicRow.java} (73%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/IndividualObservationModel.java rename tutti-service/src/main/java/fr/ifremer/tutti/service/{export/generic/IndividualObservationExportRow.java => genericformat/csv/IndividualObservationRow.java} (52%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/MarineLitterModel.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/MarineLitterRow.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/OperationModel.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/OperationRow.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/ParameterModel.java rename tutti-service/src/main/java/fr/ifremer/tutti/service/{export/generic/ParameterExportRow.java => genericformat/csv/ParameterRow.java} (56%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{export/generic/GearCaracteristicExportRow.java => genericformat/csv/RowWithCruiseContextSupport.java} (50%) 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/csv/SampleCategoryModel.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/SampleCategoryRow.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/SpeciesExportModel.java rename tutti-service/src/main/java/fr/ifremer/tutti/service/{export/generic => genericformat/csv}/SpeciesExportRow.java (96%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/SurveyModel.java rename tutti-service/src/main/java/fr/ifremer/tutti/service/{export/generic/SurveyExportRow.java => genericformat/csv/SurveyRow.java} (53%) 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/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForAccidentalCatch.java rename tutti-service/src/main/java/fr/ifremer/tutti/service/{export/generic/CatchExportModel.java => genericformat/producer/CsvProducerForCatch.java} (58%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForGearCaracteristics.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForIndividualObservation.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForMarineLitter.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForOperation.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForParameter.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForSampleCategory.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForSpecies.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForSurvey.java rename tutti-service/src/main/java/fr/ifremer/tutti/service/referential/{ImportRequestResult.java => ReferentialImportRequest.java} (64%) delete mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialImportService.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporaryGear.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporaryPerson.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporarySpecies.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporaryVessel.java rename tutti-service/src/main/java/fr/ifremer/tutti/service/referential/{ => csv}/GearModel.java (60%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/referential/{ => csv}/GearRow.java (98%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/referential/{ => csv}/PersonModel.java (57%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/referential/{ => csv}/PersonRow.java (92%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/referential/{ => csv}/SpeciesModel.java (55%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/referential/{ => csv}/SpeciesRow.java (97%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/referential/{ => csv}/TemporaryReferentialEntityIdParser.java (68%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/referential/{ => csv}/VesselModel.java (62%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/referential/{ => csv}/VesselRow.java (98%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/referential/producer/CsvProducerForTemporaryGear.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/referential/producer/CsvProducerForTemporaryPerson.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/referential/producer/CsvProducerForTemporarySpecies.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/referential/producer/CsvProducerForTemporaryVessel.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/export/generic/TuttiExportService2Test.java delete mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportServiceTest.java rename tutti-service/src/test/java/fr/ifremer/tutti/service/{export/generic/TuttiExportServiceAno5804Test.java => genericformat/GenericFormatExportServiceAno5804Test.java} (92%) create mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceTest.java create mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportServiceTest.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 create mode 100644 tutti-service/src/test/resources/genericFormat/badOperationImport/operation.csv create mode 100644 tutti-service/src/test/resources/genericFormat/badProtocolFormat/protocol.tuttiProtocol create mode 100644 tutti-service/src/test/resources/genericFormat/badProtocolImport/protocol.tuttiProtocol create mode 100644 tutti-service/src/test/resources/genericFormat/badSampleCategoryFormat/sampleCategory.csv create mode 100644 tutti-service/src/test/resources/genericFormat/badSurveyFormat/survey.csv create mode 100644 tutti-service/src/test/resources/genericFormat/badSurveyImport/survey.csv 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 create mode 100644 tutti-service/src/test/resources/genericFormat/badTemporaryReferentialSpeciesFormat/temporarySpecies.csv create mode 100644 tutti-service/src/test/resources/genericFormat/badTemporaryReferentialSpeciesImport/temporarySpecies.csv 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 create mode 100644 tutti-service/src/test/resources/genericFormat/default/operation.csv create mode 100644 tutti-service/src/test/resources/genericFormat/default/parameter.csv create mode 100644 tutti-service/src/test/resources/genericFormat/default/survey.csv create mode 100644 tutti-service/src/test/resources/genericFormat/empty/accidentalCatch.csv create mode 100644 tutti-service/src/test/resources/genericFormat/empty/catch.csv create mode 100644 tutti-service/src/test/resources/genericFormat/empty/gearCaracteristics.csv create mode 100644 tutti-service/src/test/resources/genericFormat/empty/individualObservation.csv create mode 100644 tutti-service/src/test/resources/genericFormat/empty/marineLitter.csv create mode 100644 tutti-service/src/test/resources/genericFormat/empty/operation.csv create mode 100644 tutti-service/src/test/resources/genericFormat/empty/parameter.csv create mode 100644 tutti-service/src/test/resources/genericFormat/empty/survey.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 create mode 100644 tutti-service/src/test/resources/genericFormat/onlyCruise/survey.csv create mode 100644 tutti-service/src/test/resources/genericFormat/operation/operation.csv create mode 100644 tutti-service/src/test/resources/genericFormat/protocol/protocol.tuttiProtocol create mode 100644 tutti-service/src/test/resources/genericFormat/referentials/temporaryGears.csv create mode 100644 tutti-service/src/test/resources/genericFormat/referentials/temporaryPersons.csv create mode 100644 tutti-service/src/test/resources/genericFormat/referentials/temporarySpecies.csv create mode 100644 tutti-service/src/test/resources/genericFormat/referentials/temporaryVessels.csv create mode 100644 tutti-service/src/test/resources/genericFormat/sampleCategory/sampleCategory.csv create mode 100644 tutti-service/src/test/resources/genericFormat/sampleCategoryFormatMismatch/sampleCategory.csv create mode 100644 tutti-service/src/test/resources/genericFormat/survey/survey.csv rename tutti-ui-swing/src/main/help/fr/{genericExport.html => genericFormat.html} (98%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/{ExportCruiseAction.java => ExportGenericFormatCruiseAction.java} (70%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/{ExportProgramAction.java => ExportGenericFormatProgramCruisesAction.java} (68%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportGenericFormatProgramCruisesAction.java 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/category/actions/ExportSampleCategoryModelAction.java rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/{action => content/category/actions}/SaveSampleCategoryModelAction.java (94%) 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>.