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 e6e878a7e3a04801dba239954b46714a3ac2fa5f 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 18c6ceb..a29f8a0 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 @@ -33,6 +33,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; @@ -113,6 +114,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) { @@ -143,4 +145,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 04aa031..b3e1cd7 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 f580568..2756629 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 @@ -75,9 +75,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 e38d3b8..ef1317b 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 @@ -48,7 +48,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; @@ -172,9 +171,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>.