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 08f99eb708560f280a354d78a1565ab94958d07d Merge: fd17dbf 51a31e3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Feb 18 10:32:10 2016 +0100 Fixes #7930 Merge branch 'feature/7930' into develop pom.xml | 4 +- .../tutti/persistence/TuttiPersistenceImpl.java | 5 + .../persistence/TuttiPersistenceNoDbImpl.java | 5 + .../entities/protocol/TuttiProtocols.java | 7 + .../service/ProtocolPersistenceService.java | 7 + .../service/ProtocolPersistenceServiceImpl.java | 19 + .../src/main/xmi/tutti-persistence.zargo | Bin 60851 -> 62059 bytes .../fr/ifremer/tutti/service/DecoratorService.java | 37 ++ .../ifremer/tutti/service/PersistenceService.java | 5 + .../csv/AbstractTuttiImportExportModel.java | 4 + .../protocol/CalcifiedPiecesSamplingRow.java | 112 ++++++ .../protocol/CalcifiedPiecesSamplingRowModel.java | 70 ++++ .../protocol/ProtocolImportExportService.java | 157 ++++++++ .../tutti/service/protocol/SpeciesRowModel.java | 12 +- .../resources/i18n/tutti-service_en_GB.properties | 10 + .../resources/i18n/tutti-service_fr_FR.properties | 9 + .../filtered-resources/tutti-help-fr.properties | 24 +- .../ui/swing/content/home/SelectCruiseUI.jcss | 4 + .../swing/content/home/SelectCruiseUIHandler.java | 25 +- .../protocol/EditProtocolSpeciesRowModel.java | 75 ++++ .../ui/swing/content/protocol/EditProtocolUI.jaxx | 19 +- .../ui/swing/content/protocol/EditProtocolUI.jcss | 11 + .../content/protocol/EditProtocolUIHandler.java | 445 ++++++++++++--------- .../content/protocol/EditProtocolUIModel.java | 100 ++++- .../protocol/actions/AddBenthosProtocolAction.java | 1 + .../protocol/actions/AddSpeciesProtocolAction.java | 3 +- .../actions/ImportProtocolBenthosAction.java | 36 +- .../actions/ImportProtocolSpeciesAction.java | 36 +- .../actions/RemoveBenthosProtocolAction.java | 109 +++-- .../actions/RemoveSpeciesProtocolAction.java | 113 ++++-- .../protocol/actions/SaveProtocolAction.java | 43 +- .../CalcifiedPiecesSamplingEditorRowModel.java | 211 ++++++++++ .../CalcifiedPiecesSamplingEditorTableModel.java | 128 ++++++ .../CalcifiedPiecesSamplingEditorUI.jaxx | 66 +++ .../CalcifiedPiecesSamplingEditorUI.jcss | 64 +++ .../CalcifiedPiecesSamplingEditorUIHandler.java | 325 +++++++++++++++ .../calcifiedpiecessampling/MinSizePopupUI.jaxx | 80 ++++ .../calcifiedpiecessampling/MinSizePopupUI.jcss | 61 +++ .../MinSizePopupUIHandler.java | 104 +++++ .../MinSizePopupUIModel.java | 52 +++ .../actions/AddSpeciesAction.java | 71 ++++ .../actions/DeleteRowAction.java | 73 ++++ .../actions/DeleteSpeciesAction.java | 71 ++++ .../actions/ExportProtocolCpsAction.java | 116 ++++++ .../actions/ImportProtocolCpsAction.java | 179 +++++++++ .../actions/SplitSpeciesAction.java | 67 ++++ .../protocol/zones/ZoneEditorUIHandler.java | 45 +-- .../protocol/zones/tree/ZonesTreeModel.java | 1 - .../EditProtocolUIModel-error-validation.xml | 2 +- .../MinSizePopupUIModel-error-validation.xml | 23 ++ .../rtp/RtpEditorUIModel-error-validation.xml | 2 - .../resources/i18n/tutti-ui-swing_en_GB.properties | 63 +++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 59 +++ .../src/main/resources/icons/action-delete2.png | Bin 0 -> 715 bytes 54 files changed, 2985 insertions(+), 385 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.