This is an automated email from the git hooks/post-receive script. New commit to branch feature/7929_editeur_de_zone in repository tutti. See http://git.codelutin.com/tutti.git commit fc7dabef9e890fbc3ce622df489b83206f39e10c Author: Kevin Morin <morin@codelutin.com> Date: Wed Jan 27 18:37:01 2016 +0100 mise a jour suite aux modifs du modele + appel des oncloseui des sous-ui (refs #7929) --- .../content/protocol/EditProtocolUIHandler.java | 3 ++ .../content/protocol/EditProtocolUIModel.java | 44 +++++++++++----------- .../content/protocol/rtp/RtpEditorUIModel.java | 4 +- 3 files changed, 28 insertions(+), 23 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java index c92afd3..f6c14e6 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java @@ -810,6 +810,9 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI clearValidators(); ui.getTabPanel().setSelectedIndex(0); + closeUI(ui.getRtpEditorUI()); + closeUI(ui.getZoneEditor()); + } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java index 73391ad..04d6188 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java @@ -780,58 +780,58 @@ public class EditProtocolUIModel extends AbstractTuttiBeanUIModel<TuttiProtocol, } @Override - public Collection<Zone> getZones() { - return editObject.getZones(); + public Collection<Zone> getZone() { + return editObject.getZone(); } @Override - public void setZones(Collection<Zone> zones) { - editObject.setZones(zones); + public void setZone(Collection<Zone> zones) { + editObject.setZone(zones); } @Override - public Zone getZones(int index) { - return editObject.getZones(index); + public Zone getZone(int index) { + return editObject.getZone(index); } @Override - public boolean isZonesEmpty() { - return editObject.isZonesEmpty(); + public boolean isZoneEmpty() { + return editObject.isZoneEmpty(); } @Override - public int sizeZones() { - return editObject.sizeZones(); + public int sizeZone() { + return editObject.sizeZone(); } @Override - public void addZones(Zone zone) { - editObject.addZones(zone); + public void addZone(Zone zone) { + editObject.addZone(zone); } @Override - public void addAllZones(Collection<Zone> zones) { - editObject.addAllZones(zones); + public void addAllZone(Collection<Zone> zones) { + editObject.addAllZone(zones); } @Override - public boolean removeZones(Zone zone) { - return editObject.removeZones(zone); + public boolean removeZone(Zone zone) { + return editObject.removeZone(zone); } @Override - public boolean removeAllZones(Collection<Zone> zones) { - return editObject.removeAllZones(zones); + public boolean removeAllZone(Collection<Zone> zones) { + return editObject.removeAllZone(zones); } @Override - public boolean containsZones(Zone zone) { - return editObject.containsZones(zone); + public boolean containsZone(Zone zone) { + return editObject.containsZone(zone); } @Override - public boolean containsAllZones(Collection<Zone> zones) { - return editObject.containsAllZones(zones); + public boolean containsAllZone(Collection<Zone> zones) { + return editObject.containsAllZone(zones); } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUIModel.java index cc2981b..9a23c9a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUIModel.java @@ -239,7 +239,9 @@ public class RtpEditorUIModel extends AbstractTuttiBeanUIModel<EditProtocolSpeci } public void reset() { - setRowModel(row); + if (row >= 0 && row < rows.size()) { + setRowModel(row); + } } public void updateRowRtp() { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.