Author: tchemit Date: 2008-02-11 13:17:26 +0000 (Mon, 11 Feb 2008) New Revision: 802 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteAttachmentAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteLoggableElementAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/DeleteAbstractAction.java Log: demande de confirmation avant suppression Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteAttachmentAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteAttachmentAction.java 2008-02-11 13:17:01 UTC (rev 801) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteAttachmentAction.java 2008-02-11 13:17:26 UTC (rev 802) @@ -44,6 +44,10 @@ protected Attachment attachment; private static final long serialVersionUID = 7535647131305304738L; + @Override + protected String getDeleteMessage() { + return attachment.toString(); + } public DeleteAttachmentAction(String name) { super(name); @@ -57,12 +61,12 @@ @Override protected void initModel(DetailTabModel model) { super.initModel(model); - attachment = model.getSelectedAttachment(); + attachment = model.getSelectedAttachment(); } @Override protected void doAction(ActionEvent e) throws Exception { - throw new SimExplorerRuntimeException(this+" is not implemented yet!"); + super.doAction(e); } @Override Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteLoggableElementAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteLoggableElementAction.java 2008-02-11 13:17:01 UTC (rev 801) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteLoggableElementAction.java 2008-02-11 13:17:26 UTC (rev 802) @@ -54,6 +54,6 @@ @Override protected void doAction(ActionEvent e) throws Exception { - throw new SimExplorerRuntimeException(this+" is not implemented yet!"); + super.doAction(e); } } \ No newline at end of file Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/DeleteAbstractAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/DeleteAbstractAction.java 2008-02-11 13:17:01 UTC (rev 801) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/DeleteAbstractAction.java 2008-02-11 13:17:26 UTC (rev 802) @@ -21,7 +21,9 @@ import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; - +import fr.cemagref.simexplorer.is.ui.SimExplorerRuntimeException; +import static org.codelutin.i18n.I18n._; +import javax.swing.JOptionPane; import java.awt.event.ActionEvent; /** @@ -37,11 +39,13 @@ String uuid; Version version; + protected String getDeleteMessage() { + return element.getName()+" ["+version+"]"; + } protected DeleteAbstractAction(String name) { super(name); } - protected void initModel(DetailTabModel model) { element = model.getDetail(); version = model.getSelectedVersion(); @@ -76,6 +80,14 @@ @Override protected void doAction(ActionEvent e) throws Exception { super.doAction(e); + // demande de confirmation avant d'effacer + int result = JOptionPane.showConfirmDialog(null, _("simexplorer.confirm.delete",getDeleteMessage()), "delete", JOptionPane.YES_NO_OPTION); + if (result != JOptionPane.OK_OPTION) { + // do nothing + return; + } + //TODO do action + throw new SimExplorerRuntimeException(this+" is not implemented yet!"); } @Override