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 340943d6302d74a33baf7e928d808abcc4144497 Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 13 11:16:23 2015 +0200 fixes #7642 POP-UP « GROUPAGE » trop rapide 15 secondes --- .../faxtomail/FaxToMailConfigurationOption.java | 2 +- .../demandgroup/DemandGroupHighlightDialog.java | 25 ++++++++++++++++------ 2 files changed, 19 insertions(+), 8 deletions(-) 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 e2ce9fa..ab3515c 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java @@ -290,7 +290,7 @@ defaults.put("Table.alternateRowColor", new Color(217, 217, 217)); DELAY_GROUPED_DEMAND_WARNING_DIALOG("faxtomail.ui.delay.groupedDemandWarningDialog", n("faxtomail.ui.delay.groupedDemandWarningDialog.description"), - "10000", + "0", Integer.class ), diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupHighlightDialog.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupHighlightDialog.java index 4dff1ea..2c9af23 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupHighlightDialog.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupHighlightDialog.java @@ -52,11 +52,19 @@ public class DemandGroupHighlightDialog extends JDialog { this.buttonEmailGroup = buttonEmailGroup; - timer = new Timer(context.getConfig().getDelayGroupedDemandWarningDialog(), new ActionListener() { - public void actionPerformed(ActionEvent e) { - dispose(); - } - }); + int delayGroupedDemandWarningDialog = context.getConfig().getDelayGroupedDemandWarningDialog(); + + if (delayGroupedDemandWarningDialog > 0) { + + timer = new Timer(delayGroupedDemandWarningDialog, new ActionListener() { + public void actionPerformed(ActionEvent e) { + dispose(); + } + }); + + } else { + timer = null; + } init(context.getConfig().getColorGroupedDemandWarningDialog(), context.getConfig().getFontSizeGroupedDemandWarningDialog()); @@ -117,9 +125,12 @@ public class DemandGroupHighlightDialog extends JDialog { public void setVisible(boolean b) { if (!isVisible() && b) { place(); - timer.start(); - } else if (!b) { + if (timer != null) { + timer.start(); + } + + } else if (!b && timer != null) { timer.stop(); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.