This is an automated email from the git hooks/post-receive script. New commit to branch feature/6115_ajout_RTP in repository tutti. See http://git.codelutin.com/tutti.git commit 392b4461c87d5e18099afff3cfcb8185d17b5758 Author: Kevin Morin <morin@codelutin.com> Date: Mon Jan 18 13:43:05 2016 +0100 reset le formulaire quand on quitte sans sauvegarder (refs #6115) --- .../ui/swing/content/protocol/rtp/RtpEditorUI.css | 26 +++++++++++----------- .../ui/swing/content/protocol/rtp/RtpEditorUI.jaxx | 2 +- .../content/protocol/rtp/RtpEditorUIHandler.java | 15 ++++++++----- .../content/protocol/rtp/RtpEditorUIModel.java | 12 ++++++++++ .../{CancelRtpAction.java => CloseRtpAction.java} | 4 ++-- .../resources/i18n/tutti-ui-swing_en_GB.properties | 3 +++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 3 +++ 7 files changed, 44 insertions(+), 21 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.css index f266278..d47e59d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.css @@ -22,7 +22,7 @@ NumberEditor { #rtpMaleAField { property:{RtpEditorUIModel.PROPERTY_RTP_MALE_A}; - numberValue: {model.getRtpMale().getA()};; + numberValue: {model.getRtpMaleA()};; _help: {"tutti.editRtp.field.rtpMaleA.help"}; } @@ -35,7 +35,7 @@ NumberEditor { #rtpMaleBField { property:{RtpEditorUIModel.PROPERTY_RTP_MALE_B}; - numberValue: {model.getRtpMale().getB()};; + numberValue: {model.getRtpMaleB()}; _help: {"tutti.editRtp.field.rtpMaleB.help"}; } @@ -48,7 +48,7 @@ NumberEditor { #rtpFemaleAField { property:{RtpEditorUIModel.PROPERTY_RTP_FEMALE_A}; - numberValue: {model.getRtpFemale().getA()};; + numberValue: {model.getRtpFemaleA()}; _help: {"tutti.editRtp.field.rtpFemaleA.help"}; } @@ -61,7 +61,7 @@ NumberEditor { #rtpFemaleBField { property:{RtpEditorUIModel.PROPERTY_RTP_FEMALE_B}; - numberValue: {model.getRtpFemale().getB()};; + numberValue: {model.getRtpFemaleB()}; _help: {"tutti.editRtp.field.rtpFemaleB.help"}; } @@ -74,7 +74,7 @@ NumberEditor { #rtpUndefinedAField { property:{RtpEditorUIModel.PROPERTY_RTP_UNDEFINED_A}; - numberValue: {model.getRtpUndefined().getA()};; + numberValue: {model.getRtpUndefinedA()}; _help: {"tutti.editRtp.field.rtpUndefinedA.help"}; } @@ -87,7 +87,7 @@ NumberEditor { #rtpUndefinedBField { property:{RtpEditorUIModel.PROPERTY_RTP_UNDEFINED_B}; - numberValue: {model.getRtpUndefined().getB()};; + numberValue: {model.getRtpUndefinedB()}; _help: {"tutti.editRtp.field.rtpUndefinedB.help"}; } @@ -101,11 +101,11 @@ NumberEditor { _help: {"tutti.editRtp.action.save.help"}; } -#cancelButton { - actionIcon: cancel; - text: "tutti.editRtp.action.cancel"; - toolTipText: "tutti.editRtp.action.cancel.tip"; - i18nMnemonic: "tutti.editRtp.action.cancel.mnemonic"; - _simpleAction: {fr.ifremer.tutti.ui.swing.content.protocol.rtp.actions.CancelRtpAction.class}; - _help: {"tutti.editRtp.action.cancel.help"}; +#closeButton { + actionIcon: close; + text: "tutti.editRtp.action.close"; + toolTipText: "tutti.editRtp.action.close.tip"; + i18nMnemonic: "tutti.editRtp.action.close.mnemonic"; + _simpleAction: {fr.ifremer.tutti.ui.swing.content.protocol.rtp.actions.CloseRtpAction.class}; + _help: {"tutti.editRtp.action.close.help"}; } \ No newline at end of file diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jaxx index ec1482c..9c0bf66 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jaxx @@ -141,7 +141,7 @@ public void closeEditor() { handler.closeEditor(); } </JXTitledPanel> <JPanel id="actions" constraints='BorderLayout.SOUTH' layout="{new GridLayout(1, 2)}"> - <JButton id='cancelButton'/> + <JButton id='closeButton'/> <JButton id='saveButton'/> </JPanel> 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 ca6841e..2ff199b 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 @@ -80,6 +80,7 @@ public class RtpEditorUIHandler extends AbstractTuttiUIHandler<RtpEditorUIModel, } if (result) { + getModel().reset(); ui.dispose(); } } @@ -93,13 +94,12 @@ public class RtpEditorUIHandler extends AbstractTuttiUIHandler<RtpEditorUIModel, int answer = askSaveBeforeLeaving(message); switch (answer) { - case JOptionPane.OK_OPTION: + case JOptionPane.YES_OPTION: getContext().getActionEngine().runAction(ui.getSaveButton()); result = true; break; case JOptionPane.NO_OPTION: - getContext().getActionEngine().runAction(ui.getCancelButton()); result = true; break; @@ -117,9 +117,11 @@ public class RtpEditorUIHandler extends AbstractTuttiUIHandler<RtpEditorUIModel, public void setBean(EditProtocolSpeciesTableModel tableModel, int row) { - getModel().setRowModel(tableModel, row); + RtpEditorUIModel model = getModel(); + + model.setRowModel(tableModel, row); - EditProtocolSpeciesRowModel rowModel = getModel().getRowModel(); + EditProtocolSpeciesRowModel rowModel = model.getRowModel(); Species species = rowModel.getSpecies(); @@ -131,6 +133,10 @@ public class RtpEditorUIHandler extends AbstractTuttiUIHandler<RtpEditorUIModel, ui.getBodyPanel().setTitle(t("tutti.rtpEdit.title", decorate)); + if (log.isInfoEnabled()) { + log.info("model valid " + model.isValid()); + log.info("model modified " + model.isModify()); + } } public void openEditor() { @@ -140,5 +146,4 @@ public class RtpEditorUIHandler extends AbstractTuttiUIHandler<RtpEditorUIModel, public void closeEditor() { onCloseUI(); } - } \ No newline at end of file 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 3b8bbc7..a3d47a7 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 @@ -5,6 +5,8 @@ import fr.ifremer.tutti.persistence.entities.protocol.RtpBean; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolSpeciesRowModel; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolSpeciesTableModel; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * Created on 14/01/16. @@ -13,6 +15,9 @@ import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; */ public class RtpEditorUIModel extends AbstractTuttiBeanUIModel<EditProtocolSpeciesRowModel, RtpEditorUIModel> { + /** Logger. */ + private static final Log log = LogFactory.getLog(RtpEditorUIModel.class); + public static final String PROPERTY_RTP_MALE_A = "rtpMaleA"; public static final String PROPERTY_RTP_MALE_B = "rtpMaleB"; public static final String PROPERTY_RTP_FEMALE_A = "rtpFemaleA"; @@ -107,6 +112,9 @@ public class RtpEditorUIModel extends AbstractTuttiBeanUIModel<EditProtocolSpeci public void setRowModel(EditProtocolSpeciesTableModel tableModel, int row) { + if (log.isInfoEnabled()) { + log.info("setRowModel " + row); + } this.row = row; this.tableModel = tableModel; @@ -129,4 +137,8 @@ public class RtpEditorUIModel extends AbstractTuttiBeanUIModel<EditProtocolSpeci public EditProtocolSpeciesRowModel getRowModel() { return tableModel.getEntry(row); } + + public void reset() { + setRowModel(tableModel, row); + } } \ No newline at end of file diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/actions/CancelRtpAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/actions/CloseRtpAction.java similarity index 80% rename from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/actions/CancelRtpAction.java rename to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/actions/CloseRtpAction.java index ce215d0..944f0f4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/actions/CancelRtpAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/actions/CloseRtpAction.java @@ -8,11 +8,11 @@ import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; * * @author Tony Chemit - chemit@codelutin.com */ -public class CancelRtpAction extends SimpleActionSupport<RtpEditorUI> { +public class CloseRtpAction extends SimpleActionSupport<RtpEditorUI> { private static final long serialVersionUID = 1L; - public CancelRtpAction(RtpEditorUI ui) { + public CloseRtpAction(RtpEditorUI ui) { super(ui); } diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties index 54ec8d1..1a92b95 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties @@ -1128,6 +1128,9 @@ tutti.editProtocol.warn.import= tutti.editRtp.action.cancel= tutti.editRtp.action.cancel.mnemonic= tutti.editRtp.action.cancel.tip= +tutti.editRtp.action.close= +tutti.editRtp.action.close.mnemonic= +tutti.editRtp.action.close.tip= tutti.editRtp.action.save= tutti.editRtp.action.save.mnemonic= tutti.editRtp.action.save.tip= 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 c97007a..2de27e9 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 @@ -1076,6 +1076,9 @@ tutti.editProtocol.warn.import=Le protocole que vous venez d'importer ne sera sa 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.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>.