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 70ee396 Merge branch 'release/3.10' adds 60987ff [jgitflow-maven-plugin]updating poms for 3.11-SNAPSHOT development adds ddad190 fix test adds de888bd [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 372ce65 Merge branch 'master' into develop adds 3326561 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 63bb4db fixes #6290 [CAPTURE] si je modifie la valeur d'une classe de taille avec une classe de taille qui existe déjà dans le tableau... adds b24f255 fixes #6298 [PROTOCOLE] champ heure à ajouter adds dffa193 fixes #6348: [ERGO] Icônes de l'applicatif adds 432ffe8 remove bad file adds 312c31e update documentation site url adds 1bcc87e improve pom adds 8b04da4 ajout de l'unite de la classe de taille sur l'ecran des especes adds 6c50ed3 ajout de l'unite de la classe de taille sur l'ecran des benthos + fix null unit adds 691280d ajout des tips adds 7597d7a fixes #6369: [CAPTURE] écran mensurations : préciser en face de clas min et class max l'unité (mm ou cm) en fonction du champ "type de mesure" adds 6c9bd2d ajout du comportement pour l'ecran benthos adds cd91569 ajout du comportement pour l'ecran espece adds b602a06 amelioration pour lecran benthos adds c583700 fixes #6370 [MENSURATIONS] empêcher toute modification de la méthode de mensuration et du pas de mesure si il y a au moins une données dans le tableau des mensurations adds 5b82225 remise a plat de l'ecran SpeciesFrequency adds 4b79901 utilisation JTables adds 9aad0ca renommage des actions ecrans Species + formatage adds ac45b23 remise a plat de l'ecran BenthosFrequency adds 411c9e3 fixes #6368 (revue des ecrans de frequences...) adds c7bf398 reformat i18n + code adds a0718de merge rate... adds b8781d4 utilisation de jaxx 2.20 et du nouvel éditeur de nombre adds e49818b merge rate... adds 8191d4a fixes #6371: [TRAIT] Impossible de saisir une coordonnée spatiale négative (megre foire) adds 781a754 utilisation d'un entier pour la distance d'un trait adds 5880725 fix test compile adds 8c5e4e5 fixes #6372: [CAPTURE] harmoniser le comportement de l'écran quand on renseigne le champ nombre à la création d'un lot adds 7bef75c fix test pour distance adds df22c88 ignore a IT test adds dd1800d fix some test (but still one is broken adds 5b136c0 fix pupitri box type adds a03c2d8 fix pupitri tests adds 610d59c fixes #6297: [CAPTURE] si methode au 1/2 cm les mesures du bigfin sont enregistrées au cm adds 832c93e fixes #6297: [CAPTURE] si methode au 1/2 cm les mesures du bigfin sont enregistrées au cm (ameliorer le code) adds a521622 fixes #6375: La suppression dans l'historique des mensurations ne fonctionne pas tout le temps adds 9c750d6 use last jaxx version adds af6f02b prepaere release 3.11 adds 8c3c79c [jgitflow-maven-plugin]updating poms for branch'release/3.11' with non-snapshot versions adds f48e786 Merge branch 'release/3.11' No new revisions were added by this update. Summary of changes: pom.xml | 10 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 2 +- .../{SpeciesBatchs.java => FishingOperations.java} | 25 +- .../FishingOperationPersistenceServiceImpl.java | 4 +- .../tutti/persistence/test/DatabaseFixtures.java | 2 +- .../src/main/xmi/tutti-persistence.zargo | Bin 57983 -> 57987 bytes .../src/main/xmi/tutti-persistence.zargo~ | Bin 57983 -> 0 bytes ...ishingOperationPersistenceServiceWriteTest.java | 2 +- .../ProtocolPersistenceServiceReadTest.java | 2 +- tutti-service/pom.xml | 2 +- .../fr/ifremer/tutti/service/TuttiCsvUtil.java | 24 + .../export/generic/OperationExportModel.java | 2 +- .../service/export/generic/OperationExportRow.java | 2 +- .../operationimport/ImportFromColumnFileModel.java | 81 ++- .../ifremer/tutti/service/ServiceDbResource.java | 27 +- .../multipost/MultiPostImportServiceTest.java | 3 + .../export/generic/TuttiExportServiceTest.java | 8 +- .../protocol/ProtocolImportExportServiceTest.java | 30 +- .../pupitri/PupitriImportServiceAno3898Test.java | 7 +- .../pupitri/PupitriImportServiceAno5032Test.java | 7 +- .../pupitri/PupitriImportServiceAno5079Test.java | 7 +- .../pupitri/PupitriImportServiceEvo5060Test.java | 7 +- .../pupitri/PupitriImportServiceEvo5062Test.java | 7 +- .../pupitri/PupitriImportServiceEvo6149Test.java | 7 +- .../src/test/resources/pupitri/ano-3898.car | 8 +- .../test/resources/pupitri/ano-5079.tuttiProtocol | 1 + tutti-ui-swing/pom.xml | 14 +- .../tutti/ui/swing/action/ShowAboutAction.java | 3 +- .../tutti/ui/swing/content/cruise/EditCruiseUI.css | 4 +- .../ui/swing/content/cruise/EditCruiseUI.jaxx | 2 +- .../content/operation/EditFishingOperationUI.css | 60 +- .../content/operation/EditFishingOperationUI.jaxx | 22 +- .../operation/EditFishingOperationUIHandler.java | 4 +- .../operation/EditFishingOperationUIModel.java | 6 +- .../content/operation/catches/EditCatchesUI.css | 14 +- .../operation/catches/SampleCategoryComponent.java | 16 +- .../accidental/create/CreateAccidentalBatchUI.css | 11 +- .../accidental/create/CreateAccidentalBatchUI.jaxx | 2 +- .../operation/catches/benthos/BenthosBatchUI.css | 10 +- .../catches/benthos/BenthosBatchUIHandler.java | 4 +- .../benthos/create/CreateBenthosBatchUI.css | 11 +- .../benthos/create/CreateBenthosBatchUI.jaxx | 2 +- .../frequency/BenthosFrequencyCellComponent.java | 10 +- .../BenthosFrequencyLogCellComponent.java | 82 ++- .../frequency/BenthosFrequencyLogRowModel.java | 3 + .../frequency/BenthosFrequencyRowModel.java | 2 +- .../frequency/BenthosFrequencyTableModel.java | 264 ++++++-- .../benthos/frequency/BenthosFrequencyUI.css | 82 +-- .../benthos/frequency/BenthosFrequencyUI.jaxx | 205 +++---- .../frequency/BenthosFrequencyUIHandler.java | 644 +++++--------------- .../benthos/frequency/BenthosFrequencyUIModel.java | 252 +++++--- .../frequency/BenthosFrequencyUIModelCache.java | 157 +++++ ...thosFrequencyLengthStepCaracteristicAction.java | 99 +++ .../actions/ApplyBenthosFrequencyRafaleAction.java | 130 ++++ .../actions/CancelEditBenthosFrequencyAction.java | 73 +++ .../DeleteBenthosFrequencyLogRowAction.java | 98 +++ .../GenerateBenthosFrequencyLengthStepsAction.java | 102 ++++ .../actions/ResetBenthosFrequencyAction.java | 67 ++ .../SaveAndCloseBenthosFrequencyAction.java | 79 +++ .../SaveAndContinueBenthosFrequencyAction.java | 73 +++ .../frequency/actions/SaveSupportAction.java | 129 ++++ .../IndividualObservationBatchUI.jaxx | 2 +- .../create/CreateIndividualObservationBatchUI.css | 6 +- .../create/CreateIndividualObservationBatchUI.jaxx | 2 +- .../CreateIndividualObservationBatchUIHandler.java | 6 +- .../catches/marinelitter/MarineLitterBatchUI.css | 6 +- .../create/CreateMarineLitterBatchUI.css | 6 +- .../create/CreateMarineLitterBatchUI.jaxx | 2 +- .../operation/catches/species/SpeciesBatchUI.css | 10 +- .../catches/species/SpeciesBatchUIHandler.java | 4 +- .../species/create/CreateSpeciesBatchUI.css | 13 +- .../species/create/CreateSpeciesBatchUI.jaxx | 2 +- .../frequency/SpeciesFrequencyCellComponent.java | 10 +- .../SpeciesFrequencyLogCellComponent.java | 86 ++- .../frequency/SpeciesFrequencyLogRowModel.java | 5 +- .../frequency/SpeciesFrequencyLogsTableModel.java | 7 - .../frequency/SpeciesFrequencyTableModel.java | 249 ++++++-- .../species/frequency/SpeciesFrequencyUI.css | 83 +-- .../species/frequency/SpeciesFrequencyUI.jaxx | 94 ++- .../frequency/SpeciesFrequencyUIHandler.java | 676 +++++---------------- .../species/frequency/SpeciesFrequencyUIModel.java | 251 +++++--- .../frequency/SpeciesFrequencyUIModelCache.java | 158 +++++ ...ciesFrequencyLengthStepCaracteristicAction.java | 99 +++ .../actions/ApplySpeciesFrequencyRafaleAction.java | 130 ++++ .../actions/CancelEditSpeciesFrequencyAction.java | 73 +++ .../DeleteSpeciesFrequencyLogRowAction.java | 99 +++ .../GenerateSpeciesFrequencyLengthStepsAction.java | 102 ++++ .../actions/ResetSpeciesFrequencyAction.java | 67 ++ .../SaveAndCloseSpeciesFrequencyAction.java | 79 +++ .../SaveAndContinueSpeciesFrequencyAction.java | 73 +++ .../frequency/actions/SaveSupportAction.java | 129 ++++ .../content/protocol/EditProtocolUIHandler.java | 13 +- .../ui/swing/util/AbstractTuttiUIHandler.java | 25 +- .../fr/ifremer/tutti/ui/swing/util/TuttiUI.java | 8 + .../util/computable/ComputableDataEditor.jaxx | 13 +- .../computable/ComputableDataEditorHandler.java | 52 +- .../util/computable/ComputableDataTableCell.java | 19 +- .../ui/swing/util/species/EnterMelagWeightUI.css | 3 +- .../ui/swing/util/species/EnterMelagWeightUI.jaxx | 5 +- .../util/species/EnterMelagWeightUIHandler.java | 2 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 10 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 22 +- .../src/main/resources/icons/allegro_16.png | Bin 0 -> 932 bytes .../src/main/resources/icons/allegro_32.png | Bin 1977 -> 2159 bytes .../src/main/resources/icons/allegro_64.png | Bin 0 -> 5953 bytes tutti-ui-swing/src/main/resources/test.shp | Bin 448188 -> 0 bytes 108 files changed, 3790 insertions(+), 1928 deletions(-) copy tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/{SpeciesBatchs.java => FishingOperations.java} (56%) delete mode 100644 tutti-persistence/src/main/xmi/tutti-persistence.zargo~ create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModelCache.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/AddBenthosFrequencyLengthStepCaracteristicAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/ApplyBenthosFrequencyRafaleAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/CancelEditBenthosFrequencyAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/DeleteBenthosFrequencyLogRowAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/GenerateBenthosFrequencyLengthStepsAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/ResetBenthosFrequencyAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/SaveAndCloseBenthosFrequencyAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/SaveAndContinueBenthosFrequencyAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/SaveSupportAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModelCache.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/AddSpeciesFrequencyLengthStepCaracteristicAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ApplySpeciesFrequencyRafaleAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/CancelEditSpeciesFrequencyAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/DeleteSpeciesFrequencyLogRowAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/GenerateSpeciesFrequencyLengthStepsAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ResetSpeciesFrequencyAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveAndCloseSpeciesFrequencyAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveAndContinueSpeciesFrequencyAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveSupportAction.java create mode 100644 tutti-ui-swing/src/main/resources/icons/allegro_16.png create mode 100644 tutti-ui-swing/src/main/resources/icons/allegro_64.png delete mode 100644 tutti-ui-swing/src/main/resources/test.shp -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.