This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 3d51886b8d05b4185aa3c96dda40ea143c976eba Author: jcouteau <couteau@codelutin.com> Date: Mon Jan 7 16:10:35 2019 +0100 Fix #10206 : Remove editor cache --- .../faxtomail/ui/swing/FaxToMailUIContext.java | 15 --------------- .../faxtomail/ui/swing/actions/ShowDemandeAction.java | 7 ------- .../content/attachment/actions/EditAttachmentAction.java | 3 --- 3 files changed, 25 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java index e6d5b0ea..89694480 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java @@ -211,8 +211,6 @@ public class FaxToMailUIContext extends AbstractBean implements Closeable, UIMes protected Map<DemandeUIModel, JFrame> demandesFrames = new HashMap<>(); - protected Map<File, JFrame> fileEditorFrames = new HashMap<>(); - //FIXME rustine en attendant de trouver pourquoi ca rame autant protected boolean useFolderCache; @@ -928,19 +926,6 @@ public class FaxToMailUIContext extends AbstractBean implements Closeable, UIMes demandesFrames.remove(demande); } - public JFrame getFrameForFile(File file) { - return fileEditorFrames.get(file); - } - - public void setEditorFrameForFile (File file,JFrame frame) { - fileEditorFrames.put(file, frame); - - } - - public void removeFileEditor(File file) { - fileEditorFrames.remove(file); - } - public String getLastDisplayedMailFolder() { return lastDisplayedMailFolder; } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java index 1b1e97eb..26a000f6 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java @@ -243,13 +243,6 @@ public class ShowDemandeAction extends AbstractMainUIFaxToMailAction { for (DemandeUIModel demande : currentEmail.getGroupedDemandes()) { getContext().removeDemande(demande); } - - //remove fileEditor for each attachment from context - for (Attachment attachment:currentEmail.getAttachment()){ - if (attachment != null && attachment.getOriginalFile() != null) { - getContext().removeFileEditor(attachment.getOriginalFile().getFile()); - } - } } }); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/actions/EditAttachmentAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/actions/EditAttachmentAction.java index d6330b1f..547fdaec 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/actions/EditAttachmentAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/actions/EditAttachmentAction.java @@ -91,12 +91,9 @@ public class EditAttachmentAction extends AbstractFaxToMailAction<AttachmentEdit final PDFEditorUI dialogContent = new PDFEditorUI(getUI()); MainUI mainUI = getContext().getMainUI(); - frame = getContext().getFrameForFile(attachment.getOriginalFile().getFile()); if (frame == null){ frame = getHandler().openFrame(dialogContent, attachment.getOriginalFileName(), mainUI.getSize()); - getContext().setEditorFrameForFile(attachment.getOriginalFile().getFile(), frame); - frame.addWindowListener(new WindowAdapter() { @Override public void windowClosed(WindowEvent e) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.