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 e7bb5a6b76d44c4273ec792ab1dc36fb97b1954e Author: Kevin Morin <morin@codelutin.com> Date: Fri Feb 10 15:24:28 2017 +0100 fixes #9042 Impression : les éléments ne sont pas imprimés dans l'ordre chronologique --- .../ui/swing/actions/PrintOnDefaultPrinterAction.java | 13 ++++++++++++- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java index f782259..154c72f 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java @@ -41,6 +41,8 @@ import com.google.common.collect.Multimap; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; import java.util.Date; import java.util.List; @@ -80,7 +82,16 @@ public class PrintOnDefaultPrinterAction extends AbstractFaxToMailAction { Multimap<DemandeUIModel, AttachmentFile> nonPrintedAttachment = HashMultimap.create(); notPrintableDemands = new ArrayList<DemandeUIModel>(); - for (DemandeUIModel demandeUIModel : attachmentsToPrintByDemand.keySet()) { + List<DemandeUIModel> orderedDemands = new ArrayList<>(attachmentsToPrintByDemand.keySet()); + // order the demands by reception date + Collections.sort(orderedDemands, new Comparator<DemandeUIModel>() { + + @Override + public int compare(DemandeUIModel o1, DemandeUIModel o2) { + return o1.getReceptionDate().compareTo(o2.getReceptionDate()); + } + }); + for (DemandeUIModel demandeUIModel : orderedDemands) { if(!handler.isActionEnabled(demandeUIModel, MailAction.PRINT, config)) { notPrintableDemands.add(demandeUIModel); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java index c2f35ca..86ae50f 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java @@ -435,7 +435,7 @@ public final class FaxToMailUIUtil extends ApplicationUIUtil { * @return true if file has been printed, false otherwise */ public static boolean print(AttachmentFile attachmentFile, boolean defaultPrinter) { - boolean result = false; + boolean result; FileInputStream fileInputStream = null; try { File file; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.