branch develop-1.1.x updated (3214d47 -> ea1e141)
This is an automated email from the git hooks/post-receive script. New change to branch develop-1.1.x in repository faxtomail. See http://git.codelutin.com/faxtomail.git from 3214d47 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new ea1e141 Dans les réponses, la liste déroulante des expéditeurs n'est plus filtrée (fixes #8054) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit ea1e1410cebe8f1cb70ec48be2bea7eea9005320 Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 3 10:42:02 2016 +0100 Dans les réponses, la liste déroulante des expéditeurs n'est plus filtrée (fixes #8054) Summary of changes: .../faxtomail/services/DecoratorServiceImpl.java | 19 +++++++++++++++++++ .../faxtomail/ui/swing/content/reply/ReplyFormUI.css | 5 ++++- .../faxtomail/ui/swing/content/reply/ReplyFormUI.jaxx | 7 ++++--- .../ui/swing/content/reply/ReplyFormUIHandler.java | 10 ++++++---- 4 files changed, 33 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-1.1.x in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit ea1e1410cebe8f1cb70ec48be2bea7eea9005320 Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 3 10:42:02 2016 +0100 Dans les réponses, la liste déroulante des expéditeurs n'est plus filtrée (fixes #8054) --- .../faxtomail/services/DecoratorServiceImpl.java | 19 +++++++++++++++++++ .../faxtomail/ui/swing/content/reply/ReplyFormUI.css | 5 ++++- .../faxtomail/ui/swing/content/reply/ReplyFormUI.jaxx | 7 ++++--- .../ui/swing/content/reply/ReplyFormUIHandler.java | 10 ++++++---- 4 files changed, 33 insertions(+), 8 deletions(-) diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorServiceImpl.java index b21ebb7..19b6c56 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorServiceImpl.java @@ -32,6 +32,7 @@ import com.franciaflex.faxtomail.persistence.entities.Reply; import com.franciaflex.faxtomail.services.service.ldap.Contact; import org.nuiton.decorator.Decorator; import org.nuiton.decorator.DecoratorProvider; +import org.nuiton.decorator.MultiJXPathDecorator; import java.text.DateFormat; import java.util.Date; @@ -112,6 +113,7 @@ public class DecoratorServiceImpl extends FaxToMailServiceSupport implements Dec return DateFormat.getDateInstance(DateFormat.MEDIUM).format(bean); } }); + registerDecorator(new StringMultiJXPathDecorator()); registerMultiJXPathDecorator(Contact.class, "${name}$s <${email}$s>", SEPARATOR, " - "); registerMultiJXPathDecorator(HasLabel.class, "${label}$s", SEPARATOR, " - "); registerDecorator(new Decorator<Attachment>(Attachment.class) { @@ -141,4 +143,21 @@ public class DecoratorServiceImpl extends FaxToMailServiceSupport implements Dec } }; } + + public static class StringMultiJXPathDecorator extends MultiJXPathDecorator<String> implements Cloneable { + + public StringMultiJXPathDecorator() throws IllegalArgumentException, NullPointerException { + super(String.class, "", "#", null); + } + + @Override + public String toString(Object bean) { + return String.valueOf(bean); + } + + @Override + public Object clone() throws CloneNotSupportedException { + return new StringMultiJXPathDecorator(); + } + } } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.css b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.css index 252011b..5d4e4a0 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.css +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.css @@ -35,7 +35,10 @@ } #fromComboBox { - editable: true; + showReset: true; + showDecorator: false; + bean: {model}; + property: from; selectedItem: { model.getFrom() }; } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.jaxx b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.jaxx index c78cc5d..ac1aaf4 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.jaxx +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.jaxx @@ -73,9 +73,10 @@ layout="{ fromPanelLayout }"> <JTextField id="fromField" constraints='"true"'/> - <JComboBox id="fromComboBox" - onItemStateChanged='handler.setText(event, "from")' - constraints='"false"'/> + <BeanFilterableComboBox id="fromComboBox" + constructorParams='this' + genericType="String" + constraints='"false"'/> </JPanel> </cell> </row> diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java index 6a86726..bc0d31e 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java @@ -46,7 +46,6 @@ import org.nuiton.jaxx.application.swing.util.Cancelable; import org.nuiton.validator.bean.simple.SimpleBeanValidator; import javax.swing.ComboBoxEditor; -import javax.swing.DefaultComboBoxModel; import javax.swing.JComboBox; import javax.swing.JComponent; import javax.swing.JFileChooser; @@ -169,9 +168,12 @@ public class ReplyFormUIHandler extends AbstractFaxToMailUIHandler<ReplyFormUIMo } Collections.sort(replyToAddresses); - DefaultComboBoxModel comboBoxModel = SwingUtil.newComboModel(replyToAddresses.toArray()); - comboBoxModel.setSelectedItem(selectedItem); - ui.getFromComboBox().setModel(comboBoxModel); +// DefaultComboBoxModel comboBoxModel = SwingUtil.newComboModel(replyToAddresses.toArray()); +// comboBoxModel.setSelectedItem(selectedItem); +// ui.getFromComboBox().setModel(comboBoxModel); + ui.getFromComboBox().setBeanType(String.class); + initBeanFilterableComboBox(ui.getFromComboBox(), replyToAddresses, selectedItem); + model.setSenderAllowedAddresses(replyToAddresses); initBeanFilterableComboBox(ui.getContactField(), getContext().getContactCache(), null); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm