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 70992329f9ad9c319039c7aed203f88c7423bb6c Author: Jean Couteau <jean.couteau@gmail.com> Date: Tue Feb 20 10:42:30 2018 +0100 fixes #9713 --- .../franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java | 11 +++++++++++ .../swing/content/demande/actions/LoadFolderEmailsAction.java | 8 ++++++-- faxtomail-ui-swing/src/main/resources/log4j2.xml | 1 + 3 files changed, 18 insertions(+), 2 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 67c21530..09d711fb 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 @@ -240,6 +240,9 @@ public class FaxToMailUIContext extends AbstractBean implements Closeable, UIMes protected EmailFilter emailFilter = new EmailFilter(); + //JC-180220- used to fix #9713 + protected String lastDisplayedMailFolder; + public static FaxToMailUIContext newContext(FaxToMailConfiguration config) { Preconditions.checkNotNull(config); Preconditions.checkState(applicationContext == null, @@ -923,4 +926,12 @@ public class FaxToMailUIContext extends AbstractBean implements Closeable, UIMes public void removeDemande(DemandeUIModel demande) { demandesFrames.remove(demande); } + + public String getLastDisplayedMailFolder() { + return lastDisplayedMailFolder; + } + + public void setLastDisplayedMailFolder(String lastDisplayedMailFolder) { + this.lastDisplayedMailFolder = lastDisplayedMailFolder; + } } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/LoadFolderEmailsAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/LoadFolderEmailsAction.java index cc2ac672..50e1651b 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/LoadFolderEmailsAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/LoadFolderEmailsAction.java @@ -102,8 +102,12 @@ public class LoadFolderEmailsAction extends AbstractFaxToMailAction<DemandeListU // on change de nom en fonction du dossier pour pouvoir sauvegarder le tri des colonnes // dans la session en fonction du dossier - getUI().setName("demandeListUI" + folder.getTopiaId()); - getContext().getSwingSession().add(getUI(), true); + //JC-180220- if instruction is a hack for #9713 + if (getContext().getLastDisplayedMailFolder() != null && !getContext().getLastDisplayedMailFolder().equals("demandeListUI" + folder.getTopiaId())){ + getUI().setName("demandeListUI" + folder.getTopiaId()); + getContext().getSwingSession().add(getUI(), true); + getContext().setLastDisplayedMailFolder("demandeListUI" + folder.getTopiaId()); + } // on force l'ajout du splitpane car l'ui de liste change de nom en fonction du dossier // mais on veut que l'arbre et le séparateur soient constants diff --git a/faxtomail-ui-swing/src/main/resources/log4j2.xml b/faxtomail-ui-swing/src/main/resources/log4j2.xml index 0539ea78..ec3c2a7b 100644 --- a/faxtomail-ui-swing/src/main/resources/log4j2.xml +++ b/faxtomail-ui-swing/src/main/resources/log4j2.xml @@ -49,6 +49,7 @@ <!--<Logger name="com.franciaflex.faxtomail.persistence" level="debug"/>--> <!--<Logger name="com.franciaflex.faxtomail.persistence.entities.AbstractFaxToMailTopiaDao" level="trace"/>--> <!--<Logger name="com.franciaflex.faxtomail.services" level="debug"/>--> + <!--<Logger name="jaxx.runtime.swing.session" level="debug"/>--> <!--<Logger name="org.hibernate.SQL" level="debug"/>--> <!--<Logger name="org.hibernate.type" level="all"/>--> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.