This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 48b04007c2984568c3ecc5108f8f958396070443 Merge: fe272b9 fc1de39 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 2 11:25:41 2016 +0100 Fixes #8019 Merge branch 'feature/ecran_obs_individuelles' into develop pom.xml | 3 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 8 + .../fr/ifremer/tutti/TuttiConfigurationOption.java | 18 +- .../entities/protocol/TuttiProtocols.java | 4 +- .../persistence/entities/referential/Sexs.java | 21 + .../i18n/tutti-persistence_en_GB.properties | 2 + .../i18n/tutti-persistence_fr_FR.properties | 2 + tutti-ui-swing/src/license/THIRD-PARTY.properties | 2 +- .../filtered-resources/tutti-help-fr.properties | 10 +- .../swing/content/config/TuttiConfigUIHandler.java | 6 + .../operation/FishingOperationsUIHandler.java | 5 +- .../content/operation/catches/EditCatchesUI.jaxx | 34 +- .../content/operation/catches/EditCatchesUI.jcss | 12 - .../operation/catches/EditCatchesUIHandler.java | 105 +-- .../operation/catches/EditCatchesUIModel.java | 11 +- .../catches/FrequencyConfigurationMode.java | 5 +- .../accidental/AccidentalBatchUIHandler.java | 5 +- .../create/CreateBenthosBatchUIHandler.java | 2 +- .../benthos/split/SplitBenthosBatchUIHandler.java | 2 +- .../CopyIndividualObservationMode.java | 10 + .../IndividualObservationBatchTableModel.java | 70 +- .../IndividualObservationBatchUI.jaxx | 97 --- .../IndividualObservationBatchUI.jcss | 106 --- .../IndividualObservationBatchUIHandler.java | 758 ------------------ .../IndividualObservationBatchUIModel.java | 140 ---- ...ExportMultiPostIndividualObservationAction.java | 79 -- ...ImportMultiPostIndividualObservationAction.java | 81 -- ...enCreateIndividualObservationBatchUIAction.java | 57 -- .../RemoveAllIndividualObservationBatchAction.java | 156 ---- .../RemoveIndividualObservationBatchAction.java | 118 --- ...SpeciesForIndividualObservationBatchAction.java | 103 --- .../create/CreateIndividualObservationBatchUI.jaxx | 135 ---- .../create/CreateIndividualObservationBatchUI.jcss | 137 ---- .../CreateIndividualObservationBatchUIHandler.java | 412 ---------- .../CreateIndividualObservationBatchUIModel.java | 290 ------- ...teIndividualObservationBatchAndCloseAction.java | 64 -- ...ndividualObservationBatchAndContinueAction.java | 73 -- ...eateIndividualObservationBatchCancelAction.java | 59 -- .../create/CreateSpeciesBatchUIHandler.java | 2 +- .../frequency/SpeciesFrequencyLogRowModel.java | 11 + .../frequency/SpeciesFrequencyRowModel.java | 71 +- .../frequency/SpeciesFrequencyTableModel.java | 181 +++-- .../species/frequency/SpeciesFrequencyUI.jaxx | 351 +++++---- .../species/frequency/SpeciesFrequencyUI.jcss | 325 +++++--- .../frequency/SpeciesFrequencyUIHandler.java | 866 ++++++++++++++++++--- .../species/frequency/SpeciesFrequencyUIModel.java | 354 ++++++++- .../actions/ApplySpeciesFrequencyRafaleAction.java | 24 +- .../DeleteSpeciesFrequencyLogRowAction.java | 7 + .../frequency/actions/RemoveObservationAction.java | 75 ++ .../actions/ResetSpeciesFrequencyAction.java | 4 +- .../species/split/SplitSpeciesBatchUIHandler.java | 2 +- .../actions/EditFishingOperationAction.java | 3 - .../EditFishingOperationInValidationUIAction.java | 2 - .../ui/swing/util/AbstractTuttiUIHandler.java | 42 +- .../CaracteristicMapCellComponent.java | 2 +- .../CaracteristicMapColumnUIHandler.java | 4 +- .../caracteristics/CaracteristicMapEditorUI.jaxx | 2 +- .../util/table/AbstractTuttiTableUIHandler.java | 20 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 39 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 51 +- .../src/main/resources/icons/action-chart.png | Bin 0 -> 541 bytes 61 files changed, 2172 insertions(+), 3468 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.