Author: kmorin Date: 2015-01-07 14:12:06 +0000 (Wed, 07 Jan 2015) New Revision: 739 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/739 Log: fixes #6407 Erreur lors du transfert d'une r?\195?\169ponse Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java 2015-01-06 16:59:33 UTC (rev 738) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java 2015-01-07 14:12:06 UTC (rev 739) @@ -239,7 +239,7 @@ Message message = MimeMessageUtils.createMimeMessage(null, replyContent.getSource()); ReplyFormUIModel replyModel = dialogContent.getModel(); replyModel.setEditable(editable); - replyModel.setOriginalDemand(ui.getModel()); +// replyModel.setOriginalDemand(ui.getModel()); replyModel.setReadSentDate(reply.getSentDate()); replyModel.setSubject(t("faxtomail.reply.forwardsubject", message.getSubject())); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel.java 2015-01-06 16:59:33 UTC (rev 738) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel.java 2015-01-07 14:12:06 UTC (rev 739) @@ -24,21 +24,20 @@ * #L% */ -import java.io.File; -import java.util.Date; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - import com.franciaflex.faxtomail.services.service.ldap.Contact; +import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; +import com.google.common.base.Preconditions; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.FileUtils; import org.jdesktop.beans.AbstractSerializableBean; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; -import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; -import com.google.common.base.Preconditions; +import java.io.File; +import java.util.Date; +import java.util.HashSet; +import java.util.List; +import java.util.Set; /** * @author Kevin Morin (Code Lutin) @@ -96,7 +95,7 @@ protected Binder<ReplyFormUIModel, ReplyFormUIModel> copyBinder = BinderFactory.newBinder(ReplyFormUIModel.class); public void fromModel(ReplyFormUIModel other) { - copyBinder.copyExcluding(other, this); + copyBinder.copyExcluding(other, this, PROPERTY_ORIGINAL_DEMAND); } public Contact getContact() {