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 8c08371947ebc20b9561bb0c9aadfbdf1796fedd Author: Jean Couteau <jean.couteau@gmail.com> Date: Fri Feb 2 10:43:20 2018 +0100 fixes #9672 : Paramétrage du nombre de caractères mini dans la liste des clients --- .../com/franciaflex/faxtomail/FaxToMailConfiguration.java | 4 ++++ .../franciaflex/faxtomail/FaxToMailConfigurationOption.java | 7 +++++++ .../resources/i18n/faxtomail-persistence_fr_FR.properties | 1 + .../ui/swing/content/demande/DemandeUIHandler.java | 13 ++++++++----- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java index f47337e6..1c7b57a2 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java @@ -462,4 +462,8 @@ public class FaxToMailConfiguration extends ApplicationConfiguration { public boolean getPrintDetailPage() { return applicationConfig.getOptionAsBoolean(FaxToMailConfigurationOption.PRINT_DETAIL_PAGE.getKey()); } + + public int getClientComboBoxFilterStartChars() { + return applicationConfig.getOptionAsInt(FaxToMailConfigurationOption.CLIENT_COMBOBOX_FILTER_START_CHARS.getKey()); + } } diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java index bc6f3605..9098d932 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java @@ -354,6 +354,13 @@ defaults.put("Table.alternateRowColor", new Color(217, 217, 217)); n("faxtomail.config.option.ui.printDetailPage.description"), "true", Boolean.class + ), + + CLIENT_COMBOBOX_FILTER_START_CHARS( + "faxtomail.ui.clientComboBoxFilterStartChars", + n("faxtomail.config.option.ui.clientComboBoxFilterStartChars.description"), + "3", + Integer.class ); /** Configuration key. */ diff --git a/faxtomail-persistence/src/main/resources/i18n/faxtomail-persistence_fr_FR.properties b/faxtomail-persistence/src/main/resources/i18n/faxtomail-persistence_fr_FR.properties index bdf6acc4..ff7c5cb5 100644 --- a/faxtomail-persistence/src/main/resources/i18n/faxtomail-persistence_fr_FR.properties +++ b/faxtomail-persistence/src/main/resources/i18n/faxtomail-persistence_fr_FR.properties @@ -13,6 +13,7 @@ faxtomail.config.option.site.url.description= faxtomail.config.option.startActionFile.description= faxtomail.config.option.tmp.directory.description= faxtomail.config.option.ui.autoPopupNumberEditor.description= +faxtomail.config.option.ui.clientComboBoxFilterStartChars.description=Nombre de caractères avant de déclencher le filtre des clients sur une demande faxtomail.config.option.ui.color.alternateRow.description= faxtomail.config.option.ui.color.blockingLayer.description= faxtomail.config.option.ui.color.selectedRow.description= 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 0cbfdae2..b8f0bd61 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 @@ -440,17 +440,20 @@ public class DemandeUIHandler extends AbstractFaxToMailUIHandler<DemandeUIModel, public void keyTyped(KeyEvent e) { String text = clientComboBox.getComboBoxModel().getFilterText(); text+=e.getKeyChar(); - if (text.length()==3){ - //init list when 3 chars entered + + int filterStartChars = getConfig().getClientComboBoxFilterStartChars(); + + if (text.length()==filterStartChars){ + //init list when x chars entered FaxToMailServiceContext serviceContext = getContext().newServiceContext(); List<Client> clients = serviceContext.getClientService().getClientsForFolder(getContext().getCurrentMailFolder(),text); clientComboBox.getComboBoxModel().removeAllElements(); clientComboBox.getComboBoxModel().addAllElements(clients); - } else if (text.length()<3){ - //empty list if less than 3 chars + } else if (text.length()<filterStartChars){ + //empty list if less than x chars clientComboBox.getComboBoxModel().removeAllElements(); } else { - // do nothing if more than 3 chars entered + // do nothing if more than x chars entered } } }; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.