Author: kmorin Date: 2014-06-24 21:49:01 +0200 (Tue, 24 Jun 2014) New Revision: 262 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/262 Log: corrections sur l'impression Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java 2014-06-24 19:07:48 UTC (rev 261) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java 2014-06-24 19:49:01 UTC (rev 262) @@ -35,6 +35,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.io.Closeables; +import jaxx.runtime.JAXXUtil; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -161,27 +162,30 @@ if (StringUtils.isNotBlank(attachmentFile.getFilename())) { FaxToMailUIUtil.print(attachmentFile, true); } - attachmentsToPrint.remove(attachmentFile); +// attachmentsToPrint.remove(attachmentFile); } catch (Exception e) { if (log.isErrorEnabled()) { log.error("Could not print attachement.", e); } } } + // TODO DCossé 23/06/14 not sure it works if (!attachmentsToPrint.isEmpty()) { - AttachmentFile f = attachmentsToPrint.get(0); - String filesName = f.getFilename() == null ? "" : f.getFilename(); - for (int i = 1; i < attachmentsToPrint.size(); i++) { - String fileName= attachmentsToPrint.get(i).getFilename() == null ? "" : attachmentsToPrint.get(i).getFilename(); - filesName += ", " + fileName; + StringBuilder fileNames = new StringBuilder(); + for (AttachmentFile attachmentFile : attachmentsToPrint) { + String fileName = JAXXUtil.getStringValue(attachmentFile.getFilename()); + fileNames.append("- ").append(fileName).append("\n"); } JOptionPane.showMessageDialog( getTopestUI(), - t("faxtomail.demande.print.error.message.filesName", filesName), + t("faxtomail.demande.print.error.message.filesName", fileNames.toString()), t("faxtomail.demande.print.error.message.title"), JOptionPane.ERROR_MESSAGE); + + } else { + closeDialog(); } } Modified: trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-06-24 19:07:48 UTC (rev 261) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-06-24 19:49:01 UTC (rev 262) @@ -121,7 +121,7 @@ faxtomail.demande.mailFolder.label=Dossier faxtomail.demande.object.label=Objet faxtomail.demande.print.button.label=Imprimer -faxtomail.demande.print.error.message.filesName=Les documents suivant n'ont pu être imprimé\: %s +faxtomail.demande.print.error.message.filesName=Les documents suivant n'ont pas pu être imprimés \:\n%s faxtomail.demande.print.error.message.title=Échec d'impression de la demande faxtomail.demande.printedBy.label=Imprimé par faxtomail.demande.priority.label=Priorité