This is an automated email from the git hooks/post-receive script. New change to branch master in repository tutti. See http://git.codelutin.com/tutti.git from 43e9096 [jgitflow-maven-plugin]merging 'release/4.5-alpha-1' into 'master' adds dc9b003 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 0882928 [jgitflow-maven-plugin]merging 'master' into 'develop' adds d65d8e3 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds ac9f784 Ajout du batchId sur l'entitié IndividualObservation (See #8023) adds 7560d97 o Modification du modèle pour avoir les identifiants des lots dans les observations individuelles o Amélioration de l'API de persistence pour utiliser les bons types d'identifiants (Integer au lieu de String) o Nettoyage de code (java 8, variables inline, imports non optimisés, variables non utilisées) adds ef6e386 Fixes #8023 Merge branch 'feature/8023' into develop adds 2b01ccc Mise à jour de l'aide en ligne adds 0e085e8 Merge branch 'feature/7962' into develop adds 02e6144 Utilisation d'un vrai drapeau pour savoir si l'utilisateur a bien valider le nouvel intervalle (See #8029) adds ce50730 saut de ligne adds 0ec3e65 Merge branch 'feature/8029' into 'develop' adds 7250846 Changement de l'ordre d'insertion des lignes (See #8033) adds 608eee4 Changement du comparateur de lignes de l'éditeur de prélèvement des pièces calcifiées (See #8033) adds 488b08a Merge branch 'feature/8033' into 'develop' adds c21f7d2 Ajout d'un hightlighter pour grouper et alterner la couleur de fond pour les espèces (See #8035) adds 2d3f169 Mise en évidence des lignes à ne pas prélever (Fixes #8036) adds 4dd6d6f redefinition des highlighters des alternances de couleurs (fixes #8035) adds e7336eb Merge branch 'feature/8035' into 'develop' adds 7ced401 Suppression de plusieurs espèces (See #8034) adds fe272b9 Merge branch 'feature/8034' into 'develop' adds efe93eb début de réarrangement de l'écran des mensurations refs #6926 adds 7c6650e mise en page de l'écran refs #6926 adds 16b3d9d - use jaxx 2.29-SNAPSHOT - correction du mode de config à l'ouverture de l'écran - ajout de useRTP dans le modele refs #6926 adds 21cb702 ajout du model de colonnes de la table des observations (refs #6926) adds 4e8e103 organize imports adds d47fd99 activtation ou desactivation de cellules de la tables des mensurations en fonction du mode de copie (refs #6926) adds 22363b2 - suppression de l'onglet observations individuelles dans la capture - ajout des lignes dans la table d'obs individuelles dans les mensurations (refs #8019) adds 9317d63 affichage de l'histogramme dans une popup (refs #8019) adds 1bf50ad utilisation des rtp pour calculer les poids des lignes de mensuration (refs #8019) adds b9eb3c4 vérification que le poids saisi est proche du poids calculé avec la RTP (refs #8019) adds 6188e68 une seule popup pour l'histogramme pour pouvoir la fermer quand on quitte (refs #8019) adds 78e54f6 titre de la popup de l'histogramme (refs #8019) adds e7863a8 graph des poids moyens (refs #8019) adds 7e77962 ajout d'une ligne d'observation individuelle quand on ajoute en rafale (refs #8019) adds dbcbb41 - ajout du numéro de l'observation - suppression d'observations refs #8019 adds bad7ac5 use lanbdas where possible adds ac1e009 - copie des donnees d'observation individuelles dans le tableau des mensurations en fonction du mode - suppression ou ecrasement des données au changement de mode de copie refs #8019 adds 0b0fe18 - suppression des lignes d'observations individuelles sur - correction de l'affichage de l'histogramme des mensurations refs #8019 adds 4488081 remplissage des lignes vides lors de l'ajout en rafale (refs #8019) adds ba542e5 correction de l'incrément des lignes quand on quitte et revient sur l'ecran des mensurations (refs #8019) adds 3af74a6 suppression des lignes d'observation individuelles générées en rafale quand on supprime le log correspondant (refs #8019) adds d26a5b9 - validation des lignes d'observations - correction de l'ouverture de l'editeur de caracteristiques refs #8019 adds 6b129ec Ne pas utiliser adagio dans les ui adds fc1de39 Fix merge adds 48b0400 Fixes #8019 Merge branch 'feature/ecran_obs_individuelles' into develop adds 820547c Amélioration des états des actions sur la page d'accueil (See #8039) adds 72d58ad desactivation de la combo pendant la modif des actions (fixes #8039) adds 317b45a ajout constante (fixes #8039) adds e744cc3 Merge branch 'feature/8039' into 'develop' adds c151735 ajout d'un try/finally pour etre plus safe adds cfc9425 on reset le mode de copie à l'ouverture de l'écran, sinon on ne voit pas les mensurations si le mode était en copie sur le batch précédent (refs #8023) adds 7b9d5b3 - ajout de la persistence (manque les pj) - conversion des lignes du modele en entités (et inversement) - correction de l'unité des poids copié du tableau des observations quand les unités sont différentes refs #8023 adds 48ec300 Calcul du rankOrder adds b0fc79d Renommage du paramètre speciesBatchId en batchId adds cafc1ef Ajout d'une requete pour juste récupérer les ids des observations individuelles (aucun interet de tout reconstruire à ce niveau) adds edb472e Nettoyage et optimisation du code de persistence adds 528cca8 Fixes #8023 Merge branch 'feature/8023_suite' into develop adds cb2804f Back to stable jaxx version adds b740481 Use codelutinpom 8.1 adds 6a4f4c9 [jgitflow-maven-plugin]updating poms for 4.5-alpha-2 branch with snapshot versions adds 7b050c7 Add missing license headers adds e8a2451 [jgitflow-maven-plugin]updating poms for branch'release/4.5-alpha-2' with non-snapshot versions adds 837d5f8 [jgitflow-maven-plugin]merging 'release/4.5-alpha-2' into 'master' No new revisions were added by this update. Summary of changes: pom.xml | 8 +- tutti-ichtyometer/pom.xml | 2 +- .../ichtyometer/interactive/CommandEngine.java | 6 +- .../tutti/ichtyometer/tool/FeedReaderTool.java | 49 +- .../tutti/ichtyometer/tool/SendCommandTool.java | 37 +- .../java/fr/ifremer/tutti/ichtyometer/BigFins.java | 19 +- .../tutti/ichtyometer/feed/FeedReaderTest.java | 9 +- tutti-persistence/pom.xml | 2 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 76 +- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 20 +- .../tutti/persistence/TuttiPersistence.java | 4 +- .../tutti/persistence/TuttiPersistenceImpl.java | 140 ++- .../persistence/TuttiPersistenceNoDbImpl.java | 97 +- .../persistence/dao/TaxonNameDaoTuttiImpl.java | 9 +- .../tutti/persistence/entities/TuttiEntities.java | 35 +- .../tutti/persistence/entities/data/Cruises.java | 16 +- .../entities/data/FishingOperations.java | 9 +- .../tutti/persistence/entities/data/Programs.java | 17 +- .../persistence/entities/data/SampleCategory.java | 2 +- .../entities/data/SampleCategoryModel.java | 3 +- .../entities/data/SpeciesAbleBatchs.java | 3 +- .../persistence/entities/data/SpeciesBatchs.java | 8 +- .../entities/protocol/SpeciesProtocols.java | 8 +- .../entities/protocol/TuttiProtocols.java | 22 +- .../entities/protocol/v1/TuttiProtocolBean1.java | 75 +- .../entities/protocol/v2/TuttiProtocolBean2.java | 102 +- .../entities/protocol/v3/SpeciesProtocolBean3.java | 34 +- .../entities/protocol/v3/TuttiProtocolBean3.java | 136 +-- .../persistence/entities/referential/Gears.java | 44 +- .../persistence/entities/referential/Persons.java | 14 +- .../{TuttiReferentialEntities.java => Sexs.java} | 19 +- .../persistence/entities/referential/Speciess.java | 76 +- .../entities/referential/TaxonCache.java | 6 +- .../entities/referential/TaxonCaches.java | 12 +- .../entities/referential/TuttiLocations.java | 32 +- .../persistence/entities/referential/Vessels.java | 52 +- .../tutti/persistence/model/DataModelSupport.java | 5 + .../persistence/model/OperationDataModel.java | 11 +- .../service/AbstractPersistenceService.java | 62 +- .../service/AccidentalBatchPersistenceService.java | 6 +- .../AccidentalBatchPersistenceServiceImpl.java | 8 +- .../service/AttachmentPersistenceServiceImpl.java | 10 +- .../service/BenthosBatchPersistenceService.java | 21 +- .../BenthosBatchPersistenceServiceImpl.java | 40 +- .../service/CatchBatchPersistenceService.java | 8 +- .../service/CatchBatchPersistenceServiceImpl.java | 16 +- .../service/CruisePersistenceService.java | 6 +- .../service/CruisePersistenceServiceImpl.java | 40 +- .../FishingOperationPersistenceService.java | 12 +- .../FishingOperationPersistenceServiceImpl.java | 66 +- ...dividualObservationBatchPersistenceService.java | 18 +- ...dualObservationBatchPersistenceServiceImpl.java | 321 ++++--- .../MarineLitterBatchPersistenceService.java | 6 +- .../MarineLitterBatchPersistenceServiceImpl.java | 14 +- .../service/ProgramPersistenceServiceImpl.java | 16 +- .../service/ProtocolPersistenceServiceImpl.java | 11 +- .../service/SpeciesBatchPersistenceService.java | 21 +- .../SpeciesBatchPersistenceServiceImpl.java | 46 +- .../service/TechnicalPersistenceServiceImpl.java | 3 +- .../service/TuttiPersistenceServiceLocator.java | 6 +- .../CaracteristicPersistenceServiceImpl.java | 42 +- .../referential/GearPersistenceServiceImpl.java | 6 +- .../ObjectTypePersistenceServiceImpl.java | 3 +- .../referential/PersonPersistenceServiceImpl.java | 6 +- .../ReferentialPersistenceServiceSupport.java | 6 +- .../referential/SpeciesPersistenceServiceImpl.java | 3 +- .../service/util/BatchPersistenceHelper.java | 78 +- .../persistence/service/util/BatchTreeHelper.java | 3 +- .../service/util/MeasurementPersistenceHelper.java | 3 +- .../service/util/SynchronizationStatusHelper.java | 2 +- .../tutti/persistence/test/DatabaseFixtures.java | 35 +- .../main/java/fr/ifremer/tutti/util/Numbers.java | 3 +- .../main/java/fr/ifremer/tutti/util/Weights.java | 3 +- .../i18n/tutti-persistence_en_GB.properties | 2 + .../i18n/tutti-persistence_fr_FR.properties | 2 + .../src/main/resources/queries-failsafe.hbm.xml | 36 +- .../src/main/xmi/tutti-persistence.zargo | Bin 62284 -> 62341 bytes .../config/TuttiPersistenceConfigTest.java | 3 +- ...AccidentalBatchPersistenceServiceWriteTest.java | 60 +- .../BenthosBatchPersistenceServiceReadTest.java | 10 +- .../BenthosBatchPersistenceServiceWriteTest.java | 46 +- .../CatchBatchPersistenceServiceReadTest.java | 2 +- .../CatchBatchPersistenceServiceWriteTest.java | 20 +- .../service/CruisePersistenceServiceReadTest.java | 2 +- .../service/CruisePersistenceServiceWriteTest.java | 6 +- ...hingOperationPersistenceServiceAno4995Test.java | 5 +- ...ishingOperationPersistenceServiceWriteTest.java | 17 +- ...bservationBatchPersistenceServiceWriteTest.java | 239 +++-- ...rineLitterBatchPersistenceServiceWriteTest.java | 16 +- .../SpeciesBatchPersistenceServiceReadTest.java | 10 +- .../SpeciesBatchPersistenceServiceWriteTest.java | 42 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../tutti/service/AbstractTuttiService.java | 37 +- .../fr/ifremer/tutti/service/DecoratorService.java | 7 +- .../ifremer/tutti/service/PersistenceService.java | 136 ++- .../fr/ifremer/tutti/service/TuttiDataContext.java | 96 +- .../fr/ifremer/tutti/service/TuttiDecorator.java | 8 +- .../ifremer/tutti/service/TuttiServiceContext.java | 6 +- .../ifremer/tutti/service/ValidationService.java | 54 +- .../tutti/service/bigfin/BigfinImportContext.java | 37 +- .../tutti/service/bigfin/BigfinImportService.java | 33 +- .../service/bigfin/csv/BigfinDataRowModel.java | 3 +- .../fr/ifremer/tutti/service/bigfin/signs/Sex.java | 8 +- .../ifremer/tutti/service/bigfin/signs/Size.java | 8 +- .../tutti/service/bigfin/signs/VracHorsVrac.java | 8 +- .../catches/ValidateCruiseOperationsService.java | 34 +- .../service/catches/WeightCleaningService.java | 50 +- .../service/catches/WeightComputingService.java | 13 +- .../catches/multipost/AttachmentRowModel.java | 9 +- .../catches/multipost/MultiPostExportService.java | 18 +- .../catches/multipost/MultiPostImportService.java | 513 +++++----- .../csv/AbstractTuttiImportExportModel.java | 4 +- .../service/csv/AbstractTuttiImportModel.java | 4 +- .../fr/ifremer/tutti/service/csv/CsvComsumer.java | 6 +- .../tutti/service/csv/GearParserFormatter.java | 3 +- .../tutti/service/csv/HarbourParserFormatter.java | 3 +- .../service/csv/IntegerListParserFormatter.java | 9 +- .../fr/ifremer/tutti/service/csv/TuttiCsvUtil.java | 29 +- .../tutti/service/csv/VesselParserFormatter.java | 3 +- .../tutti/service/export/ExportBatchEntry.java | 3 +- .../tutti/service/export/ExportCatchContext.java | 28 +- .../export/pdf/CatchesPdfExportService.java | 13 +- .../sumatra/CatchesSumatraExportService.java | 16 +- .../ToConfirmReportFishingOperationData.java | 2 +- .../toconfirmreport/ToConfirmReportService.java | 21 +- .../genericformat/GenericFormatArchive.java | 13 +- .../GenericFormatCheckDataService.java | 14 +- .../genericformat/GenericFormatContextSupport.java | 57 +- .../genericformat/GenericFormatExportContext.java | 21 +- .../GenericFormatExportOperationContext.java | 10 +- .../genericformat/GenericFormatExportService.java | 25 +- .../GenericFormatImportCruiseContext.java | 18 +- .../GenericFormatImportOperationContext.java | 13 +- .../genericformat/GenericFormatImportService.java | 60 +- .../GenericFormatImportValidationHelper.java | 9 +- .../genericformat/GenericFormatResultSupport.java | 3 +- .../GenericFormatValidateFileContext.java | 60 +- .../GenericformatImportPersistenceHelper.java | 46 +- .../consumer/CruiseNotValidException.java | 3 +- .../consumer/CsvConsumerForCatch.java | 10 +- .../FishingOperationNotValidException.java | 3 +- .../genericformat/csv/AccidentalCatchModel.java | 3 +- .../service/genericformat/csv/AttachmentModel.java | 3 +- .../service/genericformat/csv/CatchModel.java | 12 +- .../tutti/service/genericformat/csv/CatchRow.java | 3 +- .../genericformat/csv/GearCaracteristicModel.java | 3 +- .../csv/IndividualObservationModel.java | 3 +- .../genericformat/csv/MarineLitterModel.java | 3 +- .../service/genericformat/csv/OperationModel.java | 3 +- .../service/genericformat/csv/ParameterModel.java | 3 +- .../genericformat/csv/SpeciesExportModel.java | 3 +- .../service/genericformat/csv/SurveyModel.java | 3 +- .../exportactions/CreateCatchBatchRowsAction.java | 3 +- .../ExportGearCaracteristicAction.java | 2 +- .../exportactions/LoadDataAction.java | 4 +- .../importactions/DoCheckWeightAction.java | 18 +- .../importactions/DoCleanWeightAction.java | 18 +- .../importactions/ImportAccidentalCatchAction.java | 2 +- .../importactions/ImportCatchAction.java | 16 +- .../ImportGearCaracteristicAction.java | 25 +- .../ImportIndividualObservationAction.java | 8 +- .../importactions/ImportMarineLitterAction.java | 2 +- .../importactions/ImportOperationAction.java | 55 +- .../importactions/ImportParameterAction.java | 60 +- .../ImportReferentialPersonAction.java | 1 - .../ImportReferentialVesselAction.java | 1 - .../importactions/ImportSurveyAction.java | 2 +- .../importactions/RestoreAfterImportAction.java | 14 +- .../importactions/RestoreAfterValidateAction.java | 62 +- .../importactions/ValidateSurveyAction.java | 2 +- .../producer/CsvProducerForCatch.java | 4 +- .../producer/CsvProducerForSpecies.java | 8 +- .../FishingOperationImportService.java | 8 +- .../operationimport/ImportFromColumnFileModel.java | 67 +- .../protocol/ProtocolImportExportService.java | 23 +- .../service/psionimport/PsionImportModel.java | 3 +- .../service/psionimport/PsionImportService.java | 8 +- .../service/pupitri/PupitriExportService.java | 10 +- .../service/pupitri/PupitriImportService.java | 8 +- .../service/pupitri/PupitriSpeciesContext.java | 3 +- .../tutti/service/pupitri/csv/CarrouselRow.java | 3 +- .../pupitri/report/PupitriImportReportModel.java | 6 +- .../referential/ReferentialImportRequest.java | 4 +- .../ReferentialTemporaryGearService.java | 6 +- .../ReferentialTemporaryPersonService.java | 6 +- .../ReferentialTemporarySpeciesService.java | 3 +- .../ReferentialTemporaryVesselService.java | 3 +- .../TuttiReferentialSynchronizeService.java | 3 +- .../tutti/service/referential/csv/PersonRow.java | 3 +- .../producer/CsvProducerForTemporaryGear.java | 10 +- .../producer/CsvProducerForTemporaryPerson.java | 10 +- .../producer/CsvProducerForTemporarySpecies.java | 10 +- .../producer/CsvProducerForTemporaryVessel.java | 10 +- .../service/report/ReportGenerationRequest.java | 12 +- .../service/report/ReportGenerationResult.java | 4 +- .../service/report/ReportGenerationService.java | 16 +- .../tutti/service/PersistenceServiceTest.java | 94 +- .../ifremer/tutti/service/ServiceDbResource.java | 49 +- .../service/bigfin/BigfinImportService2Test.java | 8 +- .../service/bigfin/BigfinImportServiceTest.java | 12 +- .../catches/WeightComputingServiceTest.java | 16 +- .../multipost/MultiPostExportServiceTest.java | 6 +- .../multipost/MultiPostImportServiceTest.java | 2 +- .../export/pdf/CatchesPdfExportServiceTest.java | 4 +- .../sumatra/CatchesSumatraExportServiceTest.java | 12 +- .../GenericFormatExportServiceAno5804Test.java | 10 +- .../GenericFormatExportServiceAno7992Test.java | 10 +- .../GenericFormatExportServiceTest.java | 10 +- .../psionimport/PsionImportServiceTest.java | 40 +- .../pupitri/PupitriImportServiceAno3898Test.java | 6 +- .../pupitri/PupitriImportServiceAno5032Test.java | 6 +- .../pupitri/PupitriImportServiceAno5079Test.java | 6 +- .../pupitri/PupitriImportServiceEvo5060Test.java | 6 +- .../pupitri/PupitriImportServiceEvo5062Test.java | 6 +- .../pupitri/PupitriImportServiceEvo6116Test.java | 6 +- .../pupitri/PupitriImportServiceEvo6149Test.java | 6 +- .../pupitri/PupitriImportServiceEvo6592Test.java | 6 +- .../service/pupitri/PupitriImportServiceTest.java | 10 +- .../pupitri/PupitryImportServiceTestSupport.java | 6 +- .../ReferentialTemporarySpeciesServiceTest.java | 2 +- .../report/ReportGenerationServiceTest.java | 4 +- tutti-ui-swing-updater/pom.xml | 2 +- .../tutti/ui/swing/updater/UpdateModule.java | 3 +- .../ui/swing/updater/UpdaterFileSystemPathes.java | 24 +- tutti-ui-swing/pom.xml | 2 +- tutti-ui-swing/src/license/THIRD-PARTY.properties | 2 +- .../filtered-resources/tutti-help-fr.properties | 10 +- tutti-ui-swing/src/main/help/fr/config.html | 60 +- .../src/main/help/fr/editFishingOperation.html | 137 ++- tutti-ui-swing/src/main/help/fr/selectCruise.html | 2 +- .../java/fr/ifremer/tutti/ui/swing/RunTutti.java | 7 +- .../ifremer/tutti/ui/swing/TuttiActionFactory.java | 3 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 35 +- .../content/actions/ConnectIchtyometerAction.java | 33 +- .../EditCatchesForSelectedCruiseAction.java | 23 +- .../OpenTemporaryReferentialScreenAction.java | 7 +- .../ui/swing/content/actions/ShowAboutAction.java | 48 +- .../category/EditSampleCategoryModelUIHandler.java | 27 +- .../actions/AddSampleCategoryRowAction.java | 11 +- .../swing/content/config/TuttiConfigUIHandler.java | 43 +- .../swing/content/cruise/EditCruiseUIHandler.java | 54 +- .../cruise/GearCaracteristicsEditorTableModel.java | 3 +- .../cruise/GearCaracteristicsEditorUIHandler.java | 23 +- .../actions/EditGearCaracteristicsAction.java | 4 +- .../content/cruise/actions/SaveCruiseAction.java | 4 +- .../actions/ViewGearCaracteristicsAction.java | 4 +- .../ui/swing/content/db/DbManagerUIHandler.java | 34 +- .../genericformat/tree/ProgramSelectTreeNode.java | 5 +- .../ui/swing/content/home/SelectCruiseUI.jcss | 6 +- .../swing/content/home/SelectCruiseUIHandler.java | 160 +-- .../content/home/actions/CloneProtocolAction.java | 2 +- .../content/home/actions/EditCatchesAction.java | 23 +- .../content/home/actions/EditProtocolAction.java | 2 +- .../home/actions/ExportCruiseForSumatraAction.java | 2 +- .../home/actions/SendCruiseReportAction.java | 2 +- .../SpeciesToConfirmReportForCruiseAction.java | 2 +- .../operation/EditFishingOperationUIHandler.java | 200 ++-- .../operation/EditFishingOperationUIModel.java | 3 +- .../operation/FishingOperationsUIHandler.java | 123 ++- .../operation/FishingOperationsUIModel.java | 10 +- .../catches/AbstractTuttiBatchTableUIHandler.java | 44 +- .../content/operation/catches/CatchCustomTab.java | 13 +- .../operation/catches/EditCatchesSvgHandler.java | 330 +++---- .../content/operation/catches/EditCatchesUI.jaxx | 34 +- .../content/operation/catches/EditCatchesUI.jcss | 12 - .../operation/catches/EditCatchesUIHandler.java | 109 +-- .../operation/catches/EditCatchesUIModel.java | 35 +- .../catches/FrequencyConfigurationMode.java | 5 +- .../catches/MultiPostImportLogDialogHandler.java | 5 - .../catches/SampleCategoryColumnIdentifier.java | 15 +- .../operation/catches/SampleCategoryComponent.java | 26 +- .../catches/SpeciesAbleBatchRowHelper.java | 5 +- .../operation/catches/SpeciesBatchDecorator.java | 2 +- .../accidental/AccidentalBatchTableModel.java | 9 +- .../accidental/AccidentalBatchUIHandler.java | 10 +- .../actions/CancelEditCatchBatchAction.java | 12 +- .../catches/actions/CleanBatchWeightsAction.java | 4 +- .../catches/actions/ComputeBatchWeightsAction.java | 4 +- .../ExportFishingOperationForSumatraAction.java | 4 +- .../ExportFishingOperationReportAction.java | 2 +- .../actions/ExportMultiPostActionSupport.java | 3 +- .../actions/ExportMultiPostCatchAction.java | 3 +- .../actions/ImportMultiPostActionSupport.java | 3 +- .../actions/ImportMultiPostCatchAction.java | 6 +- .../catches/benthos/BenthosBatchRowModel.java | 17 +- .../catches/benthos/BenthosBatchUIHandler.java | 175 ++-- .../benthos/actions/CreateBenthosMelagAction.java | 10 +- .../actions/ImportMultiPostBenthosAction.java | 3 +- .../OpenEditBenthosBatchFrequencyUIAction.java | 5 - .../benthos/actions/RemoveBenthosBatchAction.java | 6 +- .../actions/RemoveBenthosSubBatchAction.java | 2 +- .../benthos/actions/RenameBenthosBatchAction.java | 2 +- .../create/CreateBenthosBatchUIHandler.java | 2 +- .../benthos/create/CreateBenthosBatchUIModel.java | 6 +- .../CreateBenthosBatchAndFrequenciesAction.java | 1 - .../frequency/BenthosFrequencyCellComponent.java | 1 - .../frequency/BenthosFrequencyLogsTableModel.java | 3 +- .../frequency/BenthosFrequencyRowModel.java | 3 +- .../frequency/BenthosFrequencyTableModel.java | 108 +-- .../frequency/BenthosFrequencyUIHandler.java | 92 +- .../benthos/frequency/BenthosFrequencyUIModel.java | 5 +- .../frequency/BenthosFrequencyUIModelCache.java | 7 +- ...thosFrequencyLengthStepCaracteristicAction.java | 2 +- .../benthos/split/SplitBenthosBatchRowModel.java | 6 +- .../benthos/split/SplitBenthosBatchUIHandler.java | 10 +- .../CopyIndividualObservationMode.java} | 10 +- .../IndividualObservationBatchRowModel.java | 92 +- .../IndividualObservationBatchTableModel.java | 78 +- .../IndividualObservationBatchUI.jaxx | 97 -- .../IndividualObservationBatchUI.jcss | 106 -- .../IndividualObservationBatchUIHandler.java | 759 --------------- .../IndividualObservationBatchUIModel.java | 141 --- ...ExportMultiPostIndividualObservationAction.java | 79 -- ...ImportMultiPostIndividualObservationAction.java | 81 -- ...enCreateIndividualObservationBatchUIAction.java | 62 -- .../RemoveAllIndividualObservationBatchAction.java | 156 --- .../RemoveIndividualObservationBatchAction.java | 118 --- ...SpeciesForIndividualObservationBatchAction.java | 103 -- .../create/CreateIndividualObservationBatchUI.jaxx | 135 --- .../create/CreateIndividualObservationBatchUI.jcss | 137 --- .../CreateIndividualObservationBatchUIHandler.java | 438 --------- .../CreateIndividualObservationBatchUIModel.java | 290 ------ ...teIndividualObservationBatchAndCloseAction.java | 64 -- ...ndividualObservationBatchAndContinueAction.java | 73 -- ...eateIndividualObservationBatchCancelAction.java | 59 -- .../marinelitter/MarineLitterBatchUIHandler.java | 5 +- .../actions/ImportMultiPostMarineLitterAction.java | 3 +- .../OpenCreateMarineLitterBatchUIAction.java | 5 - .../actions/RemoveMarineLitterBatchAction.java | 7 +- .../create/CreateMarineLitterBatchUIModel.java | 6 +- .../ImportPupitriMelagWeightPopupUIHandler.java | 5 - .../ImportPupitriMelagWeightPopupUIModel.java | 2 +- .../species/ImportPupitriPopupUIHandler.java | 18 +- .../catches/species/SpeciesBatchRowModel.java | 49 +- .../catches/species/SpeciesBatchUIHandler.java | 217 ++--- .../actions/ImportMultiPostSpeciesAction.java | 3 +- .../actions/OpenCreateSpeciesBatchUIAction.java | 5 - .../OpenEditSpeciesBatchFrequencyUIAction.java | 5 - .../species/actions/RemoveSpeciesBatchAction.java | 6 +- .../actions/RemoveSpeciesSubBatchAction.java | 2 +- .../species/actions/RenameSpeciesBatchAction.java | 2 +- .../create/CreateSpeciesBatchUIHandler.java | 2 +- .../species/create/CreateSpeciesBatchUIModel.java | 6 +- .../frequency/SpeciesFrequencyCellComponent.java | 22 +- .../frequency/SpeciesFrequencyLogRowModel.java | 11 + .../frequency/SpeciesFrequencyLogsTableModel.java | 3 +- .../frequency/SpeciesFrequencyRowModel.java | 74 +- .../frequency/SpeciesFrequencyTableModel.java | 87 +- .../species/frequency/SpeciesFrequencyUI.jaxx | 351 ++++--- .../species/frequency/SpeciesFrequencyUI.jcss | 325 +++++-- .../frequency/SpeciesFrequencyUIHandler.java | 1015 ++++++++++++++++---- .../species/frequency/SpeciesFrequencyUIModel.java | 383 +++++++- .../frequency/SpeciesFrequencyUIModelCache.java | 7 +- ...ciesFrequencyLengthStepCaracteristicAction.java | 2 +- .../actions/ApplySpeciesFrequencyRafaleAction.java | 24 +- .../DeleteSpeciesFrequencyLogRowAction.java | 7 + .../frequency/actions/RemoveObservationAction.java | 99 ++ .../actions/ResetSpeciesFrequencyAction.java | 4 +- .../species/split/SplitSpeciesBatchRowModel.java | 6 +- .../species/split/SplitSpeciesBatchUIHandler.java | 10 +- .../fishing/AbstractCaracteristicRowModel.java | 10 +- .../fishing/AbstractCaracteristicTabUIModel.java | 6 +- .../fishing/GearUseFeatureTabUIHandler.java | 7 - .../fishing/GearUseFeatureTableModel.java | 3 +- .../fishing/VesselUseFeatureTabUIHandler.java | 7 - .../fishing/VesselUseFeatureTableModel.java | 3 +- .../actions/DeleteFishingOperationAction.java | 2 +- .../actions/EditFishingOperationAction.java | 68 +- ...perationCaracteristicsFromColumnFileAction.java | 11 +- .../content/program/EditProgramUIHandler.java | 3 +- .../EditProtocolCaracteristicsRowModel.java | 2 +- .../protocol/EditProtocolSpeciesRowModel.java | 36 +- .../protocol/EditProtocolSpeciesTableModel.java | 25 +- .../content/protocol/EditProtocolUIHandler.java | 3 +- .../content/protocol/EditProtocolUIModel.java | 24 +- .../MandatorySampleCategoryColumnIdentifier.java | 3 +- .../actions/ExportProtocolBenthosAction.java | 14 +- .../actions/ExportProtocolSpeciesAction.java | 12 +- .../protocol/actions/ExportPupitriAction.java | 16 +- .../actions/ImportProtocolBenthosAction.java | 2 +- .../actions/ImportProtocolSpeciesAction.java | 2 +- .../actions/RemoveCaracteristicMappingAction.java | 6 +- .../CalcifiedPiecesSamplingEditorRowModel.java | 10 +- .../CalcifiedPiecesSamplingEditorTableModel.java | 24 + .../CalcifiedPiecesSamplingEditorUI.jcss | 2 +- .../CalcifiedPiecesSamplingEditorUIHandler.java | 184 +++- .../MinSizePopupUIHandler.java | 8 +- .../MinSizePopupUIModel.java | 13 + .../actions/AddSpeciesAction.java | 10 +- .../actions/DeleteRowAction.java | 8 +- .../actions/DeleteSpeciesAction.java | 70 +- .../actions/ExportProtocolCpsAction.java | 3 +- .../actions/ImportProtocolCpsAction.java | 5 +- .../actions/SplitSpeciesAction.java | 9 +- .../ui/swing/content/protocol/rtp/RtpButton.java | 23 +- .../content/protocol/rtp/RtpCellRenderer.java | 5 - .../content/protocol/rtp/RtpEditorUIHandler.java | 22 +- .../protocol/zones/actions/AddStratasAction.java | 5 - .../protocol/zones/actions/CreateZoneAction.java | 5 - .../protocol/zones/actions/DeleteZoneAction.java | 5 - .../protocol/zones/actions/RenameZoneAction.java | 5 - .../zones/tree/AbstractZoneEditorTreeModel.java | 6 - .../protocol/zones/tree/StratasTreeModel.java | 7 +- .../protocol/zones/tree/ZoneEditorNode.java | 6 - .../zones/tree/ZoneEditorTreeCellRenderer.java | 5 - .../protocol/zones/tree/ZonesTreeModel.java | 2 +- .../actions/ImportTemporaryGearAction.java | 6 +- .../actions/ImportTemporaryPersonAction.java | 6 +- .../actions/ImportTemporarySpeciesAction.java | 6 +- .../actions/ImportTemporaryVesselAction.java | 6 +- .../actions/OpenReplaceTemporaryGearUIAction.java | 3 +- .../OpenReplaceTemporaryPersonUIAction.java | 3 +- .../OpenReplaceTemporarySpeciesUIAction.java | 3 +- .../OpenReplaceTemporaryVesselUIAction.java | 3 +- .../ui/swing/content/report/ReportUIHandler.java | 2 +- .../ui/swing/content/report/ReportUIModel.java | 10 +- .../validation/ValidateCruiseUIHandler.java | 4 +- .../content/validation/ValidateCruiseUIModel.java | 4 +- .../EditFishingOperationInValidationUIAction.java | 2 - .../actions/SaveCruiseToReadyToSynchAction.java | 6 +- .../content/validation/tree/MessageTreeNode.java | 6 +- .../fr/ifremer/tutti/ui/swing/update/Updates.java | 3 +- .../ui/swing/update/module/DbModuleUpdater.java | 12 +- .../ui/swing/util/AbstractTuttiUIHandler.java | 162 ++-- .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 12 +- .../ui/swing/util/actions/SimpleActionSupport.java | 12 +- .../ui/swing/util/attachment/ButtonAttachment.java | 14 +- .../CaracteristicMapCellComponent.java | 5 +- .../CaracteristicMapColumnUIHandler.java | 4 +- .../CaracteristicMapEditorTableModel.java | 3 +- .../caracteristics/CaracteristicMapEditorUI.jaxx | 2 +- .../caracteristics/CaracteristicValueEditor.java | 3 +- .../computable/ComputableDataEditorHandler.java | 36 +- .../util/computable/ComputableDataTableCell.java | 16 +- .../swing/util/editor/TuttiLocationTableCell.java | 2 +- .../ui/swing/util/editor/VesselTableCell.java | 2 +- .../swing/util/species/SelectSpeciesUIHandler.java | 9 +- .../util/table/AbstractTuttiTableUIHandler.java | 33 +- .../util/table/CaracteristicColumnIdentifier.java | 3 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 47 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 65 +- .../src/main/resources/icons/action-chart.png | Bin 0 -> 541 bytes 443 files changed, 6129 insertions(+), 8464 deletions(-) copy tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/{TuttiReferentialEntities.java => Sexs.java} (60%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{BatchSavedListener.java => individualobservation/CopyIndividualObservationMode.java} (79%) delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jcss delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/actions/ExportMultiPostIndividualObservationAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/actions/ImportMultiPostIndividualObservationAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/actions/OpenCreateIndividualObservationBatchUIAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/actions/RemoveAllIndividualObservationBatchAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/actions/RemoveIndividualObservationBatchAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/actions/SelectSpeciesForIndividualObservationBatchAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.jaxx delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.jcss delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/actions/CreateIndividualObservationBatchAndCloseAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/actions/CreateIndividualObservationBatchAndContinueAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/actions/CreateIndividualObservationBatchCancelAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/RemoveObservationAction.java create mode 100644 tutti-ui-swing/src/main/resources/icons/action-chart.png -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.