This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 8bc5347cd2edd4c0eeae9b1d983f88bfd15c91f5 Merge: d6c044c 6adb3a8 Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 2 18:02:43 2015 +0000 Merge branch 'release/3.14.3' pom.xml | 5 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 5 + .../fr/ifremer/tutti/TuttiConfigurationOption.java | 7 + .../tutti/persistence/TuttiPersistence.java | 33 + .../tutti/persistence/TuttiPersistenceImpl.java | 78 +- .../persistence/TuttiPersistenceNoDbImpl.java | 16 + .../tutti/persistence/entities/data/Cruises.java | 49 +- .../entities/data/FishingOperations.java | 19 + .../tutti/persistence/model/CruiseDataModel.java | 77 ++ .../tutti/persistence/model/DataModelSupport.java | 90 +++ .../persistence/model/OperationDataModel.java | 57 ++ .../tutti/persistence/model/ProgramDataModel.java | 77 ++ .../service/AttachmentPersistenceServiceImpl.java | 32 +- .../FishingOperationPersistenceServiceImpl.java | 15 +- .../CaracteristicPersistenceServiceImpl.java | 4 +- .../referential/CouldNotLoadTaxonException.java | 23 +- .../referential/GearPersistenceServiceImpl.java | 56 +- .../LocationPersistenceServiceImpl.java | 11 +- .../referential/PersonPersistenceServiceImpl.java | 24 +- .../ReferentialPersistenceServiceSupport.java | 5 +- .../referential/SpeciesPersistenceServiceImpl.java | 37 +- .../referential/VesselPersistenceServiceImpl.java | 25 +- .../service/util/BatchPersistenceHelper.java | 9 + .../i18n/tutti-persistence_en_GB.properties | 1 + .../i18n/tutti-persistence_fr_FR.properties | 1 + .../src/main/resources/queries-failsafe.hbm.xml | 36 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/PersistenceService.java | 18 +- .../service/catches/WeightCleaningService.java | 10 +- .../fr/ifremer/tutti/service/csv/CsvProducer.java | 37 +- .../genericformat/GenericFormatArchive.java | 195 ++--- ...ort.java => GenericFormatCheckDataService.java} | 98 ++- .../genericformat/GenericFormatContextSupport.java | 147 ++-- .../GenericFormatExportActionEngine.java | 218 ++++++ .../GenericFormatExportConfiguration.java | 146 ++++ .../genericformat/GenericFormatExportContext.java | 268 ++++--- ....java => GenericFormatExportCruiseContext.java} | 44 +- .../GenericFormatExportOperationContext.java | 35 +- .../genericformat/GenericFormatExportRequest.java | 101 +++ .../genericformat/GenericFormatExportResult.java | 69 ++ .../genericformat/GenericFormatExportService.java | 723 +++-------------- .../genericformat/GenericFormatFileResult.java | 12 +- .../GenericFormatImportConfiguration.java | 139 +++- .../GenericFormatImportCruiseContext.java | 115 ++- .../GenericFormatImportCruiseResult.java | 80 +- .../GenericFormatImportOperationContext.java | 39 + .../GenericFormatImportOperationResult.java | 100 ++- .../genericformat/GenericFormatImportRequest.java | 93 ++- .../genericformat/GenericFormatImportResult.java | 76 +- .../genericformat/GenericFormatImportService.java | 70 +- .../GenericFormatImportValidationHelper.java | 74 +- .../genericformat/GenericFormatResultSupport.java | 21 +- .../GenericFormatValidateFileContext.java | 64 +- .../GenericFormatValidateFileResult.java | 1 + .../GenericformatImportPersistenceHelper.java | 287 +++++++ .../GenericformatImportPersitenceHelper.java | 472 ----------- .../consumer/CsvConsumerForAccidentalCatch.java | 45 +- .../CsvConsumerForAttachment.java} | 31 +- .../consumer/CsvConsumerForCatch.java | 34 +- .../consumer/CsvConsumerForGearCaracteristic.java | 55 +- .../CsvConsumerForIndividualObservation.java | 45 +- .../consumer/CsvConsumerForMarineLitter.java | 14 +- .../consumer/CsvConsumerForOperation.java | 81 +- .../consumer/CsvConsumerForParameter.java | 57 +- .../consumer/CsvConsumerForSurvey.java | 12 +- .../service/genericformat/csv/AttachmentModel.java | 89 +++ .../service/genericformat/csv/AttachmentRow.java | 110 +++ .../service/genericformat/csv/CatchModel.java | 5 +- .../tutti/service/genericformat/csv/CatchRow.java | 6 +- .../genericformat/csv/ExportSampleCategory.java | 12 + .../genericformat/csv/MarineLitterModel.java | 2 + .../service/genericformat/csv/MarineLitterRow.java | 14 +- .../service/genericformat/csv/OperationModel.java | 22 +- .../service/genericformat/csv/OperationRow.java | 211 +++-- .../service/genericformat/csv/SurveyModel.java | 2 + .../tutti/service/genericformat/csv/SurveyRow.java | 12 + .../exportactions/CheckDataAction.java | 69 ++ .../CreateAccidentalCatchRowsAction.java | 90 +++ .../exportactions/CreateCatchBatchRowsAction.java | 248 ++++++ .../CreateIndividualObservationRowsAction.java | 89 +++ .../CreateMarineLitterRowsAction.java | 90 +++ .../exportactions/CreateOperationRowsAction.java | 110 +++ .../exportactions/CreateParameterRowsAction.java | 58 ++ .../ExportCruiseActionSupport.java} | 22 +- .../ExportFishingOperationActionSupport.java} | 20 +- .../ExportGearCaracteristicAction.java | 84 ++ .../exportactions/ExportProtocolAction.java | 65 ++ .../exportactions/ExportReferentialGearAction.java | 70 ++ .../ExportReferentialPersonAction.java | 70 ++ .../ExportReferentialSpeciesAction.java | 70 ++ .../ExportReferentialVesselAction.java | 71 ++ .../ExportSampleCategoryModelAction.java | 63 ++ .../exportactions/ExportSpeciesUsedAction.java | 60 ++ .../exportactions/ExportSurveyAction.java | 103 +++ .../ExportTechnicalActionSupport.java} | 18 +- .../exportactions/FinalizeExportAction.java | 77 ++ .../exportactions/FlushOperationAction.java | 67 ++ .../GenerateExportArchiveAction.java} | 23 +- .../exportactions/LoadDataAction.java | 76 ++ .../importactions/DoCheckWeightAction.java | 14 +- .../importactions/DoCleanWeightAction.java | 6 +- .../importactions/ImportAccidentalCatchAction.java | 102 ++- .../importactions/ImportCatchAction.java | 231 +++++- .../ImportGearCaracteristicAction.java | 57 +- .../ImportIndividualObservationAction.java | 102 ++- .../importactions/ImportMarineLitterAction.java | 102 ++- .../importactions/ImportOperationAction.java | 242 +++++- .../importactions/ImportParameterAction.java | 87 ++- .../importactions/ImportProtocolAction.java | 46 +- .../importactions/ImportReferentialGearAction.java | 32 +- .../ImportReferentialPersonAction.java | 32 +- .../ImportReferentialSpeciesAction.java | 32 +- .../ImportReferentialVesselAction.java | 31 +- .../importactions/ImportSurveyAction.java | 168 +++- .../importactions/ImpotSampleCategoryAction.java | 10 +- ...ationAction.java => LoadAttachmentsAction.java} | 61 +- .../ValidateAccidentalCatchAction.java | 2 +- .../importactions/ValidateCatchAction.java | 2 +- .../ValidateGearCaracteristicAction.java | 6 +- .../ValidateIndividualObservationAction.java | 2 +- .../importactions/ValidateMarineLitterAction.java | 2 +- .../importactions/ValidateOperationAction.java | 11 +- .../importactions/ValidateParameterAction.java | 2 +- .../importactions/ValidateSurveyAction.java | 35 +- .../producer/CsvProducerForAttachment.java | 84 ++ .../producer/CsvProducerForCatch.java | 39 +- .../producer/CsvProducerForOperation.java | 1 - .../producer/CsvProducerForSurvey.java | 1 + .../service/report/ReportGenerationRequest.java | 13 + .../service/report/ReportGenerationService.java | 24 +- .../resources/ftl/genericFormatImportReport_fr.ftl | 343 +++++--- .../ftl/genericFormatValidateReport_fr.ftl | 19 +- .../resources/i18n/tutti-service_en_GB.properties | 21 + .../resources/i18n/tutti-service_fr_FR.properties | 38 +- .../genericformat/GenericFormatArchiveTest.java | 62 ++ .../GenericFormatExportServiceAno5804Test.java | 11 +- .../GenericFormatExportServiceTest.java | 378 ++++----- .../GenericFormatImportServiceTest.java | 26 +- .../GenericFormatImportServiceValidTest.java | 13 +- .../genericFormat/default/attachments.csv | 1 + .../test/resources/genericFormat/default/catch.csv | 866 ++++++++++----------- .../genericFormat/default/marineLitter.csv | 8 +- .../resources/genericFormat/default/operation.csv | 6 +- .../resources/genericFormat/default/survey.csv | 4 +- .../resources/genericFormat/empty/attachments.csv | 1 + .../test/resources/genericFormat/empty/catch.csv | 2 +- .../resources/genericFormat/empty/marineLitter.csv | 2 +- .../resources/genericFormat/empty/operation.csv | 2 +- .../test/resources/genericFormat/empty/survey.csv | 2 +- .../genericFormat/test_countLines/oneEmptyLine.txt | 0 .../genericFormat/test_countLines/oneLine.txt | 1 + .../genericFormat/test_countLines/twoLines.txt | 2 + .../test_countLines/twoLines_secondEmpty.txt | 1 + .../genericFormat/test_countLines/zeroLines.txt | 0 tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../src/main/assembly/launcher/README.txt | 3 + .../filtered-resources/tutti-help-fr.properties | 28 +- .../help/Guide_utilisation_Allegro_Campagne.pdf | Bin 0 -> 1996569 bytes .../src/main/help/fr/Aide_Allegro_Campagne.odt | Bin 37715 -> 0 bytes tutti-ui-swing/src/main/help/fr/config.html | Bin 6741 -> 15560 bytes .../src/main/help/fr/editFishingOperation.html | Bin 50215 -> 135058 bytes tutti-ui-swing/src/main/help/fr/editProtocol.html | Bin 9132 -> 21122 bytes .../src/main/help/fr/editSampleCategory.html | Bin 3016 -> 7262 bytes tutti-ui-swing/src/main/help/fr/faq.html | Bin 14048 -> 29980 bytes .../main/help/fr/manageTemporaryReferential.html | Bin 3904 -> 10688 bytes tutti-ui-swing/src/main/help/fr/report.html | Bin 2186 -> 6128 bytes tutti-ui-swing/src/main/help/fr/selectCruise.html | Bin 6285 -> 16034 bytes .../fr/ifremer/tutti/ui/swing/TuttiScreen.java | 6 + .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 2 + .../fr/ifremer/tutti/ui/swing/content/MainUI.css | 17 +- .../fr/ifremer/tutti/ui/swing/content/MainUI.jaxx | 2 + .../tutti/ui/swing/content/MainUIHandler.java | 8 + .../OpenGenericFormatExportScreen.java} | 23 +- .../actions/OpenGenericFormatImportScreen.java | 3 +- .../swing/content/config/TuttiConfigUIHandler.java | 4 + .../genericformat/GenericFormatExportUI.css | 164 ++++ .../genericformat/GenericFormatExportUI.jaxx | 112 +++ .../GenericFormatExportUIHandler.java | 206 +++++ .../genericformat/GenericFormatExportUIModel.java | 193 +++++ .../genericformat/GenericFormatImportUI.css | 106 ++- .../genericformat/GenericFormatImportUI.jaxx | 43 +- .../GenericFormatImportUIHandler.java | 69 +- .../genericformat/GenericFormatImportUIModel.java | 161 +++- .../actions/ExportFoldAllDataAction.java | 68 ++ .../actions/ExportSelectAllDataAction.java | 26 +- .../actions/ExportUnfoldAllDataAction.java | 68 ++ .../actions/ExportUnselectAllDataAction.java | 26 +- .../actions/GenericFormatExportAction.java | 137 ++++ .../actions/GenericFormatImportAction.java | 2 +- .../actions/GenericFormatValidateAction.java | 2 +- .../actions/ImportFoldAllDataAction.java | 68 ++ .../actions/ImportSelectAllDataAction.java | 28 +- .../actions/ImportUnfoldAllDataAction.java | 68 ++ .../actions/ImportUnselectAllDataAction.java | 28 +- .../OpenGenericFormatImportReportAction.java | 41 +- .../OpenGenericFormatValidateReportAction.java | 41 +- .../genericformat/tree/CruiseSelectTreeNode.java | 154 ++++ .../genericformat/tree/DataSelectTreeModel.java | 199 +++++ .../tree/DataSelectTreeNodeSupport.java | 82 ++ .../tree/ExportDataSelectTreeCellRenderer.java | 136 ++++ .../tree/ImportDataSelectTreeCellRenderer.java | 167 ++++ .../tree/OperationSelectTreeNode.java | 75 ++ .../genericformat/tree/ProgramSelectTreeNode.java | 88 +++ .../tutti/ui/swing/content/home/SelectCruiseUI.css | 32 +- .../ui/swing/content/home/SelectCruiseUI.jaxx | 31 +- .../swing/content/home/SelectCruiseUIHandler.java | 90 +-- .../actions/ExportGenericFormatCruiseAction.java | 127 --- .../ExportGenericFormatProgramCruisesAction.java | 130 ---- .../ImportGenericFormatProgramCruisesAction.java | 138 ---- .../ui/swing/content/report/ReportUIHandler.java | 4 + .../ui/swing/content/report/ReportUIModel.java | 10 + .../report/actions/GenerateReportAction.java | 17 +- .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 33 - .../resources/i18n/tutti-ui-swing_en_GB.properties | 82 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 92 ++- .../src/main/resources/icons/action-collapse.png | Bin 0 -> 372 bytes .../src/main/resources/icons/action-expand.png | Bin 0 -> 371 bytes .../src/main/resources/icons/action-select.png | Bin 0 -> 392 bytes .../src/main/resources/icons/action-unselect.png | Bin 0 -> 311 bytes 223 files changed, 10257 insertions(+), 3699 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.