This is an automated email from the git hooks/post-receive script. New change to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git from f9212e6 import catches (stabilize csv model + do the process math) new fe12fd6 fix batch creation new 923d204 generic import is ok \o/ new 86c2f9e - normalize i18n keys - finalize import - improve import result API - imporve import context API - add clean weights + ccheck weights on imported operations new 0a5891a - amélioration du calcul du nombre d'étapes - mise en place de la progression - amélioration de l'API de requete et resultat new b040b43 prepare test mecanism The 5 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 b040b4302b7f7265f74d292b153de9aa53d0bc71 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 23 09:32:20 2015 +0100 prepare test mecanism commit 0a5891a8342ca13bf8a4c2300d31df90166b1f2c Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 23 09:01:05 2015 +0100 - amélioration du calcul du nombre d'étapes - mise en place de la progression - amélioration de l'API de requete et resultat commit 86c2f9e8c402ec888a6b3588e97866d88c2f9c9b Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Feb 22 13:37:17 2015 +0100 - normalize i18n keys - finalize import - improve import result API - imporve import context API - add clean weights + ccheck weights on imported operations commit 923d204b4821174e288b257eb51a4874bd11e082 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Feb 22 08:37:31 2015 +0100 generic import is ok \o/ commit fe12fd6b45b35319b821d3495a5c3a604f635539 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Feb 21 20:16:47 2015 +0100 fix batch creation Summary of changes: .../tutti/persistence/entities/TuttiEntities.java | 5 +- .../entities/data/SpeciesAbleBatchs.java | 7 +- .../genericformat/GenericFormatArchive.java | 52 ++- .../genericformat/GenericFormatExportContext.java | 7 +- .../genericformat/GenericFormatExportService.java | 237 +++--------- .../genericformat/GenericFormatImportContext.java | 218 +++++------ .../GenericFormatImportCruiseContext.java | 146 ++++++++ .../GenericFormatImportCruiseResult.java | 63 ++++ .../GenericFormatImportEntityParserFactory.java | 24 +- .../GenericFormatImportOperationContext.java | 109 ++++-- .../GenericFormatImportOperationResult.java | 145 ++++++++ .../genericformat/GenericFormatImportRequest.java | 34 +- .../genericformat/GenericFormatImportResult.java | 112 +++--- .../genericformat/GenericFormatImportService.java | 357 ++++++++++-------- .../GenericFormatImportValidationDataContext.java | 7 +- .../GenericFormatImportValidationHelper.java | 41 ++- .../genericformat/GenericFormatServiceSupport.java | 139 +++++++ .../GenericformatImportPersitenceHelper.java | 406 +++++++++++++-------- .../consumer/CruiseAlreadyExistException.java | 2 +- .../consumer/CruiseAlreadyImportedException.java | 2 +- .../consumer/CruiseNotFoundException.java | 2 +- .../consumer/CruiseNotValidException.java | 2 +- .../consumer/CsvConsumerForAccidentalCatch.java | 18 +- .../consumer/CsvConsumerForCatch.java | 175 +++++---- .../consumer/CsvConsumerForGearCaracteristic.java | 29 +- .../CsvConsumerForIndividualObservation.java | 19 +- .../consumer/CsvConsumerForMarineLitter.java | 16 +- .../consumer/CsvConsumerForOperation.java | 25 +- .../consumer/CsvConsumerForParameter.java | 19 +- .../consumer/CsvConsumerForSampleCategory.java | 10 +- .../FishingOperationAlreadyImportedException.java | 2 +- .../FishingOperationNotFoundInCruiseException.java | 2 +- .../FishingOperationNotValidException.java | 2 +- .../consumer/GearNotFoundInCruiseException.java | 2 +- .../tutti/service/genericformat/csv/CatchRow.java | 3 +- .../genericformat/csv/ExportSampleCategory.java | 4 + .../resources/i18n/tutti-service_en_GB.properties | 172 +++++---- .../resources/i18n/tutti-service_fr_FR.properties | 149 ++++---- .../GenericFormatImportServiceTest.java | 68 +--- ... => GenericFormatImportServiceTestSupport.java} | 48 ++- .../{empty => default}/accidentalCatch.csv | 0 .../genericFormat/{empty => default}/catch.csv | 0 .../{empty => default}/gearCaracteristics.csv | 0 .../{empty => default}/individualObservation.csv | 0 .../{empty => default}/marineLitter.csv | 0 .../genericFormat/{empty => default}/operation.csv | 0 .../genericFormat/{empty => default}/parameter.csv | 0 .../{empty => default}/sampleCategory.csv | 0 .../genericFormat/{empty => default}/survey.csv | 0 49 files changed, 1797 insertions(+), 1083 deletions(-) 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/GenericFormatImportOperationResult.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatServiceSupport.java copy tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/{GenericFormatImportServiceTest.java => GenericFormatImportServiceTestSupport.java} (55%) rename tutti-service/src/test/resources/genericFormat/{empty => default}/accidentalCatch.csv (100%) rename tutti-service/src/test/resources/genericFormat/{empty => default}/catch.csv (100%) rename tutti-service/src/test/resources/genericFormat/{empty => default}/gearCaracteristics.csv (100%) rename tutti-service/src/test/resources/genericFormat/{empty => default}/individualObservation.csv (100%) rename tutti-service/src/test/resources/genericFormat/{empty => default}/marineLitter.csv (100%) rename tutti-service/src/test/resources/genericFormat/{empty => default}/operation.csv (100%) rename tutti-service/src/test/resources/genericFormat/{empty => default}/parameter.csv (100%) rename tutti-service/src/test/resources/genericFormat/{empty => default}/sampleCategory.csv (100%) rename tutti-service/src/test/resources/genericFormat/{empty => default}/survey.csv (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.