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 de8efb01c2e0b3302ee9bc368d0084bad6abb4c9 Merge: f5125de 1b39774 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 18 10:42:01 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.3' into 'master' pom.xml | 15 +- tutti-ichtyometer/pom.xml | 2 +- .../tutti/ichtyometer/IchtyometerClient.java | 4 +- .../ichtyometer/LocalDeviceNotFoundException.java | 4 +- .../tutti/ichtyometer/RemoteDeviceChooser.java | 2 +- .../ichtyometer/RemoteDeviceNotFoundException.java | 4 +- .../RemoteDeviceServiceNotFoundException.java | 4 +- .../ifremer/tutti/ichtyometer/feed/FeedReader.java | 4 +- .../ichtyometer/feed/event/FeedReaderEvent.java | 2 +- .../ichtyometer/feed/event/FeedReaderListener.java | 4 +- .../tutti/ichtyometer/interactive/Command.java | 2 +- .../ichtyometer/interactive/CommandEngine.java | 4 +- .../interactive/IchtyometerCommandException.java | 2 +- .../tutti/ichtyometer/tool/FeedReaderTool.java | 2 +- .../tutti/ichtyometer/tool/SendCommandTool.java | 2 +- .../tutti/ichtyometer/IchtyometerClientTest.java | 4 +- .../tutti/ichtyometer/feed/FeedReaderTest.java | 2 +- .../ichtyometer/interactive/CommandEngineTest.java | 2 +- tutti-persistence/pom.xml | 6 +- .../src/main/java/fr/ifremer/tutti/LabelAware.java | 2 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 8 +- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 14 +- .../ifremer/tutti/TuttiConfigurationProvider.java | 2 +- .../persistence/InvalidBatchModelException.java | 2 +- .../tutti/persistence/ProgressionModel.java | 2 +- .../tutti/persistence/RessourceClassLoader.java | 2 +- .../tutti/persistence/TuttiPersistence.java | 2 +- .../tutti/persistence/TuttiPersistenceImpl.java | 51 +- .../persistence/TuttiPersistenceNoDbImpl.java | 44 +- .../TuttiPersistenceServiceImplementor.java | 2 +- .../dao/GearPhysicalFeaturesDaoImplTutti.java | 5 +- .../dao/GearPhysicalFeaturesDaoTutti.java | 2 +- .../dao/TaxonNameDaoTutti.java} | 32 +- .../persistence/dao/TaxonNameDaoTuttiImpl.java | 109 ++ .../persistence/entities/CaracteristicMap.java | 2 +- .../tutti/persistence/entities/TuttiEntities.java | 2 +- .../tutti/persistence/entities/TuttiEntity.java | 2 +- .../persistence/entities/TuttiEntityBean.java | 2 +- .../persistence/entities/TuttiEnumerable.java | 2 +- .../persistence/entities/data/BatchContainer.java | 2 +- .../persistence/entities/data/SampleCategory.java | 2 +- .../entities/data/SampleCategoryModel.java | 2 +- .../data/SampleCategoryModelConverter.java | 4 +- .../entities/data/SampleCategoryModelEntry.java | 4 +- .../protocol/CaracteristicMappingRows.java | 51 + .../entities/protocol/CaracteristicType.java | 2 +- .../entities/protocol/SpeciesProtocols.java | 58 + .../entities/protocol/TuttiProtocols.java | 39 +- .../entities/protocol/v1/SpeciesProtocol1.java | 2 +- .../entities/protocol/v1/SpeciesProtocolBean1.java | 2 +- .../entities/protocol/v1/TuttiProtocol1.java | 2 +- .../entities/protocol/v1/TuttiProtocolBean1.java | 2 +- .../service/AbstractPersistenceService.java | 8 +- .../service/AccidentalBatchPersistenceService.java | 2 +- .../AccidentalBatchPersistenceServiceImpl.java | 2 +- .../service/AttachmentPersistenceService.java | 2 +- .../service/AttachmentPersistenceServiceImpl.java | 2 +- .../service/BenthosBatchPersistenceService.java | 6 +- .../BenthosBatchPersistenceServiceImpl.java | 2 +- .../service/CruisePersistenceService.java | 2 +- .../service/CruisePersistenceServiceImpl.java | 2 +- .../FishingOperationPersistenceService.java | 2 +- .../FishingOperationPersistenceServiceImpl.java | 11 +- ...dividualObservationBatchPersistenceService.java | 2 +- ...dualObservationBatchPersistenceServiceImpl.java | 2 +- .../MarineLitterBatchPersistenceService.java | 4 +- .../MarineLitterBatchPersistenceServiceImpl.java | 2 +- .../service/ProgramPersistenceService.java | 7 +- .../service/ProgramPersistenceServiceImpl.java | 2 +- .../service/ProtocolPersistenceService.java | 2 +- .../service/ProtocolPersistenceServiceImpl.java | 2 +- .../service/ReferentialPersistenceService.java | 495 ------- .../service/ReferentialPersistenceServiceImpl.java | 1423 -------------------- .../service/SpeciesBatchPersistenceService.java | 6 +- .../SpeciesBatchPersistenceServiceImpl.java | 2 +- .../service/TechnicalPersistenceService.java | 8 +- .../service/TechnicalPersistenceServiceImpl.java | 12 +- .../service/TuttiPersistenceServiceLocator.java | 2 +- .../service/UpdateSchemaContextSupport.java | 2 +- .../service/batch/TuttiCatchBatchValidator.java | 2 +- .../referential/GearPersistenceService.java | 16 +- .../referential/GearPersistenceServiceImpl.java | 42 +- .../referential/LocationPersistenceService.java | 18 +- .../LocationPersistenceServiceImpl.java | 129 +- .../referential/PersonPersistenceService.java | 15 +- .../referential/PersonPersistenceServiceImpl.java | 32 +- .../ReferentialPersistenceServiceSupport.java | 24 +- .../referential/SpeciesPersistenceService.java | 16 +- .../referential/SpeciesPersistenceServiceImpl.java | 41 +- .../referential/VesselPersistenceService.java | 14 +- .../referential/VesselPersistenceServiceImpl.java | 134 +- .../referential/synchro/ReferentialUpdateTask.java | 7 +- .../TuttiReferentialSynchroServiceImpl.java | 9 +- .../service/util/BatchPersistenceHelper.java | 4 +- .../persistence/service/util/BatchTreeHelper.java | 4 +- .../service/util/MeasurementPersistenceHelper.java | 2 +- .../service/util/SamplePersistenceHelper.java | 2 +- .../service/util/SynchronizationStatusHelper.java | 4 +- .../VesselPersonFeaturesPersistenceHelper.java | 2 +- .../tutti/persistence/test/DatabaseFixtures.java | 2 +- .../tutti/persistence/test/DatabaseResource.java | 13 +- .../tutti/persistence/test/TuttiRunListener.java | 2 +- .../tutti/persistence/test/TuttiRunner.java | 5 +- .../ifremer/tutti/type/CoordinateEditorType.java | 4 +- .../java/fr/ifremer/tutti/type/WeightUnit.java | 4 +- .../main/java/fr/ifremer/tutti/util/Weights.java | 2 +- .../resources/applicationContext-service-tutti.xml | 32 +- .../i18n/tutti-persistence_en_GB.properties | 1 + .../i18n/tutti-persistence_fr_FR.properties | 1 + .../src/main/resources/queries-failsafe.hbm.xml | 187 ++- .../ReferentialSynchroTableMetadataTest.java | 2 +- .../config/TuttiPersistenceConfigTest.java | 2 +- .../entities/protocol/TuttiProtocolsTest.java | 2 +- .../AccidentalBatchPersistenceServiceReadTest.java | 2 +- ...AccidentalBatchPersistenceServiceWriteTest.java | 2 +- .../AttachmentPersistenceServiceWriteTest.java | 2 +- .../BenthosBatchPersistenceServiceReadTest.java | 2 +- .../BenthosBatchPersistenceServiceWriteTest.java | 2 +- .../CatchBatchPersistenceServiceReadTest.java | 2 +- .../CatchBatchPersistenceServiceWriteTest.java | 2 +- .../service/CruisePersistenceServiceReadTest.java | 2 +- .../service/CruisePersistenceServiceWriteTest.java | 2 +- ...hingOperationPersistenceServiceAno4995Test.java | 4 +- ...FishingOperationPersistenceServiceReadTest.java | 2 +- ...ishingOperationPersistenceServiceWriteTest.java | 2 +- ...bservationBatchPersistenceServiceWriteTest.java | 2 +- ...arineLitterBatchPersistenceServiceReadTest.java | 2 +- ...rineLitterBatchPersistenceServiceWriteTest.java | 2 +- .../service/ProgramPersistenceServiceReadTest.java | 2 +- .../ProgramPersistenceServiceWriteTest.java | 2 +- .../ProtocolPersistenceServiceReadTest.java | 2 +- .../ProtocolPersistenceServiceWriteTest.java | 2 +- .../ReferentialPersistenceServiceWriteTest.java | 2 +- .../SpeciesBatchPersistenceServiceReadTest.java | 2 +- .../SpeciesBatchPersistenceServiceWriteTest.java | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 6 +- .../tutti/service/AbstractTuttiService.java | 6 +- .../tutti/service/ClosedPersistenceService.java | 2 +- .../fr/ifremer/tutti/service/DecoratorService.java | 57 +- .../ifremer/tutti/service/PersistenceService.java | 44 +- .../fr/ifremer/tutti/service/TuttiDataContext.java | 12 +- .../fr/ifremer/tutti/service/TuttiDecorator.java | 4 +- .../fr/ifremer/tutti/service/TuttiService.java | 8 +- .../ifremer/tutti/service/TuttiServiceContext.java | 4 +- .../tutti/service/TuttiValidationDataContext.java | 2 +- .../service/TuttiValidationDataContextSupport.java | 10 +- .../ifremer/tutti/service/ValidationService.java | 2 +- .../tutti/service/bigfin/BigfinImportResult.java | 2 +- .../catches/TuttiWeightComputingException.java | 2 +- .../catches/ValidateCruiseOperationsService.java | 2 +- .../service/catches/WeightCleaningService.java | 8 +- .../service/catches/WeightComputingService.java | 2 +- .../multipost/AbstractFishingOperationRow.java | 2 +- .../AbstractFishingOperationRowModel.java | 2 +- .../catches/multipost/AccidentalCatchRow.java | 2 +- .../catches/multipost/AccidentalCatchRowModel.java | 2 +- .../service/catches/multipost/AttachmentRow.java | 2 +- .../catches/multipost/AttachmentRowModel.java | 2 +- .../catches/multipost/CaracteristicRow.java | 2 +- .../catches/multipost/CaracteristicRowModel.java | 2 +- .../catches/multipost/CatchFrequencyRow.java | 2 +- .../catches/multipost/CatchFrequencyRowModel.java | 2 +- .../tutti/service/catches/multipost/CatchRow.java | 2 +- .../service/catches/multipost/CatchRowModel.java | 2 +- .../service/catches/multipost/CatchWeightsRow.java | 2 +- .../catches/multipost/CatchWeightsRowModel.java | 2 +- .../catches/multipost/FishingOperationRow.java | 2 +- .../multipost/FishingOperationRowModel.java | 2 +- .../multipost/IndividualObservationRow.java | 2 +- .../multipost/IndividualObservationRowModel.java | 2 +- .../service/catches/multipost/MarineLitterRow.java | 2 +- .../catches/multipost/MarineLitterRowModel.java | 2 +- .../catches/multipost/MarineLitterWeightRow.java | 2 +- .../multipost/MarineLitterWeightRowModel.java | 2 +- .../catches/multipost/MultiPostExportService.java | 4 +- .../catches/multipost/MultiPostImportService.java | 2 +- .../service/csv/CaracteristicParserFormatter.java | 5 + .../service/csv/EntityParserFormatterSupport.java | 15 +- .../FishingOperationLocationParserFormatter.java | 5 + .../csv/FishingOperationStrataParserFormatter.java | 5 + .../FishingOperationSubStrataParserFormatter.java | 5 + .../service/csv/ForeignKeyListParserFormatter.java | 2 +- .../service/csv/ForeignKeyParserFormatter.java | 2 +- .../tutti/service/csv/GearParserFormatter.java | 5 + .../tutti/service/csv/HarbourParserFormatter.java | 5 + .../tutti/service/csv/PersonParserFormatter.java | 5 + .../tutti/service/csv/ProgramParserFormatter.java | 5 + .../tutti/service/csv/SpeciesParserFormatter.java | 5 + .../fr/ifremer/tutti/service/csv/TuttiCsvUtil.java | 2 +- .../tutti/service/csv/VesselParserFormatter.java | 5 + .../tutti/service/export/ExportCatchContext.java | 4 +- .../export/pdf/CatchesPdfExportService.java | 2 +- .../tutti/service/export/sumatra/CatchRow.java | 2 +- .../service/export/sumatra/CatchRowModel.java | 2 +- .../sumatra/CatchesSumatraExportService.java | 2 +- .../export/sumatra/SumatraExportResult.java | 2 +- .../genericformat/GenericFormatExportService.java | 4 +- .../GenericFormatImportConfiguration.java | 10 + .../GenericFormatImportEntityParserFactory.java | 17 +- .../genericformat/GenericFormatImportRequest.java | 4 + .../genericformat/csv/AccidentalCatchModel.java | 2 +- .../genericformat/csv/AccidentalCatchRow.java | 2 +- .../service/genericformat/csv/CatchModel.java | 2 +- .../tutti/service/genericformat/csv/CatchRow.java | 2 +- .../genericformat/csv/ExportSampleCategory.java | 2 +- .../genericformat/csv/GearCaracteristicModel.java | 2 +- .../genericformat/csv/GearCaracteristicRow.java | 2 +- .../csv/IndividualObservationModel.java | 2 +- .../csv/IndividualObservationRow.java | 2 +- .../genericformat/csv/MarineLitterModel.java | 2 +- .../service/genericformat/csv/MarineLitterRow.java | 2 +- .../service/genericformat/csv/OperationModel.java | 2 +- .../service/genericformat/csv/OperationRow.java | 2 +- .../service/genericformat/csv/ParameterModel.java | 2 +- .../service/genericformat/csv/ParameterRow.java | 2 +- .../genericformat/csv/SpeciesExportModel.java | 2 +- .../genericformat/csv/SpeciesExportRow.java | 2 +- .../service/genericformat/csv/SurveyModel.java | 2 +- .../tutti/service/genericformat/csv/SurveyRow.java | 2 +- .../tutti/service/protocol/CaracteristicRow.java | 2 +- .../service/protocol/CaracteristicRowModel.java | 2 +- .../protocol/ProtocolImportExportService.java | 2 +- .../ifremer/tutti/service/protocol/SpeciesRow.java | 2 +- .../tutti/service/protocol/SpeciesRowModel.java | 2 +- .../service/psionimport/PsionImportBatchModel.java | 2 +- .../service/psionimport/PsionImportModel.java | 2 +- .../service/psionimport/PsionImportResult.java | 2 +- .../service/psionimport/PsionImportService.java | 8 +- .../pupitri/CarrouselImportRequestResult.java | 8 +- .../ifremer/tutti/service/pupitri/Directions.java | 2 +- .../tutti/service/pupitri/PupitriImportResult.java | 8 +- .../service/pupitri/PupitriImportService.java | 164 ++- .../service/pupitri/PupitriSpeciesContext.java | 53 +- .../fr/ifremer/tutti/service/pupitri/Signs.java | 126 +- .../tutti/service/pupitri/csv/CarrouselRow.java | 2 +- .../service/pupitri/csv/CarrouselRowModel.java | 2 +- .../tutti/service/pupitri/csv/SpeciesRow.java | 2 +- .../tutti/service/pupitri/csv/SpeciesRowModel.java | 2 +- .../tutti/service/pupitri/csv/TrunkRow.java | 2 +- .../tutti/service/pupitri/csv/TrunkRowModel.java | 2 +- .../TuttiReferentialSynchronizeService.java | 2 +- .../tutti/service/referential/csv/GearModel.java | 2 +- .../tutti/service/referential/csv/PersonModel.java | 2 +- .../service/referential/csv/SpeciesModel.java | 2 +- .../tutti/service/referential/csv/VesselModel.java | 2 +- .../ifremer/tutti/service/AbstractServiceTest.java | 2 +- .../tutti/service/BeanValidatorDetectorTest.java | 2 +- .../tutti/service/DecoratorServiceTest.java | 2 +- .../ifremer/tutti/service/ServiceDbResource.java | 22 +- .../tutti/service/ValidationServiceTest.java | 2 +- .../service/bigfin/BigfinImportService2Test.java | 1 - .../catches/WeightComputingServiceTest.java | 2 +- .../multipost/MultiPostExportServiceTest.java | 2 +- .../export/pdf/CatchesPdfExportServiceTest.java | 2 +- .../sumatra/CatchesSumatraExportServiceTest.java | 2 +- .../GenericFormatExportServiceTest.java | 2 +- .../GenericFormatImportServiceTest.java | 3 +- .../GenericFormatImportServiceValidTest.java | 40 +- .../protocol/ProtocolImportExportServiceTest.java | 2 +- .../psionimport/PsionImportServiceTest.java | 2 +- .../pupitri/PupitriImportServiceAno3898Test.java | 2 +- .../pupitri/PupitriImportServiceAno5032Test.java | 2 +- .../pupitri/PupitriImportServiceAno5079Test.java | 4 +- .../pupitri/PupitriImportServiceEvo5060Test.java | 2 +- .../pupitri/PupitriImportServiceEvo5062Test.java | 2 +- .../pupitri/PupitriImportServiceEvo6116Test.java | 293 ++++ .../pupitri/PupitriImportServiceEvo6149Test.java | 4 +- ...t.java => PupitriImportServiceEvo6592Test.java} | 39 +- .../service/pupitri/PupitriImportServiceTest.java | 4 +- .../ReferentialTemporaryExportServiceTest.java | 2 +- .../test/resources/genericFormat/catch/catch.csv | 866 ++++++------ .../test/resources/genericFormat/default/catch.csv | 866 ++++++------ .../resources/genericFormat/default/operation.csv | 6 +- .../resources/genericFormat/default/survey.csv | 4 +- .../test/resources/genericFormat/empty/catch.csv | 2 +- .../resources/genericFormat/empty/operation.csv | 2 +- .../test/resources/genericFormat/empty/survey.csv | 2 +- .../genericFormat/marineLitter/marineLitter.csv | 8 +- .../genericFormat/operation/operation.csv | 6 +- .../referentials/temporarySpecies.csv | 18 +- .../test/resources/genericFormat/survey/survey.csv | 4 +- .../genericFormat/withObsoletes/catch.csv | 16 + .../{empty => withObsoletes}/operation.csv | 3 +- .../withObsoletes/protocol.tuttiProtocol | 197 +++ .../genericFormat/withObsoletes/sampleCategory.csv | 9 + .../genericFormat/withObsoletes/survey.csv | 2 + .../genericFormat/withObsoletes/temporaryGears.csv | 1 + .../withObsoletes/temporaryPersons.csv | 1 + .../withObsoletes/temporarySpecies.csv | 11 + .../withObsoletes/temporaryVessels.csv | 1 + .../src/test/resources/pupitri/evo-6116.car | 7 + .../src/test/resources/pupitri/evo-6116.tnk | 32 + .../test/resources/pupitri/evo-6116.tuttiProtocol | 198 +++ .../src/test/resources/pupitri/evo-6592.car | 8 + .../src/test/resources/pupitri/evo-6592.tnk | 32 + .../test/resources/pupitri/evo-6592.tuttiProtocol | 154 +++ tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 9 +- .../filtered-resources/tutti-help-fr.properties | 5 +- .../java/fr/ifremer/tutti/ui/swing/RunTutti.java | 2 +- .../ifremer/tutti/ui/swing/TuttiActionFactory.java | 2 +- .../fr/ifremer/tutti/ui/swing/TuttiHelpBroker.java | 2 +- .../fr/ifremer/tutti/ui/swing/TuttiScreen.java | 2 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 2 +- .../fr/ifremer/tutti/ui/swing/content/Common.jcss | 4 + .../ui/swing/content/{MainUI.css => MainUI.jcss} | 0 .../tutti/ui/swing/content/MainUIHandler.java | 2 +- .../actions/AbstractChangeLocaleAction.java | 2 +- .../actions/AbstractChangeScreenAction.java | 50 +- .../content/actions/AbstractMainUITuttiAction.java | 2 +- .../content/actions/ChangeToLocaleFRAction.java | 2 +- .../content/actions/ChangeToLocaleUKAction.java | 2 +- .../content/actions/CloseApplicationAction.java | 2 +- .../content/actions/ConnectIchtyometerAction.java | 4 +- .../actions/DisconnectIchtyometerAction.java | 4 +- .../EditCatchesForSelectedCruiseAction.java | 2 +- .../content/actions/EditSelectedCruiseAction.java | 2 +- .../content/actions/EditSelectedProgramAction.java | 2 +- .../actions/EditSelectedProtocolAction.java | 2 +- .../content/actions/GoToPreviousScreenAction.java | 2 +- .../swing/content/actions/OpenDbScreenAction.java | 2 +- .../actions/OpenGenericFormatImportScreen.java | 2 +- .../content/actions/OpenHomeScreenAction.java | 2 +- .../content/actions/OpenReportScreenAction.java | 2 +- .../OpenSampleCategoryModelScreenAction.java | 2 +- .../OpenTemporaryReferentialScreenAction.java | 2 +- .../ui/swing/content/actions/ShowAboutAction.java | 2 +- .../ui/swing/content/actions/ShowConfigAction.java | 2 +- .../ui/swing/content/actions/StartAction.java | 4 +- .../actions/ValidateSelectedCruiseAction.java | 2 +- .../EditSampleCategoryModelTableModel.java | 2 +- ...yModelUI.css => EditSampleCategoryModelUI.jcss} | 0 .../category/EditSampleCategoryModelUIHandler.java | 2 +- .../category/EditSampleCategoryModelUIModel.java | 2 +- .../actions/SaveSampleCategoryModelAction.java | 2 +- .../{TuttiConfigUI.css => TuttiConfigUI.jcss} | 0 .../swing/content/config/TuttiConfigUIHandler.java | 6 +- .../content/config/actions/ReloadTuttiAction.java | 2 +- .../cruise/{EditCruiseUI.css => EditCruiseUI.jcss} | 0 .../swing/content/cruise/EditCruiseUIHandler.java | 2 +- .../ui/swing/content/cruise/EditCruiseUIModel.java | 2 +- .../cruise/GearCaracteristicsEditorRowModel.java | 2 +- .../cruise/GearCaracteristicsEditorTableModel.java | 2 +- ...ditorUI.css => GearCaracteristicsEditorUI.jcss} | 0 .../cruise/GearCaracteristicsEditorUIHandler.java | 2 +- .../cruise/GearCaracteristicsEditorUIModel.java | 2 +- .../ui/swing/content/cruise/VesselTypeEnum.java | 2 +- .../actions/EditGearCaracteristicsAction.java | 2 +- .../content/cruise/actions/SaveCruiseAction.java | 2 +- .../actions/ViewGearCaracteristicsAction.java | 2 +- .../db/{DbManagerUI.css => DbManagerUI.jcss} | 0 .../ui/swing/content/db/DbManagerUIHandler.java | 4 +- .../ui/swing/content/db/actions/CloseDbAction.java | 2 +- .../content/db/actions/ExportAndCleanDbAction.java | 2 +- .../swing/content/db/actions/ExportDbAction.java | 2 +- .../swing/content/db/actions/ImportDbAction.java | 4 +- .../db/actions/ImportOrReimportDbAction.java | 2 +- .../swing/content/db/actions/InstallDbAction.java | 2 +- .../db/actions/InstallOrReinstallDbAction.java | 2 +- .../ui/swing/content/db/actions/OpenDbAction.java | 4 +- .../swing/content/db/actions/ReimportDbAction.java | 2 +- .../content/db/actions/ReinstallDbAction.java | 2 +- .../swing/content/db/actions/UpdateDbAction.java | 2 +- ...rmatExportUI.css => GenericFormatExportUI.jcss} | 0 .../genericformat/GenericFormatImportUI.jaxx | 5 + ...rmatImportUI.css => GenericFormatImportUI.jcss} | 7 + .../GenericFormatImportUIHandler.java | 14 +- .../genericformat/GenericFormatImportUIModel.java | 16 + .../{SelectCruiseUI.css => SelectCruiseUI.jcss} | 0 .../swing/content/home/SelectCruiseUIHandler.java | 2 +- .../ui/swing/content/home/SelectCruiseUIModel.java | 2 +- .../content/home/actions/CloneProtocolAction.java | 2 +- .../content/home/actions/DeleteProtocolAction.java | 2 +- .../content/home/actions/EditCatchesAction.java | 2 +- .../content/home/actions/EditCruiseAction.java | 2 +- .../content/home/actions/EditProgramAction.java | 2 +- .../content/home/actions/EditProtocolAction.java | 2 +- .../home/actions/ExportCruiseForSumatraAction.java | 2 +- .../content/home/actions/ExportProtocolAction.java | 2 +- .../content/home/actions/ImportProtocolAction.java | 2 +- .../content/home/actions/NewCruiseAction.java | 2 +- .../content/home/actions/NewProgramAction.java | 2 +- .../content/home/actions/NewProtocolAction.java | 2 +- .../home/actions/SendCruiseReportAction.java | 2 +- .../SpeciesToConfirmReportForCruiseAction.java | 2 +- .../home/actions/ValidateCatchesAction.java | 2 +- ...OperationUI.css => EditFishingOperationUI.jcss} | 0 .../operation/EditFishingOperationUIHandler.java | 2 +- .../operation/EditFishingOperationUIModel.java | 2 +- ...ngOperationsUI.css => FishingOperationsUI.jcss} | 0 .../operation/FishingOperationsUIHandler.java | 2 +- .../operation/FishingOperationsUIModel.java | 12 +- .../content/operation/SecondaryVesselTypeEnum.java | 2 +- .../catches/AbstractTuttiBatchTableUIHandler.java | 4 +- .../catches/AbstractTuttiBatchUIModel.java | 2 +- .../{EditCatchesUI.css => EditCatchesUI.jcss} | 0 .../operation/catches/EditCatchesUIHandler.java | 2 +- .../operation/catches/EditCatchesUIModel.java | 6 +- .../catches/FrequencyConfigurationMode.java | 2 +- ...LogDialog.css => MultiPostImportLogDialog.jcss} | 0 .../operation/catches/SampleCategoryAble.java | 2 +- .../catches/SampleCategoryColumnIdentifier.java | 2 +- .../operation/catches/SampleCategoryComponent.java | 6 +- .../operation/catches/SelectedCategoryAble.java | 2 +- .../catches/SpeciesAbleBatchRowHelper.java | 2 +- .../operation/catches/SpeciesBatchDecorator.java | 2 +- .../catches/SpeciesBatchDecoratorComparator.java | 6 +- .../content/operation/catches/SpeciesSortMode.java | 2 +- .../operation/catches/SpeciesSortableRowModel.java | 2 +- .../content/operation/catches/TableViewMode.java | 2 +- .../accidental/AccidentalBatchRowModel.java | 2 +- .../accidental/AccidentalBatchTableModel.java | 2 +- ...ccidentalBatchUI.css => AccidentalBatchUI.jcss} | 0 .../accidental/AccidentalBatchUIHandler.java | 2 +- .../catches/accidental/AccidentalBatchUIModel.java | 2 +- .../actions/ExportMultiPostAccidentalAction.java | 2 +- .../actions/ImportMultiPostAccidentalAction.java | 2 +- .../actions/RemoveAccidentalBatchAction.java | 2 +- ...talBatchUI.css => CreateAccidentalBatchUI.jcss} | 0 .../create/CreateAccidentalBatchUIHandler.java | 2 +- .../create/CreateAccidentalBatchUIModel.java | 2 +- .../actions/CancelEditCatchBatchAction.java | 2 +- .../catches/actions/CleanBatchWeightsAction.java | 4 +- .../catches/actions/ComputeBatchWeightsAction.java | 2 +- .../ExportFishingOperationForSumatraAction.java | 2 +- .../ExportFishingOperationReportAction.java | 2 +- .../actions/ExportMultiPostActionSupport.java | 2 +- .../actions/ImportMultiPostActionSupport.java | 2 +- .../catches/actions/SaveCatchBatchAction.java | 2 +- .../catches/benthos/BenthosBatchRowModel.java | 2 +- .../catches/benthos/BenthosBatchTableModel.java | 2 +- .../{BenthosBatchUI.css => BenthosBatchUI.jcss} | 0 .../catches/benthos/BenthosBatchUIHandler.java | 2 +- .../catches/benthos/BenthosBatchUIModel.java | 2 +- .../benthos/actions/CreateBenthosMelagAction.java | 2 +- .../actions/ExportMultiPostBenthosAction.java | 2 +- .../actions/ImportMultiPostBenthosAction.java | 2 +- .../benthos/actions/RemoveBenthosBatchAction.java | 2 +- .../actions/RemoveBenthosSubBatchAction.java | 2 +- .../benthos/actions/RenameBenthosBatchAction.java | 43 +- .../benthos/create/CreateBenthosBatchUI.jaxx | 11 +- ...enthosBatchUI.css => CreateBenthosBatchUI.jcss} | 8 + .../create/CreateBenthosBatchUIHandler.java | 22 +- .../benthos/create/CreateBenthosBatchUIModel.java | 43 +- .../SelectSpeciesForBenthosBatchAction.java | 2 +- .../frequency/BenthosFrequencyCellComponent.java | 2 +- .../frequency/BenthosFrequencyRowModel.java | 2 +- .../frequency/BenthosFrequencyTableModel.java | 2 +- ...thosFrequencyUI.css => BenthosFrequencyUI.jcss} | 1 + .../frequency/BenthosFrequencyUIHandler.java | 2 +- .../benthos/frequency/BenthosFrequencyUIModel.java | 2 +- .../benthos/split/SplitBenthosBatchRowModel.java | 2 +- .../benthos/split/SplitBenthosBatchTableModel.java | 2 +- ...BenthosBatchUI.css => SplitBenthosBatchUI.jcss} | 0 .../benthos/split/SplitBenthosBatchUIHandler.java | 2 +- .../benthos/split/SplitBenthosBatchUIModel.java | 2 +- .../IndividualObservationBatchRowModel.java | 2 +- .../IndividualObservationBatchTableModel.java | 2 +- ...tchUI.css => IndividualObservationBatchUI.jcss} | 0 .../IndividualObservationBatchUIHandler.java | 2 +- .../IndividualObservationBatchUIModel.java | 2 +- ...ExportMultiPostIndividualObservationAction.java | 2 +- ...ImportMultiPostIndividualObservationAction.java | 2 +- .../RemoveAllIndividualObservationBatchAction.java | 2 +- .../RemoveIndividualObservationBatchAction.java | 2 +- ...SpeciesForIndividualObservationBatchAction.java | 2 +- ...css => CreateIndividualObservationBatchUI.jcss} | 0 .../CreateIndividualObservationBatchUIHandler.java | 2 +- .../CreateIndividualObservationBatchUIModel.java | 4 +- .../marinelitter/MarineLitterBatchRowModel.java | 2 +- .../marinelitter/MarineLitterBatchTableModel.java | 2 +- ...eLitterBatchUI.css => MarineLitterBatchUI.jcss} | 0 .../marinelitter/MarineLitterBatchUIHandler.java | 2 +- .../marinelitter/MarineLitterBatchUIModel.java | 2 +- .../actions/ExportMultiPostMarineLitterAction.java | 2 +- .../actions/ImportMultiPostMarineLitterAction.java | 2 +- .../actions/RemoveMarineLitterBatchAction.java | 2 +- ...rBatchUI.css => CreateMarineLitterBatchUI.jcss} | 0 .../create/CreateMarineLitterBatchUIHandler.java | 2 +- .../create/CreateMarineLitterBatchUIModel.java | 2 +- ...I.jaxx => ImportPupitriMelagWeightPopupUI.jaxx} | 37 +- .../species/ImportPupitriMelagWeightPopupUI.jcss} | 43 +- .../ImportPupitriMelagWeightPopupUIHandler.java | 79 ++ .../ImportPupitriMelagWeightPopupUIModel.java | 59 + .../catches/species/ImportPupitriPopupUI.jaxx | 24 +- ...upitriPopupUI.css => ImportPupitriPopupUI.jcss} | 9 + .../species/ImportPupitriPopupUIHandler.java | 86 +- .../catches/species/ImportPupitriPopupUIModel.java | 78 ++ .../catches/species/SpeciesBatchRowModel.java | 2 +- .../catches/species/SpeciesBatchTableModel.java | 2 +- .../{SpeciesBatchUI.css => SpeciesBatchUI.jcss} | 0 .../catches/species/SpeciesBatchUIHandler.java | 2 +- .../catches/species/SpeciesBatchUIModel.java | 2 +- .../species/actions/CreateSpeciesMelagAction.java | 2 +- .../actions/ExportMultiPostSpeciesAction.java | 2 +- .../species/actions/ImportBigfinAction.java | 2 +- .../actions/ImportMultiPostSpeciesAction.java | 2 +- .../catches/species/actions/ImportPsionAction.java | 2 +- .../species/actions/ImportPupitriAction.java | 69 +- ...mportPupitriMelagWeightPopupValidateAction.java | 44 + .../species/actions/RemoveSpeciesBatchAction.java | 2 +- .../actions/RemoveSpeciesSubBatchAction.java | 2 +- .../species/actions/RenameSpeciesBatchAction.java | 43 +- .../species/create/CreateSpeciesBatchUI.jaxx | 11 +- ...peciesBatchUI.css => CreateSpeciesBatchUI.jcss} | 8 + .../create/CreateSpeciesBatchUIHandler.java | 20 +- .../species/create/CreateSpeciesBatchUIModel.java | 43 +- .../SelectSpeciesForSpeciesBatchAction.java | 2 +- .../frequency/SpeciesFrequencyCellComponent.java | 2 +- .../frequency/SpeciesFrequencyRowModel.java | 2 +- .../frequency/SpeciesFrequencyTableModel.java | 2 +- ...ciesFrequencyUI.css => SpeciesFrequencyUI.jcss} | 1 + .../frequency/SpeciesFrequencyUIHandler.java | 2 +- .../species/frequency/SpeciesFrequencyUIModel.java | 2 +- .../species/split/SplitSpeciesBatchRowModel.java | 2 +- .../species/split/SplitSpeciesBatchTableModel.java | 2 +- ...SpeciesBatchUI.css => SplitSpeciesBatchUI.jcss} | 0 .../species/split/SplitSpeciesBatchUIHandler.java | 2 +- .../species/split/SplitSpeciesBatchUIModel.java | 2 +- .../fishing/AbstractCaracteristicRowModel.java | 2 +- .../fishing/AbstractCaracteristicTabUIHandler.java | 2 +- .../fishing/AbstractCaracteristicTabUIModel.java | 2 +- .../operation/fishing/GearUseFeatureRowModel.java | 2 +- ...seFeatureTabUI.css => GearUseFeatureTabUI.jcss} | 0 .../fishing/VesselUseFeatureRowModel.java | 2 +- ...FeatureTabUI.css => VesselUseFeatureTabUI.jcss} | 0 .../actions/CancelEditFishingOperationAction.java | 2 +- .../actions/DeleteFishingOperationAction.java | 2 +- .../actions/EditFishingOperationAction.java | 6 +- .../fishing/actions/NewFishingOperationAction.java | 2 +- .../actions/SaveFishingOperationAction.java | 2 +- .../{EditProgramUI.css => EditProgramUI.jcss} | 0 .../content/program/EditProgramUIHandler.java | 2 +- .../swing/content/program/EditProgramUIModel.java | 2 +- .../content/program/actions/SaveProgramAction.java | 4 +- .../{EditProtocolUI.css => EditProtocolUI.jcss} | 0 .../content/protocol/EditProtocolUIHandler.java | 2 +- .../content/protocol/EditProtocolUIModel.java | 2 +- .../MandatorySampleCategoryColumnIdentifier.java | 2 +- .../protocol/actions/AddBenthosProtocolAction.java | 2 +- .../actions/AddCaracteristicMappingAction.java | 2 +- .../protocol/actions/AddSpeciesProtocolAction.java | 2 +- .../actions/ExportAllCaracteristicAction.java | 2 +- .../actions/ExportProtocolBenthosAction.java | 2 +- .../actions/ExportProtocolCaracteristicAction.java | 2 +- .../actions/ExportProtocolSpeciesAction.java | 2 +- .../protocol/actions/ExportPupitriAction.java | 2 +- .../actions/ImportProtocolBenthosAction.java | 2 +- .../actions/ImportProtocolCaracteristicAction.java | 2 +- .../actions/ImportProtocolSpeciesAction.java | 2 +- .../actions/RemoveBenthosProtocolAction.java | 2 +- .../actions/RemoveSpeciesProtocolAction.java | 2 +- .../protocol/actions/SaveProtocolAction.java | 2 +- .../protocol/actions/SelectOtherBenthosAction.java | 2 +- .../protocol/actions/SelectOtherSpeciesAction.java | 2 +- ...ialUI.css => ManageTemporaryReferentialUI.jcss} | 0 .../ManageTemporaryReferentialUIHandler.java | 2 +- .../actions/ExportExistingTemporaryGearAction.java | 2 +- .../ExportExistingTemporaryPersonAction.java | 2 +- .../ExportExistingTemporarySpeciesAction.java | 2 +- .../ExportExistingTemporaryVesselAction.java | 2 +- .../actions/ExportTemporaryGearExampleAction.java | 2 +- .../ExportTemporaryPersonExampleAction.java | 2 +- .../ExportTemporarySpeciesExampleAction.java | 2 +- .../ExportTemporaryVesselExampleAction.java | 2 +- .../actions/ImportTemporaryGearAction.java | 2 +- .../actions/ImportTemporaryPersonAction.java | 2 +- .../actions/ImportTemporarySpeciesAction.java | 2 +- .../actions/ImportTemporaryVesselAction.java | 2 +- ...oraryUI.css => AbstractReplaceTemporaryUI.jcss} | 0 ...oraryGearUI.css => ReplaceTemporaryGearUI.jcss} | 0 ...yPersonUI.css => ReplaceTemporaryPersonUI.jcss} | 0 ...peciesUI.css => ReplaceTemporarySpeciesUI.jcss} | 0 ...yVesselUI.css => ReplaceTemporaryVesselUI.jcss} | 0 .../content/report/{ReportUI.css => ReportUI.jcss} | 0 .../ui/swing/content/report/ReportUIHandler.java | 2 +- .../ui/swing/content/report/ReportUIModel.java | 2 +- .../report/actions/GenerateReportAction.java | 2 +- ...{ValidateCruiseUI.css => ValidateCruiseUI.jcss} | 0 .../validation/ValidateCruiseUIHandler.java | 2 +- .../content/validation/ValidateCruiseUIModel.java | 2 +- .../actions/EditCruiseInValidationUIAction.java | 2 +- .../EditFishingOperationInValidationUIAction.java | 4 +- .../ExportCruiseValidationMessagesAction.java | 2 +- .../ExportOperationValidationMessagesAction.java | 2 +- .../actions/SaveCruiseToReadyToSynchAction.java | 2 +- .../ui/swing/update/TuttiDbUpdaterCallBack.java | 2 +- .../update/actions/UpdateApplicationAction.java | 2 +- .../swing/update/actions/UpdateReportAction.java | 2 +- .../ui/swing/update/module/TuttiModuleUpdater.java | 4 +- .../ui/swing/util/AbstractTuttiBeanUIModel.java | 2 +- .../util/AbstractTuttiTabContainerUIHandler.java | 2 +- .../ui/swing/util/AbstractTuttiUIHandler.java | 2 +- .../util/RemoveablePropertyChangeListener.java | 4 +- .../tutti/ui/swing/util/TuttiBeanMonitor.java | 2 +- .../tutti/ui/swing/util/TuttiExceptionHandler.java | 6 +- .../fr/ifremer/tutti/ui/swing/util/TuttiUI.java | 2 +- .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 2 +- .../tutti/ui/swing/util/UIMessageNotifier.java | 2 +- .../ui/swing/util/actions/LongActionSupport.java | 9 +- .../util/attachment/AttachmentCellEditor.java | 4 +- .../util/attachment/AttachmentCellRenderer.java | 4 +- ...achmentEditorUI.css => AttachmentEditorUI.jcss} | 0 .../util/attachment/AttachmentEditorUIHandler.java | 4 +- .../{AttachmentItem.css => AttachmentItem.jcss} | 0 .../util/attachment/AttachmentModelAware.java | 2 +- .../ui/swing/util/attachment/ButtonAttachment.java | 2 +- .../attachment/actions/SaveAttachmentAction.java | 2 +- .../ui/swing/util/auth/AuthenticationInfo.java | 2 +- .../swing/util/auth/{LoginUI.css => LoginUI.jcss} | 0 .../tutti/ui/swing/util/auth/LoginUIHandler.java | 2 +- .../CaracteristicMapCellComponent.java | 2 +- .../CaracteristicMapColumnRowModel.java | 2 +- .../CaracteristicMapColumnUIHandler.java | 2 +- .../CaracteristicMapEditorRowModel.java | 2 +- .../CaracteristicMapEditorTableModel.java | 2 +- ...pEditorUI.css => CaracteristicMapEditorUI.jcss} | 0 .../CaracteristicMapEditorUIHandler.java | 2 +- .../CaracteristicMapEditorUIModel.java | 2 +- .../caracteristics/CaracteristicValueEditor.java | 2 +- .../caracteristics/CaracteristicValueRenderer.java | 2 +- .../GearCaracteristicListCellRenderer.java | 2 +- .../{EnterWeightUI.css => EnterWeightUI.jcss} | 0 .../swing/util/catches/EnterWeightUIHandler.java | 2 +- .../tutti/ui/swing/util/comment/ButtonComment.java | 2 +- .../ui/swing/util/comment/CommentCellEditor.java | 2 +- .../ui/swing/util/comment/CommentCellRenderer.java | 2 +- .../{CommentEditorUI.css => CommentEditorUI.jcss} | 0 .../swing/util/comment/CommentEditorUIHandler.java | 2 +- .../ui/swing/util/computable/ComputableData.java | 2 +- .../computable/ComputableDataEditorHandler.java | 2 +- .../util/computable/ComputableDataTableCell.java | 2 +- .../swing/util/editor/TuttiLocationTableCell.java | 2 +- .../ui/swing/util/editor/VesselTableCell.java | 2 +- ...erMelagWeightUI.css => EnterMelagWeightUI.jcss} | 0 .../util/species/EnterMelagWeightUIHandler.java | 2 +- .../ui/swing/util/species/SelectSpeciesUI.jaxx | 17 +- .../{SelectSpeciesUI.css => SelectSpeciesUI.jcss} | 14 +- .../swing/util/species/SelectSpeciesUIHandler.java | 16 +- .../swing/util/species/SelectSpeciesUIModel.java | 30 +- .../util/table/AbstractTuttiTableUIHandler.java | 4 +- .../util/table/AbstractTuttiTableUIModel.java | 2 +- .../util/table/CaracteristicColumnIdentifier.java | 2 +- .../ui/swing/util/table/CaracteristicRow.java | 2 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 27 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 18 + .../tutti/ui/swing/BeanValidatorDetectorTest.java | 2 +- .../frequency/SpeciesFrequencyRowModelTest.java | 2 +- 649 files changed, 4739 insertions(+), 3956 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.