This is an automated email from the git hooks/post-receive script. New commit to branch feature/9939_Transferer_reponse_mail_archive in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit b131db3506ea185789d3edabc509649b7dc08bbe Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Jun 8 15:40:31 2018 +0200 refs #9939 : Transférer une réponse à un mail archivé. --- .../faxtomail/ui/swing/content/demande/DemandeUI.css | 6 +++++- .../ui/swing/content/demande/replies/ButtonDemandReplies.java | 4 ++-- .../ui/swing/content/demande/replies/DemandRepliesUI.jaxx | 2 +- .../swing/content/demande/replies/DemandRepliesUIHandler.java | 10 +++++----- .../ui/swing/content/demande/replies/DemandReplyItem.css | 2 +- .../ui/swing/content/demande/replies/DemandReplyItem.jaxx | 2 +- .../ui/swing/content/demande/replies/RepliesCellEditor.java | 2 +- .../swing/content/demande/replies/actions/OpenReplyAction.java | 6 +++--- 8 files changed, 19 insertions(+), 15 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css index 31b1a9a8..76f9ec3c 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css @@ -30,10 +30,14 @@ JXDatePicker { _selectOnFocus: { true }; } -JTextField, JXTable, BeanFilterableComboBox, #commentField, ButtonAttachment, ButtonDemandReplies { +JTextField, JXTable, BeanFilterableComboBox, #commentField, ButtonAttachment { editable: { model.isEditable() }; } +ButtonDemandReplies { + forward: {true}; +} + .rightLabel { horizontalAlignment: { SwingConstants.RIGHT }; font-style: "italic"; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/ButtonDemandReplies.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/ButtonDemandReplies.java index 21431274..6cfb0571 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/ButtonDemandReplies.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/ButtonDemandReplies.java @@ -99,8 +99,8 @@ public class ButtonDemandReplies extends AbstractToolbarPopupButton<DemandReplie return popup.getModel(); } - public void setEditable(boolean editable) { - popup.setEditable(editable); + public void setForward(boolean forward) { + popup.setForward(forward); } @Override diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUI.jaxx b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUI.jaxx index e9d371aa..ccd78948 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUI.jaxx +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUI.jaxx @@ -41,7 +41,7 @@ ]]></script> - <Boolean id='editable' javaBean='null' /> + <Boolean id='forward' javaBean='null' /> <DemandeUIModel id='model' javaBean='null'/> diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java index f4b456db..493574e6 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java @@ -199,7 +199,7 @@ public class DemandRepliesUIHandler extends AbstractToolbarPopupHandler<DemandeU Reply reply = item.getReply(); FaxToMailUIUtil.forceReplyContentLoading(getContext(), reply); - boolean editable = item.isEditable(); + boolean forward = item.isForward(); try { ReplyFormUI dialogContent = new ReplyFormUI(ui); @@ -207,8 +207,8 @@ public class DemandRepliesUIHandler extends AbstractToolbarPopupHandler<DemandeU ReplyContent replyContent = reply.getReplyContent(); MimeMessage message = MimeMessageUtils.createMimeMessage(null, replyContent.getSource()); ReplyFormUIModel replyModel = dialogContent.getModel(); - replyModel.setEditable(editable); - replyModel.setForward(true); + replyModel.setEditable(ui.getModel().isEditable()); + replyModel.setForward(forward); replyModel.setOriginalDemand(ui.getModel()); replyModel.setReadSentDate(reply.getSentDate()); replyModel.setSubject(t("faxtomail.reply.forwardsubject", message.getSubject())); @@ -321,7 +321,7 @@ public class DemandRepliesUIHandler extends AbstractToolbarPopupHandler<DemandeU Reply reply = (Reply) value; setReply(reply); - setEditable(DemandRepliesUIHandler.this.getUI().isEditable()); + setForward(DemandRepliesUIHandler.this.getUI().isForward()); return this; } } @@ -338,7 +338,7 @@ public class DemandRepliesUIHandler extends AbstractToolbarPopupHandler<DemandeU boolean isSelected, int row, int column) { Reply reply = (Reply) value; demandReplyItem.setReply(reply); - demandReplyItem.setEditable(getUI().isEditable()); + demandReplyItem.setForward(getUI().isForward()); return demandReplyItem; } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandReplyItem.css b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandReplyItem.css index f12aa609..dda437b3 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandReplyItem.css +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandReplyItem.css @@ -42,7 +42,7 @@ #openForwardButton { actionIcon: "transmit"; toolTipText: "faxtomail.demandReplies.action.forward.tip"; - visible: { isEditable() }; + visible: { isForward() }; } #openReplyButton { diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandReplyItem.jaxx b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandReplyItem.jaxx index 16b901ff..a9927326 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandReplyItem.jaxx +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandReplyItem.jaxx @@ -31,7 +31,7 @@ </import> <!-- if true, display the form to forward reply button --> - <Boolean id='editable' javaBean='true' /> + <Boolean id='forward' javaBean='true' /> <Reply id='reply' javaBean='null'/> diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellEditor.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellEditor.java index 2935405d..5e4694f0 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellEditor.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellEditor.java @@ -65,7 +65,7 @@ public class RepliesCellEditor extends AbstractCellEditor implements TableCellEd this.editorButton = new ButtonDemandReplies("faxtomail.demandRepliesCellRenderer.text", null); this.editorButton.setBorder(new LineBorder(Color.BLACK)); - this.editorButton.setEditable(false); + this.editorButton.setForward(false); addCellEditorListener(new CellEditorListener() { @Override public void editingStopped(ChangeEvent e) { diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/actions/OpenReplyAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/actions/OpenReplyAction.java index 375ce181..eb44236d 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/actions/OpenReplyAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/actions/OpenReplyAction.java @@ -79,15 +79,15 @@ public class OpenReplyAction extends AbstractFaxToMailAction<DemandeUIModel, Dem Reply reply = item.getReply(); FaxToMailUIUtil.forceReplyContentLoading(getContext(), reply); - boolean editable = item.isEditable(); + boolean forward = item.isForward(); frameContent = new ReplyFormUI(getUI()); // TODO echatellier 20140804 : c'est très technique et très bas niveau, ca devrait se trouver dans les services ReplyContent replyContent = reply.getReplyContent(); MimeMessage message = MimeMessageUtils.createMimeMessage(null, replyContent.getSource()); ReplyFormUIModel replyModel = frameContent.getModel(); - replyModel.setEditable(editable); - replyModel.setForward(false); + replyModel.setEditable(demand.isEditable()); + replyModel.setForward(forward); replyModel.setOriginalDemand(demand); replyModel.setReadonly(true); replyModel.setReadSentDate(reply.getSentDate()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.