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 acc92afe0655dc991650ea360f7aa2712eb2b44c Author: Kevin Morin <morin@codelutin.com> Date: Tue Jan 19 10:42:51 2016 +0100 On sauve seulement (on en ferme pas) quand on clique sur le bouton Enregistrer (refs #6115) --- .../tutti/ui/swing/content/protocol/rtp/RtpEditorUIHandler.java | 7 +++++-- .../tutti/ui/swing/content/protocol/rtp/RtpEditorUIModel.java | 1 + .../ui/swing/content/protocol/rtp/actions/SaveRtpAction.java | 2 ++ .../src/main/resources/i18n/tutti-ui-swing_fr_FR.properties | 9 +++------ 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUIHandler.java index 2ff199b..62bd254 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUIHandler.java @@ -31,8 +31,6 @@ public class RtpEditorUIHandler extends AbstractTuttiUIHandler<RtpEditorUIModel, RtpEditorUIModel model = new RtpEditorUIModel(); - listModelIsModify(model); - this.ui.setContextValue(model); } @@ -51,6 +49,9 @@ public class RtpEditorUIHandler extends AbstractTuttiUIHandler<RtpEditorUIModel, cm.setDragInsets(cr.getDragInsets()); cm.registerComponent(ui); + RtpEditorUIModel model = getModel(); + listModelIsModify(model); + listenValidatorValid(ui.getValidator(), model); } @Override @@ -121,6 +122,8 @@ public class RtpEditorUIHandler extends AbstractTuttiUIHandler<RtpEditorUIModel, model.setRowModel(tableModel, row); + model.setModify(false); + EditProtocolSpeciesRowModel rowModel = model.getRowModel(); Species species = rowModel.getSpecies(); 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 a3d47a7..c078631 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 @@ -140,5 +140,6 @@ public class RtpEditorUIModel extends AbstractTuttiBeanUIModel<EditProtocolSpeci public void reset() { setRowModel(tableModel, row); + setModify(false); } } \ No newline at end of file diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/actions/SaveRtpAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/actions/SaveRtpAction.java index 7f83ea3..0e00ba1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/actions/SaveRtpAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/actions/SaveRtpAction.java @@ -30,5 +30,7 @@ public class SaveRtpAction extends SimpleActionSupport<RtpEditorUI> { rowModel.setRtpFemale(Rtps.newRtp(model.getRtpFemale())); rowModel.setRtpUndefined(Rtps.newRtp(model.getRtpUndefined())); + model.setModify(false); + } } \ No newline at end of file diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index 2de27e9..0e5cddb 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -1073,12 +1073,9 @@ tutti.editProtocol.title.edit.protocol=Éditer un protocole de saisie existant tutti.editProtocol.warn.clean=Des catégories non reconnues ont été supprimées du protocole, ces modifications ne seront sauvegardées que lorsque vous cliquerez sur le bouton "Enregistrer". tutti.editProtocol.warn.clone=Le protocole que vous venez de cloner ne sera sauvegardé que lorsque vous cliquerez sur le bouton "Enregistrer". tutti.editProtocol.warn.import=Le protocole que vous venez d'importer ne sera sauvegardé que lorsque vous cliquerez sur le bouton "Enregistrer". -tutti.editRtp.action.cancel=Annuler -tutti.editRtp.action.cancel.mnemonic=A -tutti.editRtp.action.cancel.tip=Annuler l'édition des RTP -tutti.editRtp.action.close= -tutti.editRtp.action.close.mnemonic= -tutti.editRtp.action.close.tip= +tutti.editRtp.action.close=Fermer +tutti.editRtp.action.close.mnemonic=F +tutti.editRtp.action.close.tip=Fermer l'éditeur des RTP tutti.editRtp.action.save=Enregistrer tutti.editRtp.action.save.mnemonic=E tutti.editRtp.action.save.tip=Enregister les RTP -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.