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 9793385d0a2024885a04fdf5ba1a865ddaab7082 Author: Kevin Morin <morin@codelutin.com> Date: Fri Apr 7 10:47:46 2017 +0200 correction du nombre de PJ dans la liste quand il y a des PJ dans divers --- .../ui/swing/content/attachment/AttachmentCellEditor.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java index b4c6355..613ec5a 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java @@ -44,6 +44,8 @@ import javax.swing.event.CellEditorListener; import javax.swing.event.ChangeEvent; import javax.swing.table.TableCellEditor; import java.awt.*; +import java.util.List; +import java.util.ArrayList; import java.util.Date; import java.util.EventObject; @@ -161,7 +163,13 @@ public class AttachmentCellEditor extends AbstractCellEditor implements TableCel AttachmentEditorUIModel model = editorButton.getBean(); Preconditions.checkNotNull(model, "No model found in editor."); - Object result = model.getAttachment(); + List<Attachment> result = new ArrayList<>(); + if (model.getAttachment() != null) { + result.addAll(model.getAttachment()); + } + if (model.getInlineAttachments() != null) { + result.addAll(model.getInlineAttachments()); + } if (log.isDebugEnabled()) { log.debug("editor value: " + result); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.