Author: echatellier Date: 2014-08-26 09:31:10 +0200 (Tue, 26 Aug 2014) New Revision: 592 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/592 Log: fixes #5668: Erreur lors d'un double clic sur une pi?\195?\168ce jointe Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java 2014-08-25 09:43:48 UTC (rev 591) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java 2014-08-26 07:31:10 UTC (rev 592) @@ -25,8 +25,6 @@ */ import com.franciaflex.faxtomail.persistence.entities.Attachment; -import com.franciaflex.faxtomail.persistence.entities.AttachmentImpl; -import com.franciaflex.faxtomail.services.FaxToMailServiceContext; import com.franciaflex.faxtomail.ui.swing.actions.EditAttachmentAction; import com.franciaflex.faxtomail.ui.swing.actions.OpenAttachmentAction; import com.franciaflex.faxtomail.ui.swing.util.AbstractToolbarPopupHandler; @@ -47,9 +45,6 @@ import java.awt.event.ActionListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.io.File; -import java.io.FileInputStream; -import java.io.InputStream; import javax.swing.AbstractCellEditor; import javax.swing.Icon; @@ -67,8 +62,6 @@ import javax.swing.table.TableColumnModel; import javax.swing.table.TableModel; -import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; - import static org.nuiton.i18n.I18n.t; /** @@ -156,7 +149,9 @@ public void openAttachment(Attachment attachment) { openAttachmentAction.setAttachment(attachment, true); - getContext().getActionFactory().createUIAction(null, openAttachmentAction).actionPerformed(null); + + // run Internal to prevent multiple successive execution (#5668) + getContext().getActionEngine().runInternalAction(openAttachmentAction); } public void editAttachment(Attachment attachment) { @@ -164,11 +159,13 @@ if (model.isEditable() && FaxToMailUIUtil.isFileTypeEditable(attachment.getOriginalFileName())) { editAttachmentAction.setAttachment(attachment); - getContext().getActionEngine().runAction(editAttachmentAction); + // run Internal to prevent multiple successive execution (#5668) + getContext().getActionEngine().runInternalAction(editAttachmentAction); } else if (attachment.getEditedFileName() != null) { openAttachmentAction.setAttachment(attachment, false); - getContext().getActionEngine().runAction(openAttachmentAction); + // run Internal to prevent multiple successive execution (#5668) + getContext().getActionEngine().runInternalAction(openAttachmentAction); } } @@ -191,7 +188,6 @@ if (answer == JOptionPane.YES_OPTION) { ui.getAttachments().getCellEditor().stopCellEditing(); -// getPersistenceService().deleteAttachment(attachment.getId()); getModel().removeAttachment(attachment); ui.pack();