Author: kmorin Date: 2014-05-12 12:37:26 +0200 (Mon, 12 May 2014) New Revision: 64 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/64 Log: r?\195?\169ponse par mail : propose les pi?\195?\168ces-jointes des demandes du groupe Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java 2014-05-12 10:27:56 UTC (rev 63) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java 2014-05-12 10:37:26 UTC (rev 64) @@ -25,6 +25,7 @@ */ import com.franciaflex.faxtomail.persistence.entities.Attachment; +import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler; @@ -52,6 +53,7 @@ import java.io.IOException; import java.io.Serializable; import java.lang.reflect.Method; +import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -76,11 +78,17 @@ DemandeUIModel currentEmail = getContext().getCurrentEmail(); model.setOriginalDemand(currentEmail); - for (Attachment attachment : currentEmail.getAttachment()) { - model.addAvailableAttachment(attachment.getOriginalFile()); - File file = attachment.getEditedFile(); - if (file != null) { - model.addAvailableAttachment(file); + List<DemandeUIModel> models = new ArrayList<DemandeUIModel>(); + models.add(currentEmail); + models.addAll(currentEmail.getGroupedDemandes()); + + for (DemandeUIModel demandeUIModel : models) { + for (Attachment attachment : demandeUIModel.getAttachment()) { + model.addAvailableAttachment(attachment.getOriginalFile()); + File file = attachment.getEditedFile(); + if (file != null) { + model.addAvailableAttachment(file); + } } }