January 2016 - Tutti-commits - mailman.cloud.codelutin.com

branch develop updated (fbebf9d -> d3f73ef)
by codelutin.com scm 18 Jan '16

18 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from fbebf9d Mise à jour des librairies lutins new d3f73ef Mise à jour des librairies lutins The 1 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 d3f73ef7cbb786ccd1a0ed7998e0642751e84d1b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Jan 18 10:28:32 2016 +0100 Mise à jour des librairies lutins Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (69fac2b -> fbebf9d)
by codelutin.com scm 18 Jan '16

18 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 69fac2b Fixes #7909 Merge branch 'feature/7909_import_generique_id_obsoletes' into develop adds c96516d Nettoyage de la javadoc (See #7898) adds cb6308c Merge branch 'feature/7898' into develop new fbebf9d Mise à jour des librairies lutins The 1 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 fbebf9dd388465646bb0490c0a60c8794a933d40 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Jan 18 10:14:34 2016 +0100 Mise à jour des librairies lutins Summary of changes: pom.xml | 6 +++--- .../java/fr/ifremer/tutti/ichtyometer/IchtyometerClient.java | 4 ++-- .../tutti/ichtyometer/LocalDeviceNotFoundException.java | 4 ++-- .../fr/ifremer/tutti/ichtyometer/RemoteDeviceChooser.java | 2 +- .../tutti/ichtyometer/RemoteDeviceNotFoundException.java | 4 ++-- .../ichtyometer/RemoteDeviceServiceNotFoundException.java | 4 ++-- .../java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java | 4 ++-- .../tutti/ichtyometer/feed/event/FeedReaderEvent.java | 2 +- .../tutti/ichtyometer/feed/event/FeedReaderListener.java | 4 ++-- .../fr/ifremer/tutti/ichtyometer/interactive/Command.java | 2 +- .../ifremer/tutti/ichtyometer/interactive/CommandEngine.java | 4 ++-- .../ichtyometer/interactive/IchtyometerCommandException.java | 2 +- .../fr/ifremer/tutti/ichtyometer/tool/FeedReaderTool.java | 2 +- .../fr/ifremer/tutti/ichtyometer/tool/SendCommandTool.java | 2 +- .../fr/ifremer/tutti/ichtyometer/IchtyometerClientTest.java | 4 ++-- .../fr/ifremer/tutti/ichtyometer/feed/FeedReaderTest.java | 2 +- .../tutti/ichtyometer/interactive/CommandEngineTest.java | 2 +- .../src/main/java/fr/ifremer/tutti/LabelAware.java | 2 +- .../src/main/java/fr/ifremer/tutti/TuttiConfiguration.java | 2 +- .../main/java/fr/ifremer/tutti/TuttiConfigurationOption.java | 4 ++-- .../java/fr/ifremer/tutti/TuttiConfigurationProvider.java | 2 +- .../tutti/persistence/InvalidBatchModelException.java | 2 +- .../java/fr/ifremer/tutti/persistence/ProgressionModel.java | 2 +- .../fr/ifremer/tutti/persistence/RessourceClassLoader.java | 2 +- .../java/fr/ifremer/tutti/persistence/TuttiPersistence.java | 2 +- .../fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java | 2 +- .../ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java | 2 +- .../persistence/TuttiPersistenceServiceImplementor.java | 2 +- .../persistence/dao/GearPhysicalFeaturesDaoImplTutti.java | 5 +---- .../tutti/persistence/dao/GearPhysicalFeaturesDaoTutti.java | 2 +- .../ifremer/tutti/persistence/entities/CaracteristicMap.java | 2 +- .../fr/ifremer/tutti/persistence/entities/TuttiEntities.java | 2 +- .../fr/ifremer/tutti/persistence/entities/TuttiEntity.java | 2 +- .../ifremer/tutti/persistence/entities/TuttiEntityBean.java | 2 +- .../ifremer/tutti/persistence/entities/TuttiEnumerable.java | 2 +- .../tutti/persistence/entities/data/BatchContainer.java | 2 +- .../tutti/persistence/entities/data/SampleCategory.java | 2 +- .../tutti/persistence/entities/data/SampleCategoryModel.java | 2 +- .../entities/data/SampleCategoryModelConverter.java | 4 ++-- .../persistence/entities/data/SampleCategoryModelEntry.java | 4 ++-- .../persistence/entities/protocol/CaracteristicType.java | 2 +- .../tutti/persistence/entities/protocol/TuttiProtocols.java | 2 +- .../persistence/entities/protocol/v1/SpeciesProtocol1.java | 2 +- .../entities/protocol/v1/SpeciesProtocolBean1.java | 2 +- .../persistence/entities/protocol/v1/TuttiProtocol1.java | 2 +- .../persistence/entities/protocol/v1/TuttiProtocolBean1.java | 2 +- .../persistence/service/AbstractPersistenceService.java | 8 +++++--- .../service/AccidentalBatchPersistenceService.java | 2 +- .../service/AccidentalBatchPersistenceServiceImpl.java | 2 +- .../persistence/service/AttachmentPersistenceService.java | 2 +- .../service/AttachmentPersistenceServiceImpl.java | 2 +- .../persistence/service/BenthosBatchPersistenceService.java | 6 +++--- .../service/BenthosBatchPersistenceServiceImpl.java | 2 +- .../tutti/persistence/service/CruisePersistenceService.java | 2 +- .../persistence/service/CruisePersistenceServiceImpl.java | 2 +- .../service/FishingOperationPersistenceService.java | 2 +- .../service/FishingOperationPersistenceServiceImpl.java | 11 ++++------- .../IndividualObservationBatchPersistenceService.java | 2 +- .../IndividualObservationBatchPersistenceServiceImpl.java | 2 +- .../service/MarineLitterBatchPersistenceService.java | 4 ++-- .../service/MarineLitterBatchPersistenceServiceImpl.java | 2 +- .../tutti/persistence/service/ProgramPersistenceService.java | 6 +++--- .../persistence/service/ProgramPersistenceServiceImpl.java | 2 +- .../persistence/service/ProtocolPersistenceService.java | 2 +- .../persistence/service/ProtocolPersistenceServiceImpl.java | 2 +- .../persistence/service/SpeciesBatchPersistenceService.java | 6 +++--- .../service/SpeciesBatchPersistenceServiceImpl.java | 2 +- .../persistence/service/TechnicalPersistenceService.java | 6 +++--- .../persistence/service/TechnicalPersistenceServiceImpl.java | 2 +- .../persistence/service/TuttiPersistenceServiceLocator.java | 2 +- .../persistence/service/batch/TuttiCatchBatchValidator.java | 2 +- .../service/referential/GearPersistenceService.java | 1 + .../service/referential/LocationPersistenceService.java | 8 ++++---- .../service/referential/PersonPersistenceService.java | 1 + .../service/referential/SpeciesPersistenceService.java | 5 +++-- .../service/referential/VesselPersistenceService.java | 1 + .../service/referential/synchro/ReferentialUpdateTask.java | 7 +++---- .../synchro/TuttiReferentialSynchroServiceImpl.java | 9 +++++---- .../persistence/service/util/BatchPersistenceHelper.java | 4 ++-- .../tutti/persistence/service/util/BatchTreeHelper.java | 4 ++-- .../service/util/MeasurementPersistenceHelper.java | 2 +- .../persistence/service/util/SamplePersistenceHelper.java | 2 +- .../service/util/SynchronizationStatusHelper.java | 4 ++-- .../service/util/VesselPersonFeaturesPersistenceHelper.java | 2 +- .../fr/ifremer/tutti/persistence/test/DatabaseFixtures.java | 2 +- .../fr/ifremer/tutti/persistence/test/DatabaseResource.java | 2 +- .../fr/ifremer/tutti/persistence/test/TuttiRunListener.java | 2 +- .../java/fr/ifremer/tutti/persistence/test/TuttiRunner.java | 5 +++-- .../java/fr/ifremer/tutti/type/CoordinateEditorType.java | 4 ++-- .../src/main/java/fr/ifremer/tutti/type/WeightUnit.java | 4 ++-- .../src/main/java/fr/ifremer/tutti/util/Weights.java | 2 +- .../synchro/ReferentialSynchroTableMetadataTest.java | 2 +- .../tutti/persistence/config/TuttiPersistenceConfigTest.java | 2 +- .../persistence/entities/protocol/TuttiProtocolsTest.java | 2 +- .../service/AccidentalBatchPersistenceServiceReadTest.java | 2 +- .../service/AccidentalBatchPersistenceServiceWriteTest.java | 2 +- .../service/AttachmentPersistenceServiceWriteTest.java | 2 +- .../service/BenthosBatchPersistenceServiceReadTest.java | 2 +- .../service/BenthosBatchPersistenceServiceWriteTest.java | 2 +- .../service/CatchBatchPersistenceServiceReadTest.java | 2 +- .../service/CatchBatchPersistenceServiceWriteTest.java | 2 +- .../service/CruisePersistenceServiceReadTest.java | 2 +- .../service/CruisePersistenceServiceWriteTest.java | 2 +- .../FishingOperationPersistenceServiceAno4995Test.java | 4 ++-- .../service/FishingOperationPersistenceServiceReadTest.java | 2 +- .../service/FishingOperationPersistenceServiceWriteTest.java | 2 +- ...ndividualObservationBatchPersistenceServiceWriteTest.java | 2 +- .../service/MarineLitterBatchPersistenceServiceReadTest.java | 2 +- .../MarineLitterBatchPersistenceServiceWriteTest.java | 2 +- .../service/ProgramPersistenceServiceReadTest.java | 2 +- .../service/ProgramPersistenceServiceWriteTest.java | 2 +- .../service/ProtocolPersistenceServiceReadTest.java | 2 +- .../service/ProtocolPersistenceServiceWriteTest.java | 2 +- .../service/ReferentialPersistenceServiceWriteTest.java | 2 +- .../service/SpeciesBatchPersistenceServiceReadTest.java | 2 +- .../service/SpeciesBatchPersistenceServiceWriteTest.java | 2 +- .../java/fr/ifremer/tutti/service/AbstractTuttiService.java | 6 +++--- .../fr/ifremer/tutti/service/ClosedPersistenceService.java | 2 +- .../main/java/fr/ifremer/tutti/service/DecoratorService.java | 2 +- .../java/fr/ifremer/tutti/service/PersistenceService.java | 2 +- .../main/java/fr/ifremer/tutti/service/TuttiDataContext.java | 12 ++++++------ .../main/java/fr/ifremer/tutti/service/TuttiDecorator.java | 4 ++-- .../src/main/java/fr/ifremer/tutti/service/TuttiService.java | 8 ++++---- .../java/fr/ifremer/tutti/service/TuttiServiceContext.java | 4 ++-- .../fr/ifremer/tutti/service/TuttiValidationDataContext.java | 2 +- .../tutti/service/TuttiValidationDataContextSupport.java | 2 +- .../java/fr/ifremer/tutti/service/ValidationService.java | 2 +- .../fr/ifremer/tutti/service/bigfin/BigfinImportResult.java | 2 +- .../tutti/service/catches/TuttiWeightComputingException.java | 2 +- .../service/catches/ValidateCruiseOperationsService.java | 2 +- .../ifremer/tutti/service/catches/WeightCleaningService.java | 8 ++++---- .../tutti/service/catches/WeightComputingService.java | 2 +- .../catches/multipost/AbstractFishingOperationRow.java | 2 +- .../catches/multipost/AbstractFishingOperationRowModel.java | 2 +- .../tutti/service/catches/multipost/AccidentalCatchRow.java | 2 +- .../service/catches/multipost/AccidentalCatchRowModel.java | 2 +- .../tutti/service/catches/multipost/AttachmentRow.java | 2 +- .../tutti/service/catches/multipost/AttachmentRowModel.java | 2 +- .../tutti/service/catches/multipost/CaracteristicRow.java | 2 +- .../service/catches/multipost/CaracteristicRowModel.java | 2 +- .../tutti/service/catches/multipost/CatchFrequencyRow.java | 2 +- .../service/catches/multipost/CatchFrequencyRowModel.java | 2 +- .../fr/ifremer/tutti/service/catches/multipost/CatchRow.java | 2 +- .../tutti/service/catches/multipost/CatchRowModel.java | 2 +- .../tutti/service/catches/multipost/CatchWeightsRow.java | 2 +- .../service/catches/multipost/CatchWeightsRowModel.java | 2 +- .../tutti/service/catches/multipost/FishingOperationRow.java | 2 +- .../service/catches/multipost/FishingOperationRowModel.java | 2 +- .../service/catches/multipost/IndividualObservationRow.java | 2 +- .../catches/multipost/IndividualObservationRowModel.java | 2 +- .../tutti/service/catches/multipost/MarineLitterRow.java | 2 +- .../service/catches/multipost/MarineLitterRowModel.java | 2 +- .../service/catches/multipost/MarineLitterWeightRow.java | 2 +- .../catches/multipost/MarineLitterWeightRowModel.java | 2 +- .../service/catches/multipost/MultiPostExportService.java | 4 ++-- .../service/catches/multipost/MultiPostImportService.java | 2 +- .../tutti/service/csv/ForeignKeyListParserFormatter.java | 2 +- .../ifremer/tutti/service/csv/ForeignKeyParserFormatter.java | 2 +- .../main/java/fr/ifremer/tutti/service/csv/TuttiCsvUtil.java | 2 +- .../fr/ifremer/tutti/service/export/ExportCatchContext.java | 4 ++-- .../tutti/service/export/pdf/CatchesPdfExportService.java | 2 +- .../fr/ifremer/tutti/service/export/sumatra/CatchRow.java | 2 +- .../ifremer/tutti/service/export/sumatra/CatchRowModel.java | 2 +- .../service/export/sumatra/CatchesSumatraExportService.java | 2 +- .../tutti/service/export/sumatra/SumatraExportResult.java | 2 +- .../service/genericformat/GenericFormatExportService.java | 4 ++-- .../service/genericformat/csv/AccidentalCatchModel.java | 2 +- .../tutti/service/genericformat/csv/AccidentalCatchRow.java | 2 +- .../ifremer/tutti/service/genericformat/csv/CatchModel.java | 2 +- .../fr/ifremer/tutti/service/genericformat/csv/CatchRow.java | 2 +- .../service/genericformat/csv/ExportSampleCategory.java | 2 +- .../service/genericformat/csv/GearCaracteristicModel.java | 2 +- .../service/genericformat/csv/GearCaracteristicRow.java | 2 +- .../genericformat/csv/IndividualObservationModel.java | 2 +- .../service/genericformat/csv/IndividualObservationRow.java | 2 +- .../tutti/service/genericformat/csv/MarineLitterModel.java | 2 +- .../tutti/service/genericformat/csv/MarineLitterRow.java | 2 +- .../tutti/service/genericformat/csv/OperationModel.java | 2 +- .../tutti/service/genericformat/csv/OperationRow.java | 2 +- .../tutti/service/genericformat/csv/ParameterModel.java | 2 +- .../tutti/service/genericformat/csv/ParameterRow.java | 2 +- .../tutti/service/genericformat/csv/SpeciesExportModel.java | 2 +- .../tutti/service/genericformat/csv/SpeciesExportRow.java | 2 +- .../ifremer/tutti/service/genericformat/csv/SurveyModel.java | 2 +- .../ifremer/tutti/service/genericformat/csv/SurveyRow.java | 2 +- .../fr/ifremer/tutti/service/protocol/CaracteristicRow.java | 2 +- .../tutti/service/protocol/CaracteristicRowModel.java | 2 +- .../tutti/service/protocol/ProtocolImportExportService.java | 2 +- .../java/fr/ifremer/tutti/service/protocol/SpeciesRow.java | 2 +- .../fr/ifremer/tutti/service/protocol/SpeciesRowModel.java | 2 +- .../tutti/service/psionimport/PsionImportBatchModel.java | 2 +- .../ifremer/tutti/service/psionimport/PsionImportModel.java | 2 +- .../ifremer/tutti/service/psionimport/PsionImportResult.java | 2 +- .../tutti/service/psionimport/PsionImportService.java | 8 ++++---- .../java/fr/ifremer/tutti/service/pupitri/Directions.java | 2 +- .../ifremer/tutti/service/pupitri/PupitriImportResult.java | 4 ++-- .../ifremer/tutti/service/pupitri/PupitriImportService.java | 2 +- .../ifremer/tutti/service/pupitri/PupitriSpeciesContext.java | 2 +- .../main/java/fr/ifremer/tutti/service/pupitri/Signs.java | 2 +- .../fr/ifremer/tutti/service/pupitri/csv/CarrouselRow.java | 2 +- .../ifremer/tutti/service/pupitri/csv/CarrouselRowModel.java | 2 +- .../fr/ifremer/tutti/service/pupitri/csv/SpeciesRow.java | 2 +- .../ifremer/tutti/service/pupitri/csv/SpeciesRowModel.java | 2 +- .../java/fr/ifremer/tutti/service/pupitri/csv/TrunkRow.java | 2 +- .../fr/ifremer/tutti/service/pupitri/csv/TrunkRowModel.java | 2 +- .../referential/TuttiReferentialSynchronizeService.java | 2 +- .../fr/ifremer/tutti/service/referential/csv/GearModel.java | 2 +- .../ifremer/tutti/service/referential/csv/PersonModel.java | 2 +- .../ifremer/tutti/service/referential/csv/SpeciesModel.java | 2 +- .../ifremer/tutti/service/referential/csv/VesselModel.java | 2 +- .../java/fr/ifremer/tutti/service/AbstractServiceTest.java | 2 +- .../fr/ifremer/tutti/service/BeanValidatorDetectorTest.java | 2 +- .../java/fr/ifremer/tutti/service/DecoratorServiceTest.java | 2 +- .../java/fr/ifremer/tutti/service/ServiceDbResource.java | 2 +- .../java/fr/ifremer/tutti/service/ValidationServiceTest.java | 2 +- .../tutti/service/catches/WeightComputingServiceTest.java | 2 +- .../catches/multipost/MultiPostExportServiceTest.java | 2 +- .../service/export/pdf/CatchesPdfExportServiceTest.java | 2 +- .../export/sumatra/CatchesSumatraExportServiceTest.java | 2 +- .../genericformat/GenericFormatExportServiceTest.java | 2 +- .../service/protocol/ProtocolImportExportServiceTest.java | 2 +- .../tutti/service/psionimport/PsionImportServiceTest.java | 2 +- .../service/pupitri/PupitriImportServiceAno3898Test.java | 2 +- .../service/pupitri/PupitriImportServiceAno5032Test.java | 2 +- .../service/pupitri/PupitriImportServiceAno5079Test.java | 2 +- .../service/pupitri/PupitriImportServiceEvo5060Test.java | 2 +- .../service/pupitri/PupitriImportServiceEvo5062Test.java | 2 +- .../tutti/service/pupitri/PupitriImportServiceTest.java | 2 +- .../referential/ReferentialTemporaryExportServiceTest.java | 2 +- .../src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java | 2 +- .../java/fr/ifremer/tutti/ui/swing/TuttiActionFactory.java | 2 +- .../main/java/fr/ifremer/tutti/ui/swing/TuttiHelpBroker.java | 2 +- .../src/main/java/fr/ifremer/tutti/ui/swing/TuttiScreen.java | 2 +- .../main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 2 +- .../fr/ifremer/tutti/ui/swing/content/MainUIHandler.java | 2 +- .../ui/swing/content/actions/AbstractChangeLocaleAction.java | 2 +- .../ui/swing/content/actions/AbstractChangeScreenAction.java | 6 +++--- .../ui/swing/content/actions/AbstractMainUITuttiAction.java | 2 +- .../ui/swing/content/actions/ChangeToLocaleFRAction.java | 2 +- .../ui/swing/content/actions/ChangeToLocaleUKAction.java | 2 +- .../ui/swing/content/actions/CloseApplicationAction.java | 2 +- .../ui/swing/content/actions/ConnectIchtyometerAction.java | 4 ++-- .../swing/content/actions/DisconnectIchtyometerAction.java | 4 ++-- .../content/actions/EditCatchesForSelectedCruiseAction.java | 2 +- .../ui/swing/content/actions/EditSelectedCruiseAction.java | 2 +- .../ui/swing/content/actions/EditSelectedProgramAction.java | 2 +- .../ui/swing/content/actions/EditSelectedProtocolAction.java | 2 +- .../ui/swing/content/actions/GoToPreviousScreenAction.java | 2 +- .../tutti/ui/swing/content/actions/OpenDbScreenAction.java | 2 +- .../tutti/ui/swing/content/actions/OpenHomeScreenAction.java | 2 +- .../ui/swing/content/actions/OpenReportScreenAction.java | 2 +- .../content/actions/OpenSampleCategoryModelScreenAction.java | 2 +- .../actions/OpenTemporaryReferentialScreenAction.java | 2 +- .../tutti/ui/swing/content/actions/ShowAboutAction.java | 2 +- .../tutti/ui/swing/content/actions/ShowConfigAction.java | 2 +- .../ifremer/tutti/ui/swing/content/actions/StartAction.java | 4 ++-- .../swing/content/actions/ValidateSelectedCruiseAction.java | 2 +- .../content/category/EditSampleCategoryModelTableModel.java | 2 +- .../content/category/EditSampleCategoryModelUIHandler.java | 2 +- .../content/category/EditSampleCategoryModelUIModel.java | 2 +- .../category/actions/SaveSampleCategoryModelAction.java | 2 +- .../tutti/ui/swing/content/config/TuttiConfigUIHandler.java | 2 +- .../ui/swing/content/config/actions/ReloadTuttiAction.java | 2 +- .../tutti/ui/swing/content/cruise/EditCruiseUIHandler.java | 2 +- .../tutti/ui/swing/content/cruise/EditCruiseUIModel.java | 2 +- .../content/cruise/GearCaracteristicsEditorRowModel.java | 2 +- .../content/cruise/GearCaracteristicsEditorTableModel.java | 2 +- .../content/cruise/GearCaracteristicsEditorUIHandler.java | 2 +- .../content/cruise/GearCaracteristicsEditorUIModel.java | 2 +- .../tutti/ui/swing/content/cruise/VesselTypeEnum.java | 2 +- .../content/cruise/actions/EditGearCaracteristicsAction.java | 2 +- .../ui/swing/content/cruise/actions/SaveCruiseAction.java | 2 +- .../content/cruise/actions/ViewGearCaracteristicsAction.java | 2 +- .../tutti/ui/swing/content/db/DbManagerUIHandler.java | 2 +- .../tutti/ui/swing/content/db/actions/CloseDbAction.java | 2 +- .../ui/swing/content/db/actions/ExportAndCleanDbAction.java | 2 +- .../tutti/ui/swing/content/db/actions/ExportDbAction.java | 2 +- .../tutti/ui/swing/content/db/actions/ImportDbAction.java | 2 +- .../swing/content/db/actions/ImportOrReimportDbAction.java | 2 +- .../tutti/ui/swing/content/db/actions/InstallDbAction.java | 2 +- .../swing/content/db/actions/InstallOrReinstallDbAction.java | 2 +- .../tutti/ui/swing/content/db/actions/OpenDbAction.java | 2 +- .../tutti/ui/swing/content/db/actions/ReimportDbAction.java | 2 +- .../tutti/ui/swing/content/db/actions/ReinstallDbAction.java | 2 +- .../tutti/ui/swing/content/db/actions/UpdateDbAction.java | 2 +- .../tutti/ui/swing/content/home/SelectCruiseUIHandler.java | 2 +- .../tutti/ui/swing/content/home/SelectCruiseUIModel.java | 2 +- .../ui/swing/content/home/actions/CloneProtocolAction.java | 2 +- .../ui/swing/content/home/actions/DeleteProtocolAction.java | 2 +- .../ui/swing/content/home/actions/EditCatchesAction.java | 2 +- .../ui/swing/content/home/actions/EditCruiseAction.java | 2 +- .../ui/swing/content/home/actions/EditProgramAction.java | 2 +- .../ui/swing/content/home/actions/EditProtocolAction.java | 2 +- .../content/home/actions/ExportCruiseForSumatraAction.java | 2 +- .../ui/swing/content/home/actions/ExportProtocolAction.java | 2 +- .../ui/swing/content/home/actions/ImportProtocolAction.java | 2 +- .../tutti/ui/swing/content/home/actions/NewCruiseAction.java | 2 +- .../ui/swing/content/home/actions/NewProgramAction.java | 2 +- .../ui/swing/content/home/actions/NewProtocolAction.java | 2 +- .../swing/content/home/actions/SendCruiseReportAction.java | 2 +- .../home/actions/SpeciesToConfirmReportForCruiseAction.java | 2 +- .../ui/swing/content/home/actions/ValidateCatchesAction.java | 2 +- .../content/operation/EditFishingOperationUIHandler.java | 2 +- .../swing/content/operation/EditFishingOperationUIModel.java | 2 +- .../swing/content/operation/FishingOperationsUIHandler.java | 2 +- .../ui/swing/content/operation/FishingOperationsUIModel.java | 12 ++++++------ .../ui/swing/content/operation/SecondaryVesselTypeEnum.java | 2 +- .../operation/catches/AbstractTuttiBatchTableUIHandler.java | 4 ++-- .../content/operation/catches/AbstractTuttiBatchUIModel.java | 2 +- .../content/operation/catches/EditCatchesUIHandler.java | 2 +- .../swing/content/operation/catches/EditCatchesUIModel.java | 6 +++--- .../operation/catches/FrequencyConfigurationMode.java | 2 +- .../swing/content/operation/catches/SampleCategoryAble.java | 2 +- .../operation/catches/SampleCategoryColumnIdentifier.java | 2 +- .../content/operation/catches/SampleCategoryComponent.java | 6 +++--- .../content/operation/catches/SelectedCategoryAble.java | 2 +- .../content/operation/catches/SpeciesAbleBatchRowHelper.java | 2 +- .../content/operation/catches/SpeciesBatchDecorator.java | 2 +- .../operation/catches/SpeciesBatchDecoratorComparator.java | 6 +++--- .../ui/swing/content/operation/catches/SpeciesSortMode.java | 2 +- .../content/operation/catches/SpeciesSortableRowModel.java | 2 +- .../ui/swing/content/operation/catches/TableViewMode.java | 2 +- .../catches/accidental/AccidentalBatchRowModel.java | 2 +- .../catches/accidental/AccidentalBatchTableModel.java | 2 +- .../catches/accidental/AccidentalBatchUIHandler.java | 2 +- .../operation/catches/accidental/AccidentalBatchUIModel.java | 2 +- .../accidental/actions/ExportMultiPostAccidentalAction.java | 2 +- .../accidental/actions/ImportMultiPostAccidentalAction.java | 2 +- .../accidental/actions/RemoveAccidentalBatchAction.java | 2 +- .../accidental/create/CreateAccidentalBatchUIHandler.java | 2 +- .../accidental/create/CreateAccidentalBatchUIModel.java | 2 +- .../catches/actions/CancelEditCatchBatchAction.java | 2 +- .../operation/catches/actions/CleanBatchWeightsAction.java | 4 ++-- .../operation/catches/actions/ComputeBatchWeightsAction.java | 2 +- .../actions/ExportFishingOperationForSumatraAction.java | 2 +- .../catches/actions/ExportFishingOperationReportAction.java | 2 +- .../catches/actions/ExportMultiPostActionSupport.java | 2 +- .../catches/actions/ImportMultiPostActionSupport.java | 2 +- .../operation/catches/actions/SaveCatchBatchAction.java | 2 +- .../operation/catches/benthos/BenthosBatchRowModel.java | 2 +- .../operation/catches/benthos/BenthosBatchTableModel.java | 2 +- .../operation/catches/benthos/BenthosBatchUIHandler.java | 2 +- .../operation/catches/benthos/BenthosBatchUIModel.java | 2 +- .../catches/benthos/actions/CreateBenthosMelagAction.java | 2 +- .../benthos/actions/ExportMultiPostBenthosAction.java | 2 +- .../benthos/actions/ImportMultiPostBenthosAction.java | 2 +- .../catches/benthos/actions/RemoveBenthosBatchAction.java | 2 +- .../catches/benthos/actions/RemoveBenthosSubBatchAction.java | 2 +- .../catches/benthos/actions/RenameBenthosBatchAction.java | 2 +- .../catches/benthos/create/CreateBenthosBatchUIHandler.java | 2 +- .../catches/benthos/create/CreateBenthosBatchUIModel.java | 2 +- .../create/actions/SelectSpeciesForBenthosBatchAction.java | 2 +- .../benthos/frequency/BenthosFrequencyCellComponent.java | 2 +- .../catches/benthos/frequency/BenthosFrequencyRowModel.java | 2 +- .../benthos/frequency/BenthosFrequencyTableModel.java | 2 +- .../catches/benthos/frequency/BenthosFrequencyUIHandler.java | 2 +- .../catches/benthos/frequency/BenthosFrequencyUIModel.java | 2 +- .../catches/benthos/split/SplitBenthosBatchRowModel.java | 2 +- .../catches/benthos/split/SplitBenthosBatchTableModel.java | 2 +- .../catches/benthos/split/SplitBenthosBatchUIHandler.java | 2 +- .../catches/benthos/split/SplitBenthosBatchUIModel.java | 2 +- .../IndividualObservationBatchRowModel.java | 2 +- .../IndividualObservationBatchTableModel.java | 2 +- .../IndividualObservationBatchUIHandler.java | 2 +- .../IndividualObservationBatchUIModel.java | 2 +- .../actions/ExportMultiPostIndividualObservationAction.java | 2 +- .../actions/ImportMultiPostIndividualObservationAction.java | 2 +- .../actions/RemoveAllIndividualObservationBatchAction.java | 2 +- .../actions/RemoveIndividualObservationBatchAction.java | 2 +- .../SelectSpeciesForIndividualObservationBatchAction.java | 2 +- .../create/CreateIndividualObservationBatchUIHandler.java | 2 +- .../create/CreateIndividualObservationBatchUIModel.java | 4 ++-- .../catches/marinelitter/MarineLitterBatchRowModel.java | 2 +- .../catches/marinelitter/MarineLitterBatchTableModel.java | 2 +- .../catches/marinelitter/MarineLitterBatchUIHandler.java | 2 +- .../catches/marinelitter/MarineLitterBatchUIModel.java | 2 +- .../actions/ExportMultiPostMarineLitterAction.java | 2 +- .../actions/ImportMultiPostMarineLitterAction.java | 2 +- .../marinelitter/actions/RemoveMarineLitterBatchAction.java | 2 +- .../create/CreateMarineLitterBatchUIHandler.java | 2 +- .../marinelitter/create/CreateMarineLitterBatchUIModel.java | 2 +- .../species/ImportPupitriMelagWeightPopupUIHandler.java | 2 +- .../catches/species/ImportPupitriPopupUIHandler.java | 4 ++-- .../operation/catches/species/SpeciesBatchRowModel.java | 2 +- .../operation/catches/species/SpeciesBatchTableModel.java | 2 +- .../operation/catches/species/SpeciesBatchUIHandler.java | 2 +- .../operation/catches/species/SpeciesBatchUIModel.java | 2 +- .../catches/species/actions/CreateSpeciesMelagAction.java | 2 +- .../species/actions/ExportMultiPostSpeciesAction.java | 2 +- .../catches/species/actions/ImportBigfinAction.java | 2 +- .../species/actions/ImportMultiPostSpeciesAction.java | 2 +- .../operation/catches/species/actions/ImportPsionAction.java | 2 +- .../catches/species/actions/ImportPupitriAction.java | 2 +- .../catches/species/actions/RemoveSpeciesBatchAction.java | 2 +- .../catches/species/actions/RemoveSpeciesSubBatchAction.java | 2 +- .../catches/species/actions/RenameSpeciesBatchAction.java | 2 +- .../catches/species/create/CreateSpeciesBatchUIHandler.java | 2 +- .../catches/species/create/CreateSpeciesBatchUIModel.java | 2 +- .../create/actions/SelectSpeciesForSpeciesBatchAction.java | 2 +- .../species/frequency/SpeciesFrequencyCellComponent.java | 2 +- .../catches/species/frequency/SpeciesFrequencyRowModel.java | 2 +- .../species/frequency/SpeciesFrequencyTableModel.java | 2 +- .../catches/species/frequency/SpeciesFrequencyUIHandler.java | 2 +- .../catches/species/frequency/SpeciesFrequencyUIModel.java | 2 +- .../catches/species/split/SplitSpeciesBatchRowModel.java | 2 +- .../catches/species/split/SplitSpeciesBatchTableModel.java | 2 +- .../catches/species/split/SplitSpeciesBatchUIHandler.java | 2 +- .../catches/species/split/SplitSpeciesBatchUIModel.java | 2 +- .../operation/fishing/AbstractCaracteristicRowModel.java | 2 +- .../operation/fishing/AbstractCaracteristicTabUIHandler.java | 2 +- .../operation/fishing/AbstractCaracteristicTabUIModel.java | 2 +- .../content/operation/fishing/GearUseFeatureRowModel.java | 2 +- .../content/operation/fishing/VesselUseFeatureRowModel.java | 2 +- .../fishing/actions/CancelEditFishingOperationAction.java | 2 +- .../fishing/actions/DeleteFishingOperationAction.java | 2 +- .../fishing/actions/EditFishingOperationAction.java | 6 +++--- .../operation/fishing/actions/NewFishingOperationAction.java | 2 +- .../fishing/actions/SaveFishingOperationAction.java | 2 +- .../tutti/ui/swing/content/program/EditProgramUIHandler.java | 2 +- .../tutti/ui/swing/content/program/EditProgramUIModel.java | 2 +- .../ui/swing/content/program/actions/SaveProgramAction.java | 4 ++-- .../ui/swing/content/protocol/EditProtocolUIHandler.java | 2 +- .../tutti/ui/swing/content/protocol/EditProtocolUIModel.java | 2 +- .../protocol/MandatorySampleCategoryColumnIdentifier.java | 2 +- .../content/protocol/actions/AddBenthosProtocolAction.java | 2 +- .../protocol/actions/AddCaracteristicMappingAction.java | 2 +- .../content/protocol/actions/AddSpeciesProtocolAction.java | 2 +- .../protocol/actions/ExportAllCaracteristicAction.java | 2 +- .../protocol/actions/ExportProtocolBenthosAction.java | 2 +- .../protocol/actions/ExportProtocolCaracteristicAction.java | 2 +- .../protocol/actions/ExportProtocolSpeciesAction.java | 2 +- .../swing/content/protocol/actions/ExportPupitriAction.java | 2 +- .../protocol/actions/ImportProtocolBenthosAction.java | 2 +- .../protocol/actions/ImportProtocolCaracteristicAction.java | 2 +- .../protocol/actions/ImportProtocolSpeciesAction.java | 2 +- .../protocol/actions/RemoveBenthosProtocolAction.java | 2 +- .../protocol/actions/RemoveSpeciesProtocolAction.java | 2 +- .../swing/content/protocol/actions/SaveProtocolAction.java | 2 +- .../content/protocol/actions/SelectOtherBenthosAction.java | 2 +- .../content/protocol/actions/SelectOtherSpeciesAction.java | 2 +- .../referential/ManageTemporaryReferentialUIHandler.java | 2 +- .../actions/ExportExistingTemporaryGearAction.java | 2 +- .../actions/ExportExistingTemporaryPersonAction.java | 2 +- .../actions/ExportExistingTemporarySpeciesAction.java | 2 +- .../actions/ExportExistingTemporaryVesselAction.java | 2 +- .../actions/ExportTemporaryGearExampleAction.java | 2 +- .../actions/ExportTemporaryPersonExampleAction.java | 2 +- .../actions/ExportTemporarySpeciesExampleAction.java | 2 +- .../actions/ExportTemporaryVesselExampleAction.java | 2 +- .../referential/actions/ImportTemporaryGearAction.java | 2 +- .../referential/actions/ImportTemporaryPersonAction.java | 2 +- .../referential/actions/ImportTemporarySpeciesAction.java | 2 +- .../referential/actions/ImportTemporaryVesselAction.java | 2 +- .../tutti/ui/swing/content/report/ReportUIHandler.java | 2 +- .../ifremer/tutti/ui/swing/content/report/ReportUIModel.java | 2 +- .../swing/content/report/actions/GenerateReportAction.java | 2 +- .../ui/swing/content/validation/ValidateCruiseUIHandler.java | 2 +- .../ui/swing/content/validation/ValidateCruiseUIModel.java | 2 +- .../validation/actions/EditCruiseInValidationUIAction.java | 2 +- .../actions/EditFishingOperationInValidationUIAction.java | 4 ++-- .../actions/ExportCruiseValidationMessagesAction.java | 2 +- .../actions/ExportOperationValidationMessagesAction.java | 2 +- .../validation/actions/SaveCruiseToReadyToSynchAction.java | 2 +- .../tutti/ui/swing/update/TuttiDbUpdaterCallBack.java | 2 +- .../ui/swing/update/actions/UpdateApplicationAction.java | 2 +- .../tutti/ui/swing/update/actions/UpdateReportAction.java | 2 +- .../tutti/ui/swing/util/AbstractTuttiBeanUIModel.java | 2 +- .../ui/swing/util/AbstractTuttiTabContainerUIHandler.java | 2 +- .../ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java | 2 +- .../ui/swing/util/RemoveablePropertyChangeListener.java | 4 ++-- .../fr/ifremer/tutti/ui/swing/util/TuttiBeanMonitor.java | 2 +- .../ifremer/tutti/ui/swing/util/TuttiExceptionHandler.java | 6 +++--- .../main/java/fr/ifremer/tutti/ui/swing/util/TuttiUI.java | 2 +- .../java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 2 +- .../fr/ifremer/tutti/ui/swing/util/UIMessageNotifier.java | 2 +- .../tutti/ui/swing/util/actions/LongActionSupport.java | 2 +- .../tutti/ui/swing/util/attachment/AttachmentCellEditor.java | 4 ++-- .../ui/swing/util/attachment/AttachmentCellRenderer.java | 4 ++-- .../ui/swing/util/attachment/AttachmentEditorUIHandler.java | 4 ++-- .../tutti/ui/swing/util/attachment/AttachmentModelAware.java | 2 +- .../tutti/ui/swing/util/attachment/ButtonAttachment.java | 2 +- .../swing/util/attachment/actions/SaveAttachmentAction.java | 2 +- .../ifremer/tutti/ui/swing/util/auth/AuthenticationInfo.java | 2 +- .../fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java | 2 +- .../util/caracteristics/CaracteristicMapCellComponent.java | 2 +- .../util/caracteristics/CaracteristicMapColumnRowModel.java | 2 +- .../util/caracteristics/CaracteristicMapColumnUIHandler.java | 2 +- .../util/caracteristics/CaracteristicMapEditorRowModel.java | 2 +- .../caracteristics/CaracteristicMapEditorTableModel.java | 2 +- .../util/caracteristics/CaracteristicMapEditorUIHandler.java | 2 +- .../util/caracteristics/CaracteristicMapEditorUIModel.java | 2 +- .../swing/util/caracteristics/CaracteristicValueEditor.java | 2 +- .../util/caracteristics/CaracteristicValueRenderer.java | 2 +- .../caracteristics/GearCaracteristicListCellRenderer.java | 2 +- .../tutti/ui/swing/util/catches/EnterWeightUIHandler.java | 2 +- .../ifremer/tutti/ui/swing/util/comment/ButtonComment.java | 2 +- .../tutti/ui/swing/util/comment/CommentCellEditor.java | 2 +- .../tutti/ui/swing/util/comment/CommentCellRenderer.java | 2 +- .../tutti/ui/swing/util/comment/CommentEditorUIHandler.java | 2 +- .../tutti/ui/swing/util/computable/ComputableData.java | 2 +- .../swing/util/computable/ComputableDataEditorHandler.java | 2 +- .../ui/swing/util/computable/ComputableDataTableCell.java | 2 +- .../tutti/ui/swing/util/editor/TuttiLocationTableCell.java | 2 +- .../ifremer/tutti/ui/swing/util/editor/VesselTableCell.java | 2 +- .../ui/swing/util/species/EnterMelagWeightUIHandler.java | 2 +- .../tutti/ui/swing/util/species/SelectSpeciesUIHandler.java | 2 +- .../tutti/ui/swing/util/species/SelectSpeciesUIModel.java | 2 +- .../ui/swing/util/table/AbstractTuttiTableUIHandler.java | 4 ++-- .../tutti/ui/swing/util/table/AbstractTuttiTableUIModel.java | 2 +- .../ui/swing/util/table/CaracteristicColumnIdentifier.java | 2 +- .../ifremer/tutti/ui/swing/util/table/CaracteristicRow.java | 2 +- .../fr/ifremer/tutti/ui/swing/BeanValidatorDetectorTest.java | 2 +- .../species/frequency/SpeciesFrequencyRowModelTest.java | 2 +- 513 files changed, 614 insertions(+), 613 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/7063 updated (906fd36 -> 2fe7b6b)
by codelutin.com scm 18 Jan '16

18 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/7063 in repository tutti. See http://git.codelutin.com/tutti.git discards 906fd36 correction de la lecture des voix (fixes #7063) discards cf2c730 ajout de la lecture des nombres mais il reste un problème de lecture de certains nombres (2000 cm par exemple, mais je ne sais pas pourquoi) (refs #7063) discards 9796769 ajout de la tonalité nulle dans la conf (refs #7063) discards 6b2b50e joue un bip à la réception d'une donnée de l'ychtiomètre et 3 bips différents en cas d'erreur (refs #7063) discards 63fdb96 génération et lecture de bips + ajout d'une option pour configurer la tonalité du bip à jouer (refs #7063) adds c96516d Nettoyage de la javadoc (See #7898) adds cb6308c Merge branch 'feature/7898' into develop adds c4f59f4 génération et lecture de bips + ajout d'une option pour configurer la tonalité du bip à jouer (refs #7063) adds 0dabe36 joue un bip à la réception d'une donnée de l'ychtiomètre et 3 bips différents en cas d'erreur (refs #7063) adds 0e18d57 ajout de la tonalité nulle dans la conf (refs #7063) adds 2a274cc ajout de la lecture des nombres mais il reste un problème de lecture de certains nombres (2000 cm par exemple, mais je ne sais pas pourquoi) (refs #7063) adds 2fe7b6b correction de la lecture des voix (fixes #7063) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (906fd36) \ N -- N -- N refs/heads/feature/7063 (2fe7b6b) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. No new revisions were added by this update. Summary of changes: .../java/fr/ifremer/tutti/ichtyometer/IchtyometerClient.java | 4 ++-- .../tutti/ichtyometer/LocalDeviceNotFoundException.java | 4 ++-- .../fr/ifremer/tutti/ichtyometer/RemoteDeviceChooser.java | 2 +- .../tutti/ichtyometer/RemoteDeviceNotFoundException.java | 4 ++-- .../ichtyometer/RemoteDeviceServiceNotFoundException.java | 4 ++-- .../java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java | 4 ++-- .../tutti/ichtyometer/feed/event/FeedReaderEvent.java | 2 +- .../tutti/ichtyometer/feed/event/FeedReaderListener.java | 4 ++-- .../fr/ifremer/tutti/ichtyometer/interactive/Command.java | 2 +- .../ifremer/tutti/ichtyometer/interactive/CommandEngine.java | 4 ++-- .../ichtyometer/interactive/IchtyometerCommandException.java | 2 +- .../fr/ifremer/tutti/ichtyometer/tool/FeedReaderTool.java | 2 +- .../fr/ifremer/tutti/ichtyometer/tool/SendCommandTool.java | 2 +- .../fr/ifremer/tutti/ichtyometer/IchtyometerClientTest.java | 4 ++-- .../fr/ifremer/tutti/ichtyometer/feed/FeedReaderTest.java | 2 +- .../tutti/ichtyometer/interactive/CommandEngineTest.java | 2 +- .../src/main/java/fr/ifremer/tutti/LabelAware.java | 2 +- .../src/main/java/fr/ifremer/tutti/TuttiConfiguration.java | 2 +- .../main/java/fr/ifremer/tutti/TuttiConfigurationOption.java | 4 ++-- .../java/fr/ifremer/tutti/TuttiConfigurationProvider.java | 2 +- .../tutti/persistence/InvalidBatchModelException.java | 2 +- .../java/fr/ifremer/tutti/persistence/ProgressionModel.java | 2 +- .../fr/ifremer/tutti/persistence/RessourceClassLoader.java | 2 +- .../java/fr/ifremer/tutti/persistence/TuttiPersistence.java | 2 +- .../fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java | 2 +- .../ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java | 2 +- .../persistence/TuttiPersistenceServiceImplementor.java | 2 +- .../persistence/dao/GearPhysicalFeaturesDaoImplTutti.java | 5 +---- .../tutti/persistence/dao/GearPhysicalFeaturesDaoTutti.java | 2 +- .../ifremer/tutti/persistence/entities/CaracteristicMap.java | 2 +- .../fr/ifremer/tutti/persistence/entities/TuttiEntities.java | 2 +- .../fr/ifremer/tutti/persistence/entities/TuttiEntity.java | 2 +- .../ifremer/tutti/persistence/entities/TuttiEntityBean.java | 2 +- .../ifremer/tutti/persistence/entities/TuttiEnumerable.java | 2 +- .../tutti/persistence/entities/data/BatchContainer.java | 2 +- .../tutti/persistence/entities/data/SampleCategory.java | 2 +- .../tutti/persistence/entities/data/SampleCategoryModel.java | 2 +- .../entities/data/SampleCategoryModelConverter.java | 4 ++-- .../persistence/entities/data/SampleCategoryModelEntry.java | 4 ++-- .../persistence/entities/protocol/CaracteristicType.java | 2 +- .../tutti/persistence/entities/protocol/TuttiProtocols.java | 2 +- .../persistence/entities/protocol/v1/SpeciesProtocol1.java | 2 +- .../entities/protocol/v1/SpeciesProtocolBean1.java | 2 +- .../persistence/entities/protocol/v1/TuttiProtocol1.java | 2 +- .../persistence/entities/protocol/v1/TuttiProtocolBean1.java | 2 +- .../persistence/service/AbstractPersistenceService.java | 8 +++++--- .../service/AccidentalBatchPersistenceService.java | 2 +- .../service/AccidentalBatchPersistenceServiceImpl.java | 2 +- .../persistence/service/AttachmentPersistenceService.java | 2 +- .../service/AttachmentPersistenceServiceImpl.java | 2 +- .../persistence/service/BenthosBatchPersistenceService.java | 6 +++--- .../service/BenthosBatchPersistenceServiceImpl.java | 2 +- .../tutti/persistence/service/CruisePersistenceService.java | 2 +- .../persistence/service/CruisePersistenceServiceImpl.java | 2 +- .../service/FishingOperationPersistenceService.java | 2 +- .../service/FishingOperationPersistenceServiceImpl.java | 11 ++++------- .../IndividualObservationBatchPersistenceService.java | 2 +- .../IndividualObservationBatchPersistenceServiceImpl.java | 2 +- .../service/MarineLitterBatchPersistenceService.java | 4 ++-- .../service/MarineLitterBatchPersistenceServiceImpl.java | 2 +- .../tutti/persistence/service/ProgramPersistenceService.java | 6 +++--- .../persistence/service/ProgramPersistenceServiceImpl.java | 2 +- .../persistence/service/ProtocolPersistenceService.java | 2 +- .../persistence/service/ProtocolPersistenceServiceImpl.java | 2 +- .../persistence/service/SpeciesBatchPersistenceService.java | 6 +++--- .../service/SpeciesBatchPersistenceServiceImpl.java | 2 +- .../persistence/service/TechnicalPersistenceService.java | 6 +++--- .../persistence/service/TechnicalPersistenceServiceImpl.java | 2 +- .../persistence/service/TuttiPersistenceServiceLocator.java | 2 +- .../persistence/service/batch/TuttiCatchBatchValidator.java | 2 +- .../service/referential/GearPersistenceService.java | 1 + .../service/referential/LocationPersistenceService.java | 8 ++++---- .../service/referential/PersonPersistenceService.java | 1 + .../service/referential/SpeciesPersistenceService.java | 5 +++-- .../service/referential/VesselPersistenceService.java | 1 + .../service/referential/synchro/ReferentialUpdateTask.java | 7 +++---- .../synchro/TuttiReferentialSynchroServiceImpl.java | 9 +++++---- .../persistence/service/util/BatchPersistenceHelper.java | 4 ++-- .../tutti/persistence/service/util/BatchTreeHelper.java | 4 ++-- .../service/util/MeasurementPersistenceHelper.java | 2 +- .../persistence/service/util/SamplePersistenceHelper.java | 2 +- .../service/util/SynchronizationStatusHelper.java | 4 ++-- .../service/util/VesselPersonFeaturesPersistenceHelper.java | 2 +- .../fr/ifremer/tutti/persistence/test/DatabaseFixtures.java | 2 +- .../fr/ifremer/tutti/persistence/test/DatabaseResource.java | 2 +- .../fr/ifremer/tutti/persistence/test/TuttiRunListener.java | 2 +- .../java/fr/ifremer/tutti/persistence/test/TuttiRunner.java | 5 +++-- .../java/fr/ifremer/tutti/type/CoordinateEditorType.java | 4 ++-- .../src/main/java/fr/ifremer/tutti/type/WeightUnit.java | 4 ++-- .../src/main/java/fr/ifremer/tutti/util/Weights.java | 2 +- .../synchro/ReferentialSynchroTableMetadataTest.java | 2 +- .../tutti/persistence/config/TuttiPersistenceConfigTest.java | 2 +- .../persistence/entities/protocol/TuttiProtocolsTest.java | 2 +- .../service/AccidentalBatchPersistenceServiceReadTest.java | 2 +- .../service/AccidentalBatchPersistenceServiceWriteTest.java | 2 +- .../service/AttachmentPersistenceServiceWriteTest.java | 2 +- .../service/BenthosBatchPersistenceServiceReadTest.java | 2 +- .../service/BenthosBatchPersistenceServiceWriteTest.java | 2 +- .../service/CatchBatchPersistenceServiceReadTest.java | 2 +- .../service/CatchBatchPersistenceServiceWriteTest.java | 2 +- .../service/CruisePersistenceServiceReadTest.java | 2 +- .../service/CruisePersistenceServiceWriteTest.java | 2 +- .../FishingOperationPersistenceServiceAno4995Test.java | 4 ++-- .../service/FishingOperationPersistenceServiceReadTest.java | 2 +- .../service/FishingOperationPersistenceServiceWriteTest.java | 2 +- ...ndividualObservationBatchPersistenceServiceWriteTest.java | 2 +- .../service/MarineLitterBatchPersistenceServiceReadTest.java | 2 +- .../MarineLitterBatchPersistenceServiceWriteTest.java | 2 +- .../service/ProgramPersistenceServiceReadTest.java | 2 +- .../service/ProgramPersistenceServiceWriteTest.java | 2 +- .../service/ProtocolPersistenceServiceReadTest.java | 2 +- .../service/ProtocolPersistenceServiceWriteTest.java | 2 +- .../service/ReferentialPersistenceServiceWriteTest.java | 2 +- .../service/SpeciesBatchPersistenceServiceReadTest.java | 2 +- .../service/SpeciesBatchPersistenceServiceWriteTest.java | 2 +- .../java/fr/ifremer/tutti/service/AbstractTuttiService.java | 6 +++--- .../fr/ifremer/tutti/service/ClosedPersistenceService.java | 2 +- .../main/java/fr/ifremer/tutti/service/DecoratorService.java | 2 +- .../java/fr/ifremer/tutti/service/PersistenceService.java | 2 +- .../main/java/fr/ifremer/tutti/service/TuttiDataContext.java | 12 ++++++------ .../main/java/fr/ifremer/tutti/service/TuttiDecorator.java | 4 ++-- .../src/main/java/fr/ifremer/tutti/service/TuttiService.java | 8 ++++---- .../java/fr/ifremer/tutti/service/TuttiServiceContext.java | 4 ++-- .../fr/ifremer/tutti/service/TuttiValidationDataContext.java | 2 +- .../tutti/service/TuttiValidationDataContextSupport.java | 2 +- .../java/fr/ifremer/tutti/service/ValidationService.java | 2 +- .../fr/ifremer/tutti/service/bigfin/BigfinImportResult.java | 2 +- .../tutti/service/catches/TuttiWeightComputingException.java | 2 +- .../service/catches/ValidateCruiseOperationsService.java | 2 +- .../ifremer/tutti/service/catches/WeightCleaningService.java | 8 ++++---- .../tutti/service/catches/WeightComputingService.java | 2 +- .../catches/multipost/AbstractFishingOperationRow.java | 2 +- .../catches/multipost/AbstractFishingOperationRowModel.java | 2 +- .../tutti/service/catches/multipost/AccidentalCatchRow.java | 2 +- .../service/catches/multipost/AccidentalCatchRowModel.java | 2 +- .../tutti/service/catches/multipost/AttachmentRow.java | 2 +- .../tutti/service/catches/multipost/AttachmentRowModel.java | 2 +- .../tutti/service/catches/multipost/CaracteristicRow.java | 2 +- .../service/catches/multipost/CaracteristicRowModel.java | 2 +- .../tutti/service/catches/multipost/CatchFrequencyRow.java | 2 +- .../service/catches/multipost/CatchFrequencyRowModel.java | 2 +- .../fr/ifremer/tutti/service/catches/multipost/CatchRow.java | 2 +- .../tutti/service/catches/multipost/CatchRowModel.java | 2 +- .../tutti/service/catches/multipost/CatchWeightsRow.java | 2 +- .../service/catches/multipost/CatchWeightsRowModel.java | 2 +- .../tutti/service/catches/multipost/FishingOperationRow.java | 2 +- .../service/catches/multipost/FishingOperationRowModel.java | 2 +- .../service/catches/multipost/IndividualObservationRow.java | 2 +- .../catches/multipost/IndividualObservationRowModel.java | 2 +- .../tutti/service/catches/multipost/MarineLitterRow.java | 2 +- .../service/catches/multipost/MarineLitterRowModel.java | 2 +- .../service/catches/multipost/MarineLitterWeightRow.java | 2 +- .../catches/multipost/MarineLitterWeightRowModel.java | 2 +- .../service/catches/multipost/MultiPostExportService.java | 4 ++-- .../service/catches/multipost/MultiPostImportService.java | 2 +- .../tutti/service/csv/ForeignKeyListParserFormatter.java | 2 +- .../ifremer/tutti/service/csv/ForeignKeyParserFormatter.java | 2 +- .../main/java/fr/ifremer/tutti/service/csv/TuttiCsvUtil.java | 2 +- .../fr/ifremer/tutti/service/export/ExportCatchContext.java | 4 ++-- .../tutti/service/export/pdf/CatchesPdfExportService.java | 2 +- .../fr/ifremer/tutti/service/export/sumatra/CatchRow.java | 2 +- .../ifremer/tutti/service/export/sumatra/CatchRowModel.java | 2 +- .../service/export/sumatra/CatchesSumatraExportService.java | 2 +- .../tutti/service/export/sumatra/SumatraExportResult.java | 2 +- .../service/genericformat/GenericFormatExportService.java | 4 ++-- .../service/genericformat/csv/AccidentalCatchModel.java | 2 +- .../tutti/service/genericformat/csv/AccidentalCatchRow.java | 2 +- .../ifremer/tutti/service/genericformat/csv/CatchModel.java | 2 +- .../fr/ifremer/tutti/service/genericformat/csv/CatchRow.java | 2 +- .../service/genericformat/csv/ExportSampleCategory.java | 2 +- .../service/genericformat/csv/GearCaracteristicModel.java | 2 +- .../service/genericformat/csv/GearCaracteristicRow.java | 2 +- .../genericformat/csv/IndividualObservationModel.java | 2 +- .../service/genericformat/csv/IndividualObservationRow.java | 2 +- .../tutti/service/genericformat/csv/MarineLitterModel.java | 2 +- .../tutti/service/genericformat/csv/MarineLitterRow.java | 2 +- .../tutti/service/genericformat/csv/OperationModel.java | 2 +- .../tutti/service/genericformat/csv/OperationRow.java | 2 +- .../tutti/service/genericformat/csv/ParameterModel.java | 2 +- .../tutti/service/genericformat/csv/ParameterRow.java | 2 +- .../tutti/service/genericformat/csv/SpeciesExportModel.java | 2 +- .../tutti/service/genericformat/csv/SpeciesExportRow.java | 2 +- .../ifremer/tutti/service/genericformat/csv/SurveyModel.java | 2 +- .../ifremer/tutti/service/genericformat/csv/SurveyRow.java | 2 +- .../fr/ifremer/tutti/service/protocol/CaracteristicRow.java | 2 +- .../tutti/service/protocol/CaracteristicRowModel.java | 2 +- .../tutti/service/protocol/ProtocolImportExportService.java | 2 +- .../java/fr/ifremer/tutti/service/protocol/SpeciesRow.java | 2 +- .../fr/ifremer/tutti/service/protocol/SpeciesRowModel.java | 2 +- .../tutti/service/psionimport/PsionImportBatchModel.java | 2 +- .../ifremer/tutti/service/psionimport/PsionImportModel.java | 2 +- .../ifremer/tutti/service/psionimport/PsionImportResult.java | 2 +- .../tutti/service/psionimport/PsionImportService.java | 8 ++++---- .../java/fr/ifremer/tutti/service/pupitri/Directions.java | 2 +- .../ifremer/tutti/service/pupitri/PupitriImportResult.java | 4 ++-- .../ifremer/tutti/service/pupitri/PupitriImportService.java | 2 +- .../ifremer/tutti/service/pupitri/PupitriSpeciesContext.java | 2 +- .../main/java/fr/ifremer/tutti/service/pupitri/Signs.java | 2 +- .../fr/ifremer/tutti/service/pupitri/csv/CarrouselRow.java | 2 +- .../ifremer/tutti/service/pupitri/csv/CarrouselRowModel.java | 2 +- .../fr/ifremer/tutti/service/pupitri/csv/SpeciesRow.java | 2 +- .../ifremer/tutti/service/pupitri/csv/SpeciesRowModel.java | 2 +- .../java/fr/ifremer/tutti/service/pupitri/csv/TrunkRow.java | 2 +- .../fr/ifremer/tutti/service/pupitri/csv/TrunkRowModel.java | 2 +- .../referential/TuttiReferentialSynchronizeService.java | 2 +- .../fr/ifremer/tutti/service/referential/csv/GearModel.java | 2 +- .../ifremer/tutti/service/referential/csv/PersonModel.java | 2 +- .../ifremer/tutti/service/referential/csv/SpeciesModel.java | 2 +- .../ifremer/tutti/service/referential/csv/VesselModel.java | 2 +- .../java/fr/ifremer/tutti/service/AbstractServiceTest.java | 2 +- .../fr/ifremer/tutti/service/BeanValidatorDetectorTest.java | 2 +- .../java/fr/ifremer/tutti/service/DecoratorServiceTest.java | 2 +- .../java/fr/ifremer/tutti/service/ServiceDbResource.java | 2 +- .../java/fr/ifremer/tutti/service/ValidationServiceTest.java | 2 +- .../tutti/service/catches/WeightComputingServiceTest.java | 2 +- .../catches/multipost/MultiPostExportServiceTest.java | 2 +- .../service/export/pdf/CatchesPdfExportServiceTest.java | 2 +- .../export/sumatra/CatchesSumatraExportServiceTest.java | 2 +- .../genericformat/GenericFormatExportServiceTest.java | 2 +- .../service/protocol/ProtocolImportExportServiceTest.java | 2 +- .../tutti/service/psionimport/PsionImportServiceTest.java | 2 +- .../service/pupitri/PupitriImportServiceAno3898Test.java | 2 +- .../service/pupitri/PupitriImportServiceAno5032Test.java | 2 +- .../service/pupitri/PupitriImportServiceAno5079Test.java | 2 +- .../service/pupitri/PupitriImportServiceEvo5060Test.java | 2 +- .../service/pupitri/PupitriImportServiceEvo5062Test.java | 2 +- .../tutti/service/pupitri/PupitriImportServiceTest.java | 2 +- .../referential/ReferentialTemporaryExportServiceTest.java | 2 +- .../src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java | 2 +- .../java/fr/ifremer/tutti/ui/swing/TuttiActionFactory.java | 2 +- .../main/java/fr/ifremer/tutti/ui/swing/TuttiHelpBroker.java | 2 +- .../src/main/java/fr/ifremer/tutti/ui/swing/TuttiScreen.java | 2 +- .../main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 2 +- .../fr/ifremer/tutti/ui/swing/content/MainUIHandler.java | 2 +- .../ui/swing/content/actions/AbstractChangeLocaleAction.java | 2 +- .../ui/swing/content/actions/AbstractChangeScreenAction.java | 6 +++--- .../ui/swing/content/actions/AbstractMainUITuttiAction.java | 2 +- .../ui/swing/content/actions/ChangeToLocaleFRAction.java | 2 +- .../ui/swing/content/actions/ChangeToLocaleUKAction.java | 2 +- .../ui/swing/content/actions/CloseApplicationAction.java | 2 +- .../ui/swing/content/actions/ConnectIchtyometerAction.java | 4 ++-- .../swing/content/actions/DisconnectIchtyometerAction.java | 4 ++-- .../content/actions/EditCatchesForSelectedCruiseAction.java | 2 +- .../ui/swing/content/actions/EditSelectedCruiseAction.java | 2 +- .../ui/swing/content/actions/EditSelectedProgramAction.java | 2 +- .../ui/swing/content/actions/EditSelectedProtocolAction.java | 2 +- .../ui/swing/content/actions/GoToPreviousScreenAction.java | 2 +- .../tutti/ui/swing/content/actions/OpenDbScreenAction.java | 2 +- .../tutti/ui/swing/content/actions/OpenHomeScreenAction.java | 2 +- .../ui/swing/content/actions/OpenReportScreenAction.java | 2 +- .../content/actions/OpenSampleCategoryModelScreenAction.java | 2 +- .../actions/OpenTemporaryReferentialScreenAction.java | 2 +- .../tutti/ui/swing/content/actions/ShowAboutAction.java | 2 +- .../tutti/ui/swing/content/actions/ShowConfigAction.java | 2 +- .../ifremer/tutti/ui/swing/content/actions/StartAction.java | 4 ++-- .../swing/content/actions/ValidateSelectedCruiseAction.java | 2 +- .../content/category/EditSampleCategoryModelTableModel.java | 2 +- .../content/category/EditSampleCategoryModelUIHandler.java | 2 +- .../content/category/EditSampleCategoryModelUIModel.java | 2 +- .../category/actions/SaveSampleCategoryModelAction.java | 2 +- .../tutti/ui/swing/content/config/TuttiConfigUIHandler.java | 2 +- .../ui/swing/content/config/actions/ReloadTuttiAction.java | 2 +- .../tutti/ui/swing/content/cruise/EditCruiseUIHandler.java | 2 +- .../tutti/ui/swing/content/cruise/EditCruiseUIModel.java | 2 +- .../content/cruise/GearCaracteristicsEditorRowModel.java | 2 +- .../content/cruise/GearCaracteristicsEditorTableModel.java | 2 +- .../content/cruise/GearCaracteristicsEditorUIHandler.java | 2 +- .../content/cruise/GearCaracteristicsEditorUIModel.java | 2 +- .../tutti/ui/swing/content/cruise/VesselTypeEnum.java | 2 +- .../content/cruise/actions/EditGearCaracteristicsAction.java | 2 +- .../ui/swing/content/cruise/actions/SaveCruiseAction.java | 2 +- .../content/cruise/actions/ViewGearCaracteristicsAction.java | 2 +- .../tutti/ui/swing/content/db/DbManagerUIHandler.java | 2 +- .../tutti/ui/swing/content/db/actions/CloseDbAction.java | 2 +- .../ui/swing/content/db/actions/ExportAndCleanDbAction.java | 2 +- .../tutti/ui/swing/content/db/actions/ExportDbAction.java | 2 +- .../tutti/ui/swing/content/db/actions/ImportDbAction.java | 2 +- .../swing/content/db/actions/ImportOrReimportDbAction.java | 2 +- .../tutti/ui/swing/content/db/actions/InstallDbAction.java | 2 +- .../swing/content/db/actions/InstallOrReinstallDbAction.java | 2 +- .../tutti/ui/swing/content/db/actions/OpenDbAction.java | 2 +- .../tutti/ui/swing/content/db/actions/ReimportDbAction.java | 2 +- .../tutti/ui/swing/content/db/actions/ReinstallDbAction.java | 2 +- .../tutti/ui/swing/content/db/actions/UpdateDbAction.java | 2 +- .../tutti/ui/swing/content/home/SelectCruiseUIHandler.java | 2 +- .../tutti/ui/swing/content/home/SelectCruiseUIModel.java | 2 +- .../ui/swing/content/home/actions/CloneProtocolAction.java | 2 +- .../ui/swing/content/home/actions/DeleteProtocolAction.java | 2 +- .../ui/swing/content/home/actions/EditCatchesAction.java | 2 +- .../ui/swing/content/home/actions/EditCruiseAction.java | 2 +- .../ui/swing/content/home/actions/EditProgramAction.java | 2 +- .../ui/swing/content/home/actions/EditProtocolAction.java | 2 +- .../content/home/actions/ExportCruiseForSumatraAction.java | 2 +- .../ui/swing/content/home/actions/ExportProtocolAction.java | 2 +- .../ui/swing/content/home/actions/ImportProtocolAction.java | 2 +- .../tutti/ui/swing/content/home/actions/NewCruiseAction.java | 2 +- .../ui/swing/content/home/actions/NewProgramAction.java | 2 +- .../ui/swing/content/home/actions/NewProtocolAction.java | 2 +- .../swing/content/home/actions/SendCruiseReportAction.java | 2 +- .../home/actions/SpeciesToConfirmReportForCruiseAction.java | 2 +- .../ui/swing/content/home/actions/ValidateCatchesAction.java | 2 +- .../content/operation/EditFishingOperationUIHandler.java | 2 +- .../swing/content/operation/EditFishingOperationUIModel.java | 2 +- .../swing/content/operation/FishingOperationsUIHandler.java | 2 +- .../ui/swing/content/operation/FishingOperationsUIModel.java | 12 ++++++------ .../ui/swing/content/operation/SecondaryVesselTypeEnum.java | 2 +- .../operation/catches/AbstractTuttiBatchTableUIHandler.java | 4 ++-- .../content/operation/catches/AbstractTuttiBatchUIModel.java | 2 +- .../content/operation/catches/EditCatchesUIHandler.java | 2 +- .../swing/content/operation/catches/EditCatchesUIModel.java | 6 +++--- .../operation/catches/FrequencyConfigurationMode.java | 2 +- .../swing/content/operation/catches/SampleCategoryAble.java | 2 +- .../operation/catches/SampleCategoryColumnIdentifier.java | 2 +- .../content/operation/catches/SampleCategoryComponent.java | 6 +++--- .../content/operation/catches/SelectedCategoryAble.java | 2 +- .../content/operation/catches/SpeciesAbleBatchRowHelper.java | 2 +- .../content/operation/catches/SpeciesBatchDecorator.java | 2 +- .../operation/catches/SpeciesBatchDecoratorComparator.java | 6 +++--- .../ui/swing/content/operation/catches/SpeciesSortMode.java | 2 +- .../content/operation/catches/SpeciesSortableRowModel.java | 2 +- .../ui/swing/content/operation/catches/TableViewMode.java | 2 +- .../catches/accidental/AccidentalBatchRowModel.java | 2 +- .../catches/accidental/AccidentalBatchTableModel.java | 2 +- .../catches/accidental/AccidentalBatchUIHandler.java | 2 +- .../operation/catches/accidental/AccidentalBatchUIModel.java | 2 +- .../accidental/actions/ExportMultiPostAccidentalAction.java | 2 +- .../accidental/actions/ImportMultiPostAccidentalAction.java | 2 +- .../accidental/actions/RemoveAccidentalBatchAction.java | 2 +- .../accidental/create/CreateAccidentalBatchUIHandler.java | 2 +- .../accidental/create/CreateAccidentalBatchUIModel.java | 2 +- .../catches/actions/CancelEditCatchBatchAction.java | 2 +- .../operation/catches/actions/CleanBatchWeightsAction.java | 4 ++-- .../operation/catches/actions/ComputeBatchWeightsAction.java | 2 +- .../actions/ExportFishingOperationForSumatraAction.java | 2 +- .../catches/actions/ExportFishingOperationReportAction.java | 2 +- .../catches/actions/ExportMultiPostActionSupport.java | 2 +- .../catches/actions/ImportMultiPostActionSupport.java | 2 +- .../operation/catches/actions/SaveCatchBatchAction.java | 2 +- .../operation/catches/benthos/BenthosBatchRowModel.java | 2 +- .../operation/catches/benthos/BenthosBatchTableModel.java | 2 +- .../operation/catches/benthos/BenthosBatchUIHandler.java | 2 +- .../operation/catches/benthos/BenthosBatchUIModel.java | 2 +- .../catches/benthos/actions/CreateBenthosMelagAction.java | 2 +- .../benthos/actions/ExportMultiPostBenthosAction.java | 2 +- .../benthos/actions/ImportMultiPostBenthosAction.java | 2 +- .../catches/benthos/actions/RemoveBenthosBatchAction.java | 2 +- .../catches/benthos/actions/RemoveBenthosSubBatchAction.java | 2 +- .../catches/benthos/actions/RenameBenthosBatchAction.java | 2 +- .../catches/benthos/create/CreateBenthosBatchUIHandler.java | 2 +- .../catches/benthos/create/CreateBenthosBatchUIModel.java | 2 +- .../create/actions/SelectSpeciesForBenthosBatchAction.java | 2 +- .../benthos/frequency/BenthosFrequencyCellComponent.java | 2 +- .../catches/benthos/frequency/BenthosFrequencyRowModel.java | 2 +- .../benthos/frequency/BenthosFrequencyTableModel.java | 2 +- .../catches/benthos/frequency/BenthosFrequencyUIHandler.java | 2 +- .../catches/benthos/frequency/BenthosFrequencyUIModel.java | 2 +- .../catches/benthos/split/SplitBenthosBatchRowModel.java | 2 +- .../catches/benthos/split/SplitBenthosBatchTableModel.java | 2 +- .../catches/benthos/split/SplitBenthosBatchUIHandler.java | 2 +- .../catches/benthos/split/SplitBenthosBatchUIModel.java | 2 +- .../IndividualObservationBatchRowModel.java | 2 +- .../IndividualObservationBatchTableModel.java | 2 +- .../IndividualObservationBatchUIHandler.java | 2 +- .../IndividualObservationBatchUIModel.java | 2 +- .../actions/ExportMultiPostIndividualObservationAction.java | 2 +- .../actions/ImportMultiPostIndividualObservationAction.java | 2 +- .../actions/RemoveAllIndividualObservationBatchAction.java | 2 +- .../actions/RemoveIndividualObservationBatchAction.java | 2 +- .../SelectSpeciesForIndividualObservationBatchAction.java | 2 +- .../create/CreateIndividualObservationBatchUIHandler.java | 2 +- .../create/CreateIndividualObservationBatchUIModel.java | 4 ++-- .../catches/marinelitter/MarineLitterBatchRowModel.java | 2 +- .../catches/marinelitter/MarineLitterBatchTableModel.java | 2 +- .../catches/marinelitter/MarineLitterBatchUIHandler.java | 2 +- .../catches/marinelitter/MarineLitterBatchUIModel.java | 2 +- .../actions/ExportMultiPostMarineLitterAction.java | 2 +- .../actions/ImportMultiPostMarineLitterAction.java | 2 +- .../marinelitter/actions/RemoveMarineLitterBatchAction.java | 2 +- .../create/CreateMarineLitterBatchUIHandler.java | 2 +- .../marinelitter/create/CreateMarineLitterBatchUIModel.java | 2 +- .../species/ImportPupitriMelagWeightPopupUIHandler.java | 2 +- .../catches/species/ImportPupitriPopupUIHandler.java | 4 ++-- .../operation/catches/species/SpeciesBatchRowModel.java | 2 +- .../operation/catches/species/SpeciesBatchTableModel.java | 2 +- .../operation/catches/species/SpeciesBatchUIHandler.java | 2 +- .../operation/catches/species/SpeciesBatchUIModel.java | 2 +- .../catches/species/actions/CreateSpeciesMelagAction.java | 2 +- .../species/actions/ExportMultiPostSpeciesAction.java | 2 +- .../catches/species/actions/ImportBigfinAction.java | 2 +- .../species/actions/ImportMultiPostSpeciesAction.java | 2 +- .../operation/catches/species/actions/ImportPsionAction.java | 2 +- .../catches/species/actions/ImportPupitriAction.java | 2 +- .../catches/species/actions/RemoveSpeciesBatchAction.java | 2 +- .../catches/species/actions/RemoveSpeciesSubBatchAction.java | 2 +- .../catches/species/actions/RenameSpeciesBatchAction.java | 2 +- .../catches/species/create/CreateSpeciesBatchUIHandler.java | 2 +- .../catches/species/create/CreateSpeciesBatchUIModel.java | 2 +- .../create/actions/SelectSpeciesForSpeciesBatchAction.java | 2 +- .../species/frequency/SpeciesFrequencyCellComponent.java | 2 +- .../catches/species/frequency/SpeciesFrequencyRowModel.java | 2 +- .../species/frequency/SpeciesFrequencyTableModel.java | 2 +- .../catches/species/frequency/SpeciesFrequencyUIHandler.java | 2 +- .../catches/species/frequency/SpeciesFrequencyUIModel.java | 2 +- .../catches/species/split/SplitSpeciesBatchRowModel.java | 2 +- .../catches/species/split/SplitSpeciesBatchTableModel.java | 2 +- .../catches/species/split/SplitSpeciesBatchUIHandler.java | 2 +- .../catches/species/split/SplitSpeciesBatchUIModel.java | 2 +- .../operation/fishing/AbstractCaracteristicRowModel.java | 2 +- .../operation/fishing/AbstractCaracteristicTabUIHandler.java | 2 +- .../operation/fishing/AbstractCaracteristicTabUIModel.java | 2 +- .../content/operation/fishing/GearUseFeatureRowModel.java | 2 +- .../content/operation/fishing/VesselUseFeatureRowModel.java | 2 +- .../fishing/actions/CancelEditFishingOperationAction.java | 2 +- .../fishing/actions/DeleteFishingOperationAction.java | 2 +- .../fishing/actions/EditFishingOperationAction.java | 6 +++--- .../operation/fishing/actions/NewFishingOperationAction.java | 2 +- .../fishing/actions/SaveFishingOperationAction.java | 2 +- .../tutti/ui/swing/content/program/EditProgramUIHandler.java | 2 +- .../tutti/ui/swing/content/program/EditProgramUIModel.java | 2 +- .../ui/swing/content/program/actions/SaveProgramAction.java | 4 ++-- .../ui/swing/content/protocol/EditProtocolUIHandler.java | 2 +- .../tutti/ui/swing/content/protocol/EditProtocolUIModel.java | 2 +- .../protocol/MandatorySampleCategoryColumnIdentifier.java | 2 +- .../content/protocol/actions/AddBenthosProtocolAction.java | 2 +- .../protocol/actions/AddCaracteristicMappingAction.java | 2 +- .../content/protocol/actions/AddSpeciesProtocolAction.java | 2 +- .../protocol/actions/ExportAllCaracteristicAction.java | 2 +- .../protocol/actions/ExportProtocolBenthosAction.java | 2 +- .../protocol/actions/ExportProtocolCaracteristicAction.java | 2 +- .../protocol/actions/ExportProtocolSpeciesAction.java | 2 +- .../swing/content/protocol/actions/ExportPupitriAction.java | 2 +- .../protocol/actions/ImportProtocolBenthosAction.java | 2 +- .../protocol/actions/ImportProtocolCaracteristicAction.java | 2 +- .../protocol/actions/ImportProtocolSpeciesAction.java | 2 +- .../protocol/actions/RemoveBenthosProtocolAction.java | 2 +- .../protocol/actions/RemoveSpeciesProtocolAction.java | 2 +- .../swing/content/protocol/actions/SaveProtocolAction.java | 2 +- .../content/protocol/actions/SelectOtherBenthosAction.java | 2 +- .../content/protocol/actions/SelectOtherSpeciesAction.java | 2 +- .../referential/ManageTemporaryReferentialUIHandler.java | 2 +- .../actions/ExportExistingTemporaryGearAction.java | 2 +- .../actions/ExportExistingTemporaryPersonAction.java | 2 +- .../actions/ExportExistingTemporarySpeciesAction.java | 2 +- .../actions/ExportExistingTemporaryVesselAction.java | 2 +- .../actions/ExportTemporaryGearExampleAction.java | 2 +- .../actions/ExportTemporaryPersonExampleAction.java | 2 +- .../actions/ExportTemporarySpeciesExampleAction.java | 2 +- .../actions/ExportTemporaryVesselExampleAction.java | 2 +- .../referential/actions/ImportTemporaryGearAction.java | 2 +- .../referential/actions/ImportTemporaryPersonAction.java | 2 +- .../referential/actions/ImportTemporarySpeciesAction.java | 2 +- .../referential/actions/ImportTemporaryVesselAction.java | 2 +- .../tutti/ui/swing/content/report/ReportUIHandler.java | 2 +- .../ifremer/tutti/ui/swing/content/report/ReportUIModel.java | 2 +- .../swing/content/report/actions/GenerateReportAction.java | 2 +- .../ui/swing/content/validation/ValidateCruiseUIHandler.java | 2 +- .../ui/swing/content/validation/ValidateCruiseUIModel.java | 2 +- .../validation/actions/EditCruiseInValidationUIAction.java | 2 +- .../actions/EditFishingOperationInValidationUIAction.java | 4 ++-- .../actions/ExportCruiseValidationMessagesAction.java | 2 +- .../actions/ExportOperationValidationMessagesAction.java | 2 +- .../validation/actions/SaveCruiseToReadyToSynchAction.java | 2 +- .../tutti/ui/swing/update/TuttiDbUpdaterCallBack.java | 2 +- .../ui/swing/update/actions/UpdateApplicationAction.java | 2 +- .../tutti/ui/swing/update/actions/UpdateReportAction.java | 2 +- .../tutti/ui/swing/util/AbstractTuttiBeanUIModel.java | 2 +- .../ui/swing/util/AbstractTuttiTabContainerUIHandler.java | 2 +- .../ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java | 2 +- .../ui/swing/util/RemoveablePropertyChangeListener.java | 4 ++-- .../fr/ifremer/tutti/ui/swing/util/TuttiBeanMonitor.java | 2 +- .../ifremer/tutti/ui/swing/util/TuttiExceptionHandler.java | 6 +++--- .../main/java/fr/ifremer/tutti/ui/swing/util/TuttiUI.java | 2 +- .../java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 2 +- .../fr/ifremer/tutti/ui/swing/util/UIMessageNotifier.java | 2 +- .../tutti/ui/swing/util/actions/LongActionSupport.java | 2 +- .../tutti/ui/swing/util/attachment/AttachmentCellEditor.java | 4 ++-- .../ui/swing/util/attachment/AttachmentCellRenderer.java | 4 ++-- .../ui/swing/util/attachment/AttachmentEditorUIHandler.java | 4 ++-- .../tutti/ui/swing/util/attachment/AttachmentModelAware.java | 2 +- .../tutti/ui/swing/util/attachment/ButtonAttachment.java | 2 +- .../swing/util/attachment/actions/SaveAttachmentAction.java | 2 +- .../ifremer/tutti/ui/swing/util/auth/AuthenticationInfo.java | 2 +- .../fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java | 2 +- .../util/caracteristics/CaracteristicMapCellComponent.java | 2 +- .../util/caracteristics/CaracteristicMapColumnRowModel.java | 2 +- .../util/caracteristics/CaracteristicMapColumnUIHandler.java | 2 +- .../util/caracteristics/CaracteristicMapEditorRowModel.java | 2 +- .../caracteristics/CaracteristicMapEditorTableModel.java | 2 +- .../util/caracteristics/CaracteristicMapEditorUIHandler.java | 2 +- .../util/caracteristics/CaracteristicMapEditorUIModel.java | 2 +- .../swing/util/caracteristics/CaracteristicValueEditor.java | 2 +- .../util/caracteristics/CaracteristicValueRenderer.java | 2 +- .../caracteristics/GearCaracteristicListCellRenderer.java | 2 +- .../tutti/ui/swing/util/catches/EnterWeightUIHandler.java | 2 +- .../ifremer/tutti/ui/swing/util/comment/ButtonComment.java | 2 +- .../tutti/ui/swing/util/comment/CommentCellEditor.java | 2 +- .../tutti/ui/swing/util/comment/CommentCellRenderer.java | 2 +- .../tutti/ui/swing/util/comment/CommentEditorUIHandler.java | 2 +- .../tutti/ui/swing/util/computable/ComputableData.java | 2 +- .../swing/util/computable/ComputableDataEditorHandler.java | 2 +- .../ui/swing/util/computable/ComputableDataTableCell.java | 2 +- .../tutti/ui/swing/util/editor/TuttiLocationTableCell.java | 2 +- .../ifremer/tutti/ui/swing/util/editor/VesselTableCell.java | 2 +- .../ui/swing/util/species/EnterMelagWeightUIHandler.java | 2 +- .../tutti/ui/swing/util/species/SelectSpeciesUIHandler.java | 2 +- .../tutti/ui/swing/util/species/SelectSpeciesUIModel.java | 2 +- .../ui/swing/util/table/AbstractTuttiTableUIHandler.java | 4 ++-- .../tutti/ui/swing/util/table/AbstractTuttiTableUIModel.java | 2 +- .../ui/swing/util/table/CaracteristicColumnIdentifier.java | 2 +- .../ifremer/tutti/ui/swing/util/table/CaracteristicRow.java | 2 +- .../fr/ifremer/tutti/ui/swing/BeanValidatorDetectorTest.java | 2 +- .../species/frequency/SpeciesFrequencyRowModelTest.java | 2 +- 512 files changed, 611 insertions(+), 610 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7063 updated (db53fbb -> 906fd36)
by codelutin.com scm 17 Jan '16

17 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/7063 in repository tutti. See http://git.codelutin.com/tutti.git omits db53fbb correction de la lecture des voix (fixes #7063) omits d39faf4 ajout de la lecture des nombres mais il reste un problème de lecture de certains nombres (2000 cm par exemple, mais je ne sais pas pourquoi) (refs #7063) omits e5d5f95 ajout de la tonalité nulle dans la conf (refs #7063) omits 8756563 joue un bip à la réception d'une donnée de l'ychtiomètre et 3 bips différents en cas d'erreur (refs #7063) omits 579c5e8 génération et lecture de bips + ajout d'une option pour configurer la tonalité du bip à jouer (refs #7063) adds c3afc48 Utiliser un comparateur de date pour le tri de la liste des opérations (See #7874) adds 20d63c1 Suppression constante inutile adds a205fc9 Merge branch 'feature/7874_tri_sur_les_traits_par_date' into 'develop' adds 8d70e7d Renommage des css en jcss adds 8eedb54 Changement du niveau de log adds 5c9c674 Ajout de méthodes sur la persistence pour récupérer des objets obsolètes (See #7909) adds 7d9a05a Pouvoir lors de l'import générique utiliser des objets obsolètes (partie service) (See #7909) adds 1e1adbb Pouvoir lors de l'import générique utiliser des objets obsolètes (partie ui) (See #7909) adds feda4a0 Mise à jour des tests d'import générique adds 912ce8c Les bases de tests ont été mises à jour, plus besoin d'utiliser l'ancien mécanisme pour récupérer les utilisateurs adds 3fc6609 Utilisation d'une base vide pour les tests d'import générique adds bccde35 Ajout d'un test pour la validation d'import générique avec des données obsolètes (See #7909) adds 9b20e27 Test d'import de données obsolètes pour les engins, strates adds 5f644ac Permettre de récupérer des référentiels obsolètes (See #7909) adds 8139a51 Suppresion d'un service obsolète adds fa6349e Correction de la requete pour récupérer les navires obsolètes adds 31acffd Correction de la requete pour récupérer les navires obsolètes adds 69fac2b Fixes #7909 Merge branch 'feature/7909_import_generique_id_obsoletes' into develop new 63fdb96 génération et lecture de bips + ajout d'une option pour configurer la tonalité du bip à jouer (refs #7063) new 6b2b50e joue un bip à la réception d'une donnée de l'ychtiomètre et 3 bips différents en cas d'erreur (refs #7063) new 9796769 ajout de la tonalité nulle dans la conf (refs #7063) new cf2c730 ajout de la lecture des nombres mais il reste un problème de lecture de certains nombres (2000 cm par exemple, mais je ne sais pas pourquoi) (refs #7063) new 906fd36 correction de la lecture des voix (fixes #7063) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (db53fbb) \ N -- N -- N refs/heads/feature/7063 (906fd36) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. 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 906fd368e4b628ff8a0ca2c1aa0a75b8096fa6e7 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Jan 15 12:26:27 2016 +0100 correction de la lecture des voix (fixes #7063) commit cf2c730e2c2d46c7144ad5cd55337f49fdd1aeb9 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Jan 14 18:45:59 2016 +0100 ajout de la lecture des nombres mais il reste un problème de lecture de certains nombres (2000 cm par exemple, mais je ne sais pas pourquoi) (refs #7063) commit 97967695c92c13b8391e8a615448bb08f81f732e Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Jan 13 19:58:12 2016 +0100 ajout de la tonalité nulle dans la conf (refs #7063) commit 6b2b50e289ec51e2af5a15789845ebde333b508a Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Jan 13 18:51:09 2016 +0100 joue un bip à la réception d'une donnée de l'ychtiomètre et 3 bips différents en cas d'erreur (refs #7063) commit 63fdb96253b8c314dfe87dd3bbf6c5686c5f2438 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Jan 7 12:32:46 2016 +0100 génération et lecture de bips + ajout d'une option pour configurer la tonalité du bip à jouer (refs #7063) Summary of changes: .../tutti/persistence/TuttiPersistenceImpl.java | 47 +- .../persistence/TuttiPersistenceNoDbImpl.java | 40 + .../tutti/persistence/dao/TaxonNameDaoTutti.java | 14 + .../persistence/dao/TaxonNameDaoTuttiImpl.java | 85 ++ .../service/ProgramPersistenceService.java | 1 + .../service/ReferentialPersistenceService.java | 495 ------- .../service/ReferentialPersistenceServiceImpl.java | 1423 -------------------- .../referential/GearPersistenceService.java | 15 +- .../referential/GearPersistenceServiceImpl.java | 42 +- .../referential/LocationPersistenceService.java | 10 +- .../LocationPersistenceServiceImpl.java | 129 +- .../referential/PersonPersistenceService.java | 14 +- .../referential/PersonPersistenceServiceImpl.java | 32 +- .../ReferentialPersistenceServiceSupport.java | 24 +- .../referential/SpeciesPersistenceService.java | 13 +- .../referential/SpeciesPersistenceServiceImpl.java | 41 +- .../referential/VesselPersistenceService.java | 13 +- .../referential/VesselPersistenceServiceImpl.java | 134 +- .../tutti/persistence/test/DatabaseResource.java | 11 - .../resources/applicationContext-service-tutti.xml | 32 +- .../src/main/resources/queries-failsafe.hbm.xml | 187 ++- .../fr/ifremer/tutti/service/DecoratorService.java | 55 +- .../ifremer/tutti/service/PersistenceService.java | 40 + .../service/TuttiValidationDataContextSupport.java | 8 +- .../service/csv/CaracteristicParserFormatter.java | 5 + .../service/csv/EntityParserFormatterSupport.java | 15 +- .../FishingOperationLocationParserFormatter.java | 5 + .../csv/FishingOperationStrataParserFormatter.java | 5 + .../FishingOperationSubStrataParserFormatter.java | 5 + .../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 + .../tutti/service/csv/VesselParserFormatter.java | 5 + .../GenericFormatImportConfiguration.java | 10 + .../GenericFormatImportEntityParserFactory.java | 17 +- .../genericformat/GenericFormatImportRequest.java | 4 + .../ifremer/tutti/service/ServiceDbResource.java | 20 +- .../service/bigfin/BigfinImportService2Test.java | 1 - .../GenericFormatImportServiceTest.java | 3 +- .../GenericFormatImportServiceValidTest.java | 40 +- .../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} | 29 +- .../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 + tutti-ui-swing/pom.xml | 3 +- .../filtered-resources/tutti-help-fr.properties | 5 +- .../ui/swing/content/{Common.css => Common.jcss} | 0 .../ui/swing/content/{MainUI.css => MainUI.jcss} | 0 .../actions/AbstractChangeScreenAction.java | 44 + .../actions/OpenGenericFormatImportScreen.java | 2 +- ...yModelUI.css => EditSampleCategoryModelUI.jcss} | 0 .../{TuttiConfigUI.css => TuttiConfigUI.jcss} | 0 .../cruise/{EditCruiseUI.css => EditCruiseUI.jcss} | 0 ...ditorUI.css => GearCaracteristicsEditorUI.jcss} | 0 .../db/{DbManagerUI.css => DbManagerUI.jcss} | 0 ...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 ...OperationUI.css => EditFishingOperationUI.jcss} | 0 ...ngOperationsUI.css => FishingOperationsUI.jcss} | 0 .../{EditCatchesUI.css => EditCatchesUI.jcss} | 0 ...LogDialog.css => MultiPostImportLogDialog.jcss} | 0 ...ccidentalBatchUI.css => AccidentalBatchUI.jcss} | 0 ...talBatchUI.css => CreateAccidentalBatchUI.jcss} | 0 .../{BenthosBatchUI.css => BenthosBatchUI.jcss} | 0 ...enthosBatchUI.css => CreateBenthosBatchUI.jcss} | 0 ...thosFrequencyUI.css => BenthosFrequencyUI.jcss} | 0 ...BenthosBatchUI.css => SplitBenthosBatchUI.jcss} | 0 ...tchUI.css => IndividualObservationBatchUI.jcss} | 0 ...css => CreateIndividualObservationBatchUI.jcss} | 0 ...eLitterBatchUI.css => MarineLitterBatchUI.jcss} | 0 ...rBatchUI.css => CreateMarineLitterBatchUI.jcss} | 0 ...UI.css => ImportPupitriMelagWeightPopupUI.jcss} | 0 ...upitriPopupUI.css => ImportPupitriPopupUI.jcss} | 0 .../{SpeciesBatchUI.css => SpeciesBatchUI.jcss} | 0 ...peciesBatchUI.css => CreateSpeciesBatchUI.jcss} | 0 ...ciesFrequencyUI.css => SpeciesFrequencyUI.jcss} | 0 ...SpeciesBatchUI.css => SplitSpeciesBatchUI.jcss} | 0 ...seFeatureTabUI.css => GearUseFeatureTabUI.jcss} | 0 ...FeatureTabUI.css => VesselUseFeatureTabUI.jcss} | 0 .../{EditProgramUI.css => EditProgramUI.jcss} | 0 .../{EditProtocolUI.css => EditProtocolUI.jcss} | 0 ...ialUI.css => ManageTemporaryReferentialUI.jcss} | 0 ...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 ...{ValidateCruiseUI.css => ValidateCruiseUI.jcss} | 0 ...achmentEditorUI.css => AttachmentEditorUI.jcss} | 0 .../{AttachmentItem.css => AttachmentItem.jcss} | 0 .../swing/util/auth/{LoginUI.css => LoginUI.jcss} | 0 ...pEditorUI.css => CaracteristicMapEditorUI.jcss} | 0 .../{EnterWeightUI.css => EnterWeightUI.jcss} | 0 .../{CommentEditorUI.css => CommentEditorUI.jcss} | 0 ...erMelagWeightUI.css => EnterMelagWeightUI.jcss} | 0 .../{SelectSpeciesUI.css => SelectSpeciesUI.jcss} | 0 .../resources/i18n/tutti-ui-swing_en_GB.properties | 6 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 6 + 121 files changed, 2017 insertions(+), 3013 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/dao/TaxonNameDaoTutti.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/dao/TaxonNameDaoTuttiImpl.java delete mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java delete mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java create mode 100644 tutti-service/src/test/resources/genericFormat/withObsoletes/catch.csv copy tutti-service/src/test/resources/genericFormat/{empty => withObsoletes}/operation.csv (71%) copy tutti-service/src/test/resources/{pupitri/evo-6116.tuttiProtocol => genericFormat/withObsoletes/protocol.tuttiProtocol} (87%) create mode 100644 tutti-service/src/test/resources/genericFormat/withObsoletes/sampleCategory.csv create mode 100644 tutti-service/src/test/resources/genericFormat/withObsoletes/survey.csv create mode 100644 tutti-service/src/test/resources/genericFormat/withObsoletes/temporaryGears.csv create mode 100644 tutti-service/src/test/resources/genericFormat/withObsoletes/temporaryPersons.csv create mode 100644 tutti-service/src/test/resources/genericFormat/withObsoletes/temporarySpecies.csv create mode 100644 tutti-service/src/test/resources/genericFormat/withObsoletes/temporaryVessels.csv rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{Common.css => Common.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{MainUI.css => MainUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/{EditSampleCategoryModelUI.css => EditSampleCategoryModelUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/{TuttiConfigUI.css => TuttiConfigUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/{EditCruiseUI.css => EditCruiseUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/{GearCaracteristicsEditorUI.css => GearCaracteristicsEditorUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/{DbManagerUI.css => DbManagerUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/{GenericFormatExportUI.css => GenericFormatExportUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/{GenericFormatImportUI.css => GenericFormatImportUI.jcss} (96%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/{SelectCruiseUI.css => SelectCruiseUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/{EditFishingOperationUI.css => EditFishingOperationUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/{FishingOperationsUI.css => FishingOperationsUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{EditCatchesUI.css => EditCatchesUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{MultiPostImportLogDialog.css => MultiPostImportLogDialog.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/{AccidentalBatchUI.css => AccidentalBatchUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/{CreateAccidentalBatchUI.css => CreateAccidentalBatchUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/{BenthosBatchUI.css => BenthosBatchUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/{CreateBenthosBatchUI.css => CreateBenthosBatchUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/{BenthosFrequencyUI.css => BenthosFrequencyUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/{SplitBenthosBatchUI.css => SplitBenthosBatchUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/{IndividualObservationBatchUI.css => IndividualObservationBatchUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/{CreateIndividualObservationBatchUI.css => CreateIndividualObservationBatchUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/{MarineLitterBatchUI.css => MarineLitterBatchUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/{CreateMarineLitterBatchUI.css => CreateMarineLitterBatchUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ImportPupitriMelagWeightPopupUI.css => ImportPupitriMelagWeightPopupUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ImportPupitriPopupUI.css => ImportPupitriPopupUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{SpeciesBatchUI.css => SpeciesBatchUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/{CreateSpeciesBatchUI.css => CreateSpeciesBatchUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/{SpeciesFrequencyUI.css => SpeciesFrequencyUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/{SplitSpeciesBatchUI.css => SplitSpeciesBatchUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/{GearUseFeatureTabUI.css => GearUseFeatureTabUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/{VesselUseFeatureTabUI.css => VesselUseFeatureTabUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/{EditProgramUI.css => EditProgramUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/{EditProtocolUI.css => EditProtocolUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/{ManageTemporaryReferentialUI.css => ManageTemporaryReferentialUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/{AbstractReplaceTemporaryUI.css => AbstractReplaceTemporaryUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/{ReplaceTemporaryGearUI.css => ReplaceTemporaryGearUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/{ReplaceTemporaryPersonUI.css => ReplaceTemporaryPersonUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/{ReplaceTemporarySpeciesUI.css => ReplaceTemporarySpeciesUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/{ReplaceTemporaryVesselUI.css => ReplaceTemporaryVesselUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/{ReportUI.css => ReportUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/{ValidateCruiseUI.css => ValidateCruiseUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/{AttachmentEditorUI.css => AttachmentEditorUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/{AttachmentItem.css => AttachmentItem.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/{LoginUI.css => LoginUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/{CaracteristicMapEditorUI.css => CaracteristicMapEditorUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/catches/{EnterWeightUI.css => EnterWeightUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/{CommentEditorUI.css => CommentEditorUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/{EnterMelagWeightUI.css => EnterMelagWeightUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/{SelectSpeciesUI.css => SelectSpeciesUI.jcss} (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 5

branch develop updated (a205fc9 -> 69fac2b)
by codelutin.com scm 17 Jan '16

17 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from a205fc9 Merge branch 'feature/7874_tri_sur_les_traits_par_date' into 'develop' new 8d70e7d Renommage des css en jcss new 8eedb54 Changement du niveau de log new 5c9c674 Ajout de méthodes sur la persistence pour récupérer des objets obsolètes (See #7909) new 7d9a05a Pouvoir lors de l'import générique utiliser des objets obsolètes (partie service) (See #7909) new 1e1adbb Pouvoir lors de l'import générique utiliser des objets obsolètes (partie ui) (See #7909) new feda4a0 Mise à jour des tests d'import générique new 912ce8c Les bases de tests ont été mises à jour, plus besoin d'utiliser l'ancien mécanisme pour récupérer les utilisateurs new 3fc6609 Utilisation d'une base vide pour les tests d'import générique new bccde35 Ajout d'un test pour la validation d'import générique avec des données obsolètes (See #7909) new 9b20e27 Test d'import de données obsolètes pour les engins, strates new 5f644ac Permettre de récupérer des référentiels obsolètes (See #7909) new 8139a51 Suppresion d'un service obsolète new fa6349e Correction de la requete pour récupérer les navires obsolètes new 31acffd Correction de la requete pour récupérer les navires obsolètes new 69fac2b Fixes #7909 Merge branch 'feature/7909_import_generique_id_obsoletes' into develop The 15 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 69fac2b62057e0be1f2e3a79582e2a9ad0bbe952 Merge: 8d70e7d 31acffd Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Jan 17 18:49:18 2016 +0100 Fixes #7909 Merge branch 'feature/7909_import_generique_id_obsoletes' into develop commit 31acffdb59a40ee03234d618767f39c41c5068c3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Jan 17 18:49:03 2016 +0100 Correction de la requete pour récupérer les navires obsolètes commit fa6349e9037578b41cb222d3714e234c0b824fdd Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Jan 17 18:36:09 2016 +0100 Correction de la requete pour récupérer les navires obsolètes commit 8139a516c28b1f28437da90118fc817b2d2434c0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Jan 17 17:31:48 2016 +0100 Suppresion d'un service obsolète commit 5f644aced15eaa3bf6196d3fb3f14bfb584198a5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Jan 17 17:02:51 2016 +0100 Permettre de récupérer des référentiels obsolètes (See #7909) commit 9b20e278c057a618adcd50eb1a6ea437c457d274 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Jan 17 14:08:02 2016 +0100 Test d'import de données obsolètes pour les engins, strates commit bccde3544d77cdd632f309a1bd16e13fe8afb0c1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Jan 17 13:21:28 2016 +0100 Ajout d'un test pour la validation d'import générique avec des données obsolètes (See #7909) commit 3fc66097bc6e444f11e1d97f3d101bfd6f2bd008 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Jan 17 13:21:00 2016 +0100 Utilisation d'une base vide pour les tests d'import générique commit 912ce8ca1e64f02777599a51b624eeb5e341d946 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Jan 17 13:19:02 2016 +0100 Les bases de tests ont été mises à jour, plus besoin d'utiliser l'ancien mécanisme pour récupérer les utilisateurs commit feda4a0cafe9c073c98c4f7bcf2120374944844d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Jan 17 13:17:49 2016 +0100 Mise à jour des tests d'import générique commit 1e1adbb60e501007b4cef777b2e5e36f2c5392bf Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 16 10:02:33 2016 +0100 Pouvoir lors de l'import générique utiliser des objets obsolètes (partie ui) (See #7909) commit 7d9a05a2653d4521115710c9ef4edc14df41b67c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 16 09:48:25 2016 +0100 Pouvoir lors de l'import générique utiliser des objets obsolètes (partie service) (See #7909) commit 5c9c6742907dbd978857baad21691496c3748e5b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 16 09:47:02 2016 +0100 Ajout de méthodes sur la persistence pour récupérer des objets obsolètes (See #7909) commit 8eedb54e924930878d0631ae47e54b7205bd1654 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 16 09:45:50 2016 +0100 Changement du niveau de log commit 8d70e7dbb211b4d0eab3ca6fd016155cfb86e999 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Jan 15 19:38:17 2016 +0100 Renommage des css en jcss Summary of changes: .../tutti/persistence/TuttiPersistenceImpl.java | 47 +- .../persistence/TuttiPersistenceNoDbImpl.java | 40 + .../tutti/persistence/dao/TaxonNameDaoTutti.java | 14 + .../persistence/dao/TaxonNameDaoTuttiImpl.java | 85 ++ .../service/ProgramPersistenceService.java | 1 + .../service/ReferentialPersistenceService.java | 495 ------- .../service/ReferentialPersistenceServiceImpl.java | 1423 -------------------- .../referential/GearPersistenceService.java | 15 +- .../referential/GearPersistenceServiceImpl.java | 42 +- .../referential/LocationPersistenceService.java | 10 +- .../LocationPersistenceServiceImpl.java | 129 +- .../referential/PersonPersistenceService.java | 14 +- .../referential/PersonPersistenceServiceImpl.java | 32 +- .../ReferentialPersistenceServiceSupport.java | 24 +- .../referential/SpeciesPersistenceService.java | 13 +- .../referential/SpeciesPersistenceServiceImpl.java | 41 +- .../referential/VesselPersistenceService.java | 13 +- .../referential/VesselPersistenceServiceImpl.java | 134 +- .../tutti/persistence/test/DatabaseResource.java | 11 - .../resources/applicationContext-service-tutti.xml | 32 +- .../src/main/resources/queries-failsafe.hbm.xml | 187 ++- .../ifremer/tutti/service/PersistenceService.java | 40 + .../service/TuttiValidationDataContextSupport.java | 8 +- .../service/csv/CaracteristicParserFormatter.java | 5 + .../service/csv/EntityParserFormatterSupport.java | 15 +- .../FishingOperationLocationParserFormatter.java | 5 + .../csv/FishingOperationStrataParserFormatter.java | 5 + .../FishingOperationSubStrataParserFormatter.java | 5 + .../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 + .../tutti/service/csv/VesselParserFormatter.java | 5 + .../GenericFormatImportConfiguration.java | 10 + .../GenericFormatImportEntityParserFactory.java | 17 +- .../genericformat/GenericFormatImportRequest.java | 4 + .../ifremer/tutti/service/ServiceDbResource.java | 20 +- .../service/bigfin/BigfinImportService2Test.java | 1 - .../GenericFormatImportServiceTest.java | 3 +- .../GenericFormatImportServiceValidTest.java | 40 +- .../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} | 29 +- .../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 + tutti-ui-swing/pom.xml | 3 +- .../filtered-resources/tutti-help-fr.properties | 5 +- .../ui/swing/content/{Common.css => Common.jcss} | 0 .../ui/swing/content/{MainUI.css => MainUI.jcss} | 0 .../actions/AbstractChangeScreenAction.java | 44 + .../actions/OpenGenericFormatImportScreen.java | 2 +- ...yModelUI.css => EditSampleCategoryModelUI.jcss} | 0 .../{TuttiConfigUI.css => TuttiConfigUI.jcss} | 0 .../cruise/{EditCruiseUI.css => EditCruiseUI.jcss} | 0 ...ditorUI.css => GearCaracteristicsEditorUI.jcss} | 0 .../db/{DbManagerUI.css => DbManagerUI.jcss} | 0 ...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 ...OperationUI.css => EditFishingOperationUI.jcss} | 0 ...ngOperationsUI.css => FishingOperationsUI.jcss} | 0 .../{EditCatchesUI.css => EditCatchesUI.jcss} | 0 ...LogDialog.css => MultiPostImportLogDialog.jcss} | 0 ...ccidentalBatchUI.css => AccidentalBatchUI.jcss} | 0 ...talBatchUI.css => CreateAccidentalBatchUI.jcss} | 0 .../{BenthosBatchUI.css => BenthosBatchUI.jcss} | 0 ...enthosBatchUI.css => CreateBenthosBatchUI.jcss} | 0 ...thosFrequencyUI.css => BenthosFrequencyUI.jcss} | 0 ...BenthosBatchUI.css => SplitBenthosBatchUI.jcss} | 0 ...tchUI.css => IndividualObservationBatchUI.jcss} | 0 ...css => CreateIndividualObservationBatchUI.jcss} | 0 ...eLitterBatchUI.css => MarineLitterBatchUI.jcss} | 0 ...rBatchUI.css => CreateMarineLitterBatchUI.jcss} | 0 ...UI.css => ImportPupitriMelagWeightPopupUI.jcss} | 0 ...upitriPopupUI.css => ImportPupitriPopupUI.jcss} | 0 .../{SpeciesBatchUI.css => SpeciesBatchUI.jcss} | 0 ...peciesBatchUI.css => CreateSpeciesBatchUI.jcss} | 0 ...ciesFrequencyUI.css => SpeciesFrequencyUI.jcss} | 0 ...SpeciesBatchUI.css => SplitSpeciesBatchUI.jcss} | 0 ...seFeatureTabUI.css => GearUseFeatureTabUI.jcss} | 0 ...FeatureTabUI.css => VesselUseFeatureTabUI.jcss} | 0 .../{EditProgramUI.css => EditProgramUI.jcss} | 0 .../{EditProtocolUI.css => EditProtocolUI.jcss} | 0 ...ialUI.css => ManageTemporaryReferentialUI.jcss} | 0 ...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 ...{ValidateCruiseUI.css => ValidateCruiseUI.jcss} | 0 ...achmentEditorUI.css => AttachmentEditorUI.jcss} | 0 .../{AttachmentItem.css => AttachmentItem.jcss} | 0 .../swing/util/auth/{LoginUI.css => LoginUI.jcss} | 0 ...pEditorUI.css => CaracteristicMapEditorUI.jcss} | 0 .../{EnterWeightUI.css => EnterWeightUI.jcss} | 0 .../{CommentEditorUI.css => CommentEditorUI.jcss} | 0 ...erMelagWeightUI.css => EnterMelagWeightUI.jcss} | 0 .../{SelectSpeciesUI.css => SelectSpeciesUI.jcss} | 0 .../resources/i18n/tutti-ui-swing_en_GB.properties | 6 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 6 + 120 files changed, 1967 insertions(+), 3008 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/dao/TaxonNameDaoTutti.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/dao/TaxonNameDaoTuttiImpl.java delete mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java delete mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java create mode 100644 tutti-service/src/test/resources/genericFormat/withObsoletes/catch.csv copy tutti-service/src/test/resources/genericFormat/{empty => withObsoletes}/operation.csv (71%) copy tutti-service/src/test/resources/{pupitri/evo-6116.tuttiProtocol => genericFormat/withObsoletes/protocol.tuttiProtocol} (87%) create mode 100644 tutti-service/src/test/resources/genericFormat/withObsoletes/sampleCategory.csv create mode 100644 tutti-service/src/test/resources/genericFormat/withObsoletes/survey.csv create mode 100644 tutti-service/src/test/resources/genericFormat/withObsoletes/temporaryGears.csv create mode 100644 tutti-service/src/test/resources/genericFormat/withObsoletes/temporaryPersons.csv create mode 100644 tutti-service/src/test/resources/genericFormat/withObsoletes/temporarySpecies.csv create mode 100644 tutti-service/src/test/resources/genericFormat/withObsoletes/temporaryVessels.csv rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{Common.css => Common.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{MainUI.css => MainUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/{EditSampleCategoryModelUI.css => EditSampleCategoryModelUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/{TuttiConfigUI.css => TuttiConfigUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/{EditCruiseUI.css => EditCruiseUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/{GearCaracteristicsEditorUI.css => GearCaracteristicsEditorUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/{DbManagerUI.css => DbManagerUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/{GenericFormatExportUI.css => GenericFormatExportUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/{GenericFormatImportUI.css => GenericFormatImportUI.jcss} (96%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/{SelectCruiseUI.css => SelectCruiseUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/{EditFishingOperationUI.css => EditFishingOperationUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/{FishingOperationsUI.css => FishingOperationsUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{EditCatchesUI.css => EditCatchesUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{MultiPostImportLogDialog.css => MultiPostImportLogDialog.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/{AccidentalBatchUI.css => AccidentalBatchUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/{CreateAccidentalBatchUI.css => CreateAccidentalBatchUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/{BenthosBatchUI.css => BenthosBatchUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/{CreateBenthosBatchUI.css => CreateBenthosBatchUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/{BenthosFrequencyUI.css => BenthosFrequencyUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/{SplitBenthosBatchUI.css => SplitBenthosBatchUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/{IndividualObservationBatchUI.css => IndividualObservationBatchUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/{CreateIndividualObservationBatchUI.css => CreateIndividualObservationBatchUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/{MarineLitterBatchUI.css => MarineLitterBatchUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/{CreateMarineLitterBatchUI.css => CreateMarineLitterBatchUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ImportPupitriMelagWeightPopupUI.css => ImportPupitriMelagWeightPopupUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ImportPupitriPopupUI.css => ImportPupitriPopupUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{SpeciesBatchUI.css => SpeciesBatchUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/{CreateSpeciesBatchUI.css => CreateSpeciesBatchUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/{SpeciesFrequencyUI.css => SpeciesFrequencyUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/{SplitSpeciesBatchUI.css => SplitSpeciesBatchUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/{GearUseFeatureTabUI.css => GearUseFeatureTabUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/{VesselUseFeatureTabUI.css => VesselUseFeatureTabUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/{EditProgramUI.css => EditProgramUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/{EditProtocolUI.css => EditProtocolUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/{ManageTemporaryReferentialUI.css => ManageTemporaryReferentialUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/{AbstractReplaceTemporaryUI.css => AbstractReplaceTemporaryUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/{ReplaceTemporaryGearUI.css => ReplaceTemporaryGearUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/{ReplaceTemporaryPersonUI.css => ReplaceTemporaryPersonUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/{ReplaceTemporarySpeciesUI.css => ReplaceTemporarySpeciesUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/{ReplaceTemporaryVesselUI.css => ReplaceTemporaryVesselUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/{ReportUI.css => ReportUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/{ValidateCruiseUI.css => ValidateCruiseUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/{AttachmentEditorUI.css => AttachmentEditorUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/{AttachmentItem.css => AttachmentItem.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/{LoginUI.css => LoginUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/{CaracteristicMapEditorUI.css => CaracteristicMapEditorUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/catches/{EnterWeightUI.css => EnterWeightUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/{CommentEditorUI.css => CommentEditorUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/{EnterMelagWeightUI.css => EnterMelagWeightUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/{SelectSpeciesUI.css => SelectSpeciesUI.jcss} (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 15

branch feature/7909_import_generique_id_obsoletes deleted (was 31acffd)
by codelutin.com scm 17 Jan '16

17 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/7909_import_generique_id_obsoletes in repository tutti. See http://git.codelutin.com/tutti.git was 31acffd Correction de la requete pour récupérer les navires obsolètes This change permanently discards the following revisions: discards 31acffd Correction de la requete pour récupérer les navires obsolètes discards fa6349e Correction de la requete pour récupérer les navires obsolètes discards 8139a51 Suppresion d'un service obsolète discards 5f644ac Permettre de récupérer des référentiels obsolètes (See #7909) discards 9b20e27 Test d'import de données obsolètes pour les engins, strates discards bccde35 Ajout d'un test pour la validation d'import générique avec des données obsolètes (See #7909) discards 3fc6609 Utilisation d'une base vide pour les tests d'import générique discards 912ce8c Les bases de tests ont été mises à jour, plus besoin d'utiliser l'ancien mécanisme pour récupérer les utilisateurs discards feda4a0 Mise à jour des tests d'import générique discards 1e1adbb Pouvoir lors de l'import générique utiliser des objets obsolètes (partie ui) (See #7909) discards 7d9a05a Pouvoir lors de l'import générique utiliser des objets obsolètes (partie service) (See #7909) discards 5c9c674 Ajout de méthodes sur la persistence pour récupérer des objets obsolètes (See #7909) discards 8eedb54 Changement du niveau de log discards 8d70e7d Renommage des css en jcss -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7909_import_generique_id_obsoletes updated (fa6349e -> 31acffd)
by codelutin.com scm 17 Jan '16

17 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/7909_import_generique_id_obsoletes in repository tutti. See http://git.codelutin.com/tutti.git from fa6349e Correction de la requete pour récupérer les navires obsolètes new 31acffd Correction de la requete pour récupérer les navires obsolètes The 1 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 31acffdb59a40ee03234d618767f39c41c5068c3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Jan 17 18:49:03 2016 +0100 Correction de la requete pour récupérer les navires obsolètes Summary of changes: tutti-persistence/src/main/resources/queries-failsafe.hbm.xml | 1 - 1 file changed, 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/7909_import_generique_id_obsoletes updated (9b20e27 -> fa6349e)
by codelutin.com scm 17 Jan '16

17 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/7909_import_generique_id_obsoletes in repository tutti. See http://git.codelutin.com/tutti.git from 9b20e27 Test d'import de données obsolètes pour les engins, strates new 5f644ac Permettre de récupérer des référentiels obsolètes (See #7909) new 8139a51 Suppresion d'un service obsolète new fa6349e Correction de la requete pour récupérer les navires obsolètes The 3 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 fa6349e9037578b41cb222d3714e234c0b824fdd Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Jan 17 18:36:09 2016 +0100 Correction de la requete pour récupérer les navires obsolètes commit 8139a516c28b1f28437da90118fc817b2d2434c0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Jan 17 17:31:48 2016 +0100 Suppresion d'un service obsolète commit 5f644aced15eaa3bf6196d3fb3f14bfb584198a5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Jan 17 17:02:51 2016 +0100 Permettre de récupérer des référentiels obsolètes (See #7909) Summary of changes: .../service/ReferentialPersistenceService.java | 495 ------- .../service/ReferentialPersistenceServiceImpl.java | 1423 -------------------- .../referential/GearPersistenceServiceImpl.java | 4 +- .../referential/PersonPersistenceServiceImpl.java | 18 +- .../ReferentialPersistenceServiceSupport.java | 11 + .../referential/VesselPersistenceServiceImpl.java | 117 +- .../src/main/resources/queries-failsafe.hbm.xml | 21 +- .../genericFormat/withObsoletes/operation.csv | 2 +- .../genericFormat/withObsoletes/survey.csv | 2 +- 9 files changed, 85 insertions(+), 2008 deletions(-) delete mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java delete mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch feature/7909_import_generique_id_obsoletes created (now 9b20e27)
by codelutin.com scm 17 Jan '16

17 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/7909_import_generique_id_obsoletes in repository tutti. See http://git.codelutin.com/tutti.git at 9b20e27 Test d'import de données obsolètes pour les engins, strates This branch includes the following new commits: new 8d70e7d Renommage des css en jcss new 8eedb54 Changement du niveau de log new 5c9c674 Ajout de méthodes sur la persistence pour récupérer des objets obsolètes (See #7909) new 7d9a05a Pouvoir lors de l'import générique utiliser des objets obsolètes (partie service) (See #7909) new 1e1adbb Pouvoir lors de l'import générique utiliser des objets obsolètes (partie ui) (See #7909) new feda4a0 Mise à jour des tests d'import générique new 912ce8c Les bases de tests ont été mises à jour, plus besoin d'utiliser l'ancien mécanisme pour récupérer les utilisateurs new 3fc6609 Utilisation d'une base vide pour les tests d'import générique new bccde35 Ajout d'un test pour la validation d'import générique avec des données obsolètes (See #7909) new 9b20e27 Test d'import de données obsolètes pour les engins, strates The 10 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 9b20e278c057a618adcd50eb1a6ea437c457d274 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Jan 17 14:08:02 2016 +0100 Test d'import de données obsolètes pour les engins, strates commit 7d9a05a2653d4521115710c9ef4edc14df41b67c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 16 09:48:25 2016 +0100 Pouvoir lors de l'import générique utiliser des objets obsolètes (partie service) (See #7909) commit 1e1adbb60e501007b4cef777b2e5e36f2c5392bf Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 16 10:02:33 2016 +0100 Pouvoir lors de l'import générique utiliser des objets obsolètes (partie ui) (See #7909) commit feda4a0cafe9c073c98c4f7bcf2120374944844d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Jan 17 13:17:49 2016 +0100 Mise à jour des tests d'import générique commit 912ce8ca1e64f02777599a51b624eeb5e341d946 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Jan 17 13:19:02 2016 +0100 Les bases de tests ont été mises à jour, plus besoin d'utiliser l'ancien mécanisme pour récupérer les utilisateurs commit 3fc66097bc6e444f11e1d97f3d101bfd6f2bd008 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Jan 17 13:21:00 2016 +0100 Utilisation d'une base vide pour les tests d'import générique commit bccde3544d77cdd632f309a1bd16e13fe8afb0c1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Jan 17 13:21:28 2016 +0100 Ajout d'un test pour la validation d'import générique avec des données obsolètes (See #7909) commit 5c9c6742907dbd978857baad21691496c3748e5b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 16 09:47:02 2016 +0100 Ajout de méthodes sur la persistence pour récupérer des objets obsolètes (See #7909) commit 8eedb54e924930878d0631ae47e54b7205bd1654 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 16 09:45:50 2016 +0100 Changement du niveau de log commit 8d70e7dbb211b4d0eab3ca6fd016155cfb86e999 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Jan 15 19:38:17 2016 +0100 Renommage des css en jcss -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 10

branch develop updated (ec70ee5 -> a205fc9)
by codelutin.com scm 15 Jan '16

15 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from ec70ee5 Fixes #6116 Merge branch 'feature/6116' into develop adds c3afc48 Utiliser un comparateur de date pour le tri de la liste des opérations (See #7874) adds 20d63c1 Suppression constante inutile adds a205fc9 Merge branch 'feature/7874_tri_sur_les_traits_par_date' into 'develop' No new revisions were added by this update. Summary of changes: .../fr/ifremer/tutti/service/DecoratorService.java | 55 ++++++++++++++++++++-- 1 file changed, 50 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0