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 2ab86d0de8299a0ec2b199f6c7a8ddb134c8bd03 Merge: 17b3ba9 793f199 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Feb 6 09:21:08 2016 +0100 Fixes #7929 Merge branch 'feature/7929_editeur_de_zone' into develop pom.xml | 2 + .../tutti/persistence/TuttiPersistenceImpl.java | 5 + .../persistence/TuttiPersistenceNoDbImpl.java | 5 + .../entities/protocol/TuttiProtocols.java | 3 + .../service/ProtocolPersistenceServiceImpl.java | 47 +++ .../referential/LocationPersistenceService.java | 10 + .../LocationPersistenceServiceImpl.java | 38 ++ .../src/main/xmi/tutti-persistence.zargo | Bin 59366 -> 60851 bytes .../ifremer/tutti/service/PersistenceService.java | 5 + .../swing/content/cruise/EditCruiseUIHandler.java | 2 +- .../content/cruise/actions/SaveCruiseAction.java | 4 +- .../accidental/AccidentalBatchUIHandler.java | 2 +- .../catches/benthos/BenthosBatchUIHandler.java | 4 +- .../IndividualObservationBatchUIHandler.java | 2 +- .../marinelitter/MarineLitterBatchUIHandler.java | 2 +- .../catches/species/SpeciesBatchUIHandler.java | 4 +- .../actions/EditFishingOperationAction.java | 4 +- .../actions/SaveFishingOperationAction.java | 2 +- .../content/program/EditProgramUIHandler.java | 2 +- .../content/program/actions/SaveProgramAction.java | 2 +- .../ui/swing/content/protocol/EditProtocolUI.jaxx | 5 + .../content/protocol/EditProtocolUIHandler.java | 15 +- .../content/protocol/EditProtocolUIModel.java | 232 +++++++++++ .../actions/ExportProtocolBenthosAction.java | 2 +- .../actions/ExportProtocolCaracteristicAction.java | 2 +- .../actions/ExportProtocolSpeciesAction.java | 2 +- .../actions/ImportProtocolBenthosAction.java | 2 +- .../actions/ImportProtocolCaracteristicAction.java | 4 +- .../actions/ImportProtocolSpeciesAction.java | 2 +- .../protocol/actions/SaveProtocolAction.java | 15 +- .../content/protocol/rtp/RtpEditorUIModel.java | 4 +- .../swing/content/protocol/zones/ZoneEditorUI.jaxx | 87 +++++ .../swing/content/protocol/zones/ZoneEditorUI.jcss | 65 ++++ .../protocol/zones/ZoneEditorUIHandler.java | 427 +++++++++++++++++++++ .../protocol/zones/actions/AddStratasAction.java | 84 ++++ .../CollapseAvailableStratasTreeAction.java | 21 + .../zones/actions/CollapseZonesTreeAction.java | 21 + .../protocol/zones/actions/CreateZoneAction.java | 51 +++ .../protocol/zones/actions/DeleteZoneAction.java | 50 +++ .../actions/ExpandAvailableStratasTreeAction.java | 21 + .../zones/actions/ExpandZonesTreeAction.java | 21 + .../zones/actions/RemoveStratasAction.java | 91 +++++ .../protocol/zones/actions/RenameZoneAction.java | 54 +++ .../protocol/zones/models/StrataUIModel.java | 225 +++++++++++ .../protocol/zones/models/SubStrataUIModel.java | 122 ++++++ .../content/protocol/zones/models/ZoneUIModel.java | 204 ++++++++++ .../zones/tree/AbstractZoneEditorTreeModel.java | 25 ++ .../content/protocol/zones/tree/StrataNode.java | 19 + .../protocol/zones/tree/StratasTreeModel.java | 134 +++++++ .../content/protocol/zones/tree/SubStrataNode.java | 18 + .../protocol/zones/tree/ZoneEditorNode.java | 52 +++ .../zones/tree/ZoneEditorTreeCellRenderer.java | 30 ++ .../content/protocol/zones/tree/ZoneNode.java | 19 + .../protocol/zones/tree/ZonesTreeModel.java | 206 ++++++++++ .../report/actions/GenerateReportAction.java | 2 +- .../actions/EditCruiseInValidationUIAction.java | 2 +- .../EditFishingOperationInValidationUIAction.java | 4 +- .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 15 + .../EditProtocolUIModel-error-validation.xml | 40 ++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 21 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 18 +- .../src/main/resources/icons/action-left.png | Bin 0 -> 345 bytes .../src/main/resources/icons/action-right.png | Bin 0 -> 349 bytes 63 files changed, 2540 insertions(+), 39 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.