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 6a1d15888b8367bc3a9e6651ad8fcff3612ed9a5 Merge: 771ce24 5c11dd5 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 24 14:30:07 2015 +0100 [jgitflow-maven-plugin]merging 'release/4.2-rc-2' into 'master' pom.xml | 6 +- src/site/site_fr.xml | 3 - tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../tutti/persistence/TuttiPersistenceImpl.java | 5 + .../persistence/TuttiPersistenceNoDbImpl.java | 6 + .../service/ProtocolPersistenceServiceImpl.java | 1 + .../service/ReferentialPersistenceService.java | 8 +- .../referential/SpeciesPersistenceService.java | 18 +- .../referential/SpeciesPersistenceServiceImpl.java | 51 +++++- .../resources/applicationContext-service-tutti.xml | 4 + .../src/main/xmi/tutti-persistence.zargo | Bin 58384 -> 58480 bytes tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../fr/ifremer/tutti/service/DecoratorService.java | 42 +++-- .../ifremer/tutti/service/PersistenceService.java | 6 +- ...enericFormatReferentialSpeciesImportResult.java | 19 +- .../GenericformatImportPersistenceHelper.java | 5 + .../ImportReferentialSpeciesAction.java | 4 + .../tutti/service/DecoratorServiceTest.java | 9 + tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../src/main/filtered-resources/log4j.properties | 6 +- .../filtered-resources/tutti-help-fr.properties | 26 ++- .../EditCatchesForSelectedCruiseAction.java | 34 ++++ .../EditSampleCategoryModelTableModel.java | 14 +- .../content/home/actions/EditCatchesAction.java | 8 +- .../home/actions/SendCruiseReportAction.java | 17 +- .../catches/AbstractTuttiBatchTableUIHandler.java | 42 ++++- .../operation/catches/EditCatchesSvgHandler.java | 68 +++++-- .../operation/catches/EditCatchesUIHandler.java | 41 ++++- .../operation/catches/EditCatchesUIModel.java | 26 +++ .../catches/SpeciesAbleBatchRowHelper.java | 4 - .../accidental/AccidentalBatchUIHandler.java | 2 +- .../operation/catches/benthos/BenthosBatchUI.css | 2 - .../catches/benthos/BenthosBatchUIHandler.java | 55 +++++- .../catches/benthos/BenthosBatchUIModel.java | 23 +++ .../benthos/actions/RemoveBenthosBatchAction.java | 109 +++++++---- .../benthos/create/CreateBenthosBatchUI.css | 27 ++- .../benthos/create/CreateBenthosBatchUI.jaxx | 32 +++- .../create/CreateBenthosBatchUIHandler.java | 175 ++++++++++-------- .../benthos/create/CreateBenthosBatchUIModel.java | 53 +++++- .../CreateBenthosBatchAndFrequenciesAction.java | 79 ++++++++ .../frequency/BenthosFrequencyCellComponent.java | 32 ++-- .../benthos/frequency/BenthosFrequencyUI.css | 30 ++- .../benthos/frequency/BenthosFrequencyUI.jaxx | 12 +- .../frequency/BenthosFrequencyUIHandler.java | 5 +- .../benthos/split/SplitBenthosBatchUIHandler.java | 92 ++++++---- .../IndividualObservationBatchUIHandler.java | 2 +- .../marinelitter/MarineLitterBatchUIHandler.java | 2 +- .../operation/catches/species/SpeciesBatchUI.css | 2 - .../catches/species/SpeciesBatchUIHandler.java | 54 +++++- .../catches/species/SpeciesBatchUIModel.java | 23 +++ .../species/actions/RemoveSpeciesBatchAction.java | 102 ++++++++--- .../species/create/CreateSpeciesBatchUI.css | 27 ++- .../species/create/CreateSpeciesBatchUI.jaxx | 32 +++- .../create/CreateSpeciesBatchUIHandler.java | 173 ++++++++++-------- .../species/create/CreateSpeciesBatchUIModel.java | 50 +++++ .../CreateSpeciesBatchAndFrequenciesAction.java | 79 ++++++++ .../frequency/SpeciesFrequencyCellComponent.java | 24 ++- .../species/frequency/SpeciesFrequencyUI.css | 29 ++- .../species/frequency/SpeciesFrequencyUI.jaxx | 12 +- .../frequency/SpeciesFrequencyUIHandler.java | 6 +- .../species/split/SplitSpeciesBatchUIHandler.java | 92 ++++++---- .../EditProtocolCaracteristicsRowModel.java | 7 + .../EditProtocolCaracteristicsTableModel.java | 8 +- .../EditProtocolOperationFieldsRowModel.java | 4 + .../EditProtocolOperationFieldsTableModel.java | 2 + .../protocol/EditProtocolSpeciesTableModel.java | 4 +- .../ui/swing/content/protocol/EditProtocolUI.css | 21 +++ .../ui/swing/content/protocol/EditProtocolUI.jaxx | 2 + .../content/protocol/EditProtocolUIHandler.java | 35 +++- .../content/protocol/EditProtocolUIModel.java | 27 +++ .../MoveDownCaracteristicMappingAction.java | 58 ++++++ .../actions/MoveUpCaracteristicMappingAction.java | 59 ++++++ .../swing/util/table/AbstractTuttiTableModel.java | 54 ++++++ tutti-ui-swing/src/main/resources/EcranResume.svg | 202 ++++++++++++++++++--- .../CreateBenthosBatchUIModel-error-validation.xml | 34 +++- .../CreateSpeciesBatchUIModel-error-validation.xml | 31 +++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 54 +++++- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 63 +++++-- 81 files changed, 2036 insertions(+), 551 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.