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 8b8262ba5bf9fe6091cced4aa0c8417a981dcece Merge: 34cdce6 dc3e5bc Author: Maven Release <maven-release@codelutin.com> Date: Wed Mar 4 17:25:11 2015 +0000 Merge branch 'release/3.14' 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(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.