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 f5ccf41ab68aeeacb89ba4d03e9f9e269014af6f Merge: ca7d26b a0118c9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Feb 25 16:49:43 2016 +0100 Fixes #8013 Merge branch 'feature/8013' into develop .gitignore | 12 +- .../entities/protocol/SpeciesProtocolBean.java | 14 + .../entities/protocol/TuttiProtocols.java | 110 +++- .../entities/protocol/v1/SpeciesProtocol1.java | 5 +- .../entities/protocol/v1/SpeciesProtocolBean1.java | 5 +- .../entities/protocol/v1/TuttiProtocol1.java | 4 +- .../entities/protocol/v1/TuttiProtocolBean1.java | 4 +- .../entities/protocol/v2/TuttiProtocol2.java | 4 +- .../entities/protocol/v2/TuttiProtocolBean2.java | 2 - .../entities/protocol/v3/SpeciesProtocol3.java | 148 +++++ .../entities/protocol/v3/SpeciesProtocolBean3.java | 194 +++---- .../entities/protocol/v3/TuttiProtocol3.java | 236 ++++++++ .../entities/protocol/v3/TuttiProtocolBean3.java | 596 +++++++++++++++++++++ .../src/main/xmi/tutti-persistence.zargo | Bin 62059 -> 62284 bytes .../entities/protocol/TuttiProtocolsTest.java | 20 - .../ProtocolPersistenceServiceReadTest.java | 6 - .../ProtocolPersistenceServiceWriteTest.java | 9 +- .../catches/ValidateCruiseOperationsService.java | 4 +- .../protocol/ProtocolImportExportService.java | 2 +- .../ifremer/tutti/service/protocol/SpeciesRow.java | 16 - .../tutti/service/protocol/SpeciesRowModel.java | 6 +- .../protocol/ProtocolImportExportServiceTest.java | 52 +- .../create/CreateBenthosBatchUIHandler.java | 2 +- .../create/CreateSpeciesBatchUIHandler.java | 2 +- .../protocol/EditProtocolSpeciesRowModel.java | 99 +++- .../protocol/EditProtocolSpeciesTableModel.java | 27 +- .../content/protocol/EditProtocolUIHandler.java | 157 +++++- .../content/protocol/EditProtocolUIModel.java | 12 + .../protocol/actions/AddBenthosProtocolAction.java | 3 +- .../protocol/actions/AddSpeciesProtocolAction.java | 3 +- .../actions/ExportAllCaracteristicAction.java | 2 +- .../actions/ExportProtocolBenthosAction.java | 2 +- .../actions/ExportProtocolCaracteristicAction.java | 2 +- .../actions/ExportProtocolSpeciesAction.java | 2 +- .../protocol/actions/ExportPupitriAction.java | 2 +- .../actions/RemoveBenthosProtocolAction.java | 25 +- .../actions/RemoveSpeciesProtocolAction.java | 26 +- .../protocol/actions/SaveProtocolAction.java | 19 - .../CalcifiedPiecesSamplingEditorTableModel.java | 1 + .../CalcifiedPiecesSamplingEditorUIHandler.java | 15 + .../actions/ExportProtocolCpsAction.java | 2 +- .../actions/ImportProtocolCpsAction.java | 1 + .../content/protocol/rtp/RtpEditorUIModel.java | 2 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 9 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 15 +- 45 files changed, 1474 insertions(+), 405 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.