This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit 513348294e09fbf5dcba081b46eb5c3237073ee1 Author: Kevin Morin <morin@codelutin.com> Date: Mon Sep 7 15:35:25 2015 +0200 fixes #7517 Ne pas avoir besoin de précéder le nom du client par * --- .../faxtomail/ui/swing/content/demande/DemandeUIHandler.java | 5 ++++- .../faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java | 6 +++++- .../faxtomail/ui/swing/content/search/SearchUIHandler.java | 6 +++++- pom.xml | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java index d37c69d..85009ae 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java @@ -41,6 +41,7 @@ import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; import com.google.common.collect.Sets; import jaxx.runtime.swing.JAXXWidgetUtil; +import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; @@ -432,7 +433,9 @@ public class DemandeUIHandler extends AbstractFaxToMailUIHandler<DemandeUIModel, } } - initBeanFilterableComboBox(ui.getClientComboBox(), model.getAllowedClients(), model.getClient()); + BeanFilterableComboBox<Client> clientComboBox = ui.getClientComboBox(); + clientComboBox.getComboBoxModel().setWildcardCharacter(null); + initBeanFilterableComboBox(clientComboBox, model.getAllowedClients(), model.getClient()); listModelIsModify(model); } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java index f28ecf8..523315e 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java @@ -37,6 +37,7 @@ import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailDemandListHandler; import com.franciaflex.faxtomail.ui.swing.util.DemandeTableModel; import com.franciaflex.faxtomail.ui.swing.util.PaginationComboModel; +import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; @@ -130,7 +131,10 @@ public class SearchToGroupUIHandler extends AbstractFaxToMailDemandListHandler<S initBeanFilterableComboBox(ui.getRepliedByComboBox(), users, model.getReplyBy()); - initBeanFilterableComboBox(ui.getClientComboBox(), + + BeanFilterableComboBox<Client> clientComboBox = ui.getClientComboBox(); + clientComboBox.getComboBoxModel().setWildcardCharacter(null); + initBeanFilterableComboBox(clientComboBox, model.getAllowedClients(), model.getClient()); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java index a837f83..a486e02 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java @@ -35,6 +35,7 @@ import com.franciaflex.faxtomail.ui.swing.content.search.actions.SearchAction; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailDemandListHandler; import com.franciaflex.faxtomail.ui.swing.util.DemandeTableModel; import com.franciaflex.faxtomail.ui.swing.util.PaginationComboModel; +import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; @@ -128,7 +129,10 @@ public class SearchUIHandler extends AbstractFaxToMailDemandListHandler<SearchUI initBeanFilterableComboBox(ui.getRepliedByComboBox(), users, model.getReplyBy()); - initBeanFilterableComboBox(ui.getClientComboBox(), + + BeanFilterableComboBox<Client> clientComboBox = ui.getClientComboBox(); + clientComboBox.getComboBoxModel().setWildcardCharacter(null); + initBeanFilterableComboBox(clientComboBox, model.getAllowedClients(), model.getClient()); diff --git a/pom.xml b/pom.xml index 276ac59..9548890 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,7 @@ <h2Version>1.3.176</h2Version> <guavaVersion>18.0</guavaVersion> - <jaxxVersion>2.25</jaxxVersion> + <jaxxVersion>2.26</jaxxVersion> <!-- do not upgrade to 1.6.5-1 --> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.16.3</xworkVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.