branch develop updated (545a265 -> b861596)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git from 545a265 add 3rd party new cf816b4 fixes #7773 [Calcul des quantités de gammes] la popup de chargement ne disparait pas quand la popup de gammes apparait new b861596 remove sleep for tests The 2 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 b861596061fe350eac7b39a707309e45b638e0fe Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 30 11:15:57 2015 +0100 remove sleep for tests commit cf816b4d182798c471b7dbf28763ed0b9d118cb4 Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 30 11:11:51 2015 +0100 fixes #7773 [Calcul des quantités de gammes] la popup de chargement ne disparait pas quand la popup de gammes apparait Summary of changes: .../services/service/EmailServiceTest.java | 8 ++++---- .../actions/ComputeQuantitiesByRangeAction.java | 22 ++++++++++++++++++++-- 2 files changed, 24 insertions(+), 6 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 in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit cf816b4d182798c471b7dbf28763ed0b9d118cb4 Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 30 11:11:51 2015 +0100 fixes #7773 [Calcul des quantités de gammes] la popup de chargement ne disparait pas quand la popup de gammes apparait --- .../services/service/EmailServiceTest.java | 8 ++++---- .../actions/ComputeQuantitiesByRangeAction.java | 23 ++++++++++++++++++++-- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java index 9464ac4..9719f39 100644 --- a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java +++ b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java @@ -298,7 +298,7 @@ public class EmailServiceTest extends AbstractFaxToMailServiceTest { // // if (message.isMimeType("multipart/*")) { // -// String htmlContent = service.decomposeMultipartEmail(attachments, message); +// List<String> htmlContent = service.decomposeMultipartEmail(attachments, message); // // Attachment attachment = service.convertHTMLToPdf(attachments, htmlContent, "test"); // Files.copy(attachment.getOriginalFile().getFile(), new File("/tmp/test.pdf")); @@ -310,7 +310,7 @@ public class EmailServiceTest extends AbstractFaxToMailServiceTest { // Attachment attachment = service.convertTextToPdf(content, "test"); // Files.copy(attachment.getOriginalFile().getFile(), new File("/tmp/test.pdf")); // } -// }else { +// } else { // String fileName = message.getFileName(); // try { // fileName = MimeUtility.decodeText(fileName); @@ -359,11 +359,11 @@ public class EmailServiceTest extends AbstractFaxToMailServiceTest { // String emailContent = FileUtils.readFileToString(email); // MimeMessage message = MimeMessageUtils.createMimeMessage(session, emailContent); // -// Transport tr = session.getTransport("smtp"); +// Transport tr = session.getTransport("smtps"); // tr.connect(getApplicationConfig().getSmtpHost(), getApplicationConfig().getSmtpPort(), smtpUser, password); // message.saveChanges(); // don't forget this // -// tr.sendMessage(message, new Address[]{ new InternetAddress("tets@test.com") }); +// tr.sendMessage(message, new Address[]{ new InternetAddress("test@test.com") }); // tr.close(); // // } catch (Exception e) { diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ComputeQuantitiesByRangeAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ComputeQuantitiesByRangeAction.java index 9e3a503..0392832 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ComputeQuantitiesByRangeAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ComputeQuantitiesByRangeAction.java @@ -33,7 +33,7 @@ import com.franciaflex.faxtomail.ui.swing.content.demande.QuantitiesByRangeUIHan import com.franciaflex.faxtomail.ui.swing.content.demande.QuantitiesByRangeUIModel; import com.franciaflex.faxtomail.ui.swing.content.demande.RangeRowModel; -import java.awt.*; +import java.awt.Dimension; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -46,6 +46,8 @@ import static org.nuiton.i18n.I18n.t; */ public class ComputeQuantitiesByRangeAction extends AbstractFaxToMailAction<QuantitiesByRangeUIModel, QuantitiesByRangeUI, QuantitiesByRangeUIHandler> { + private boolean error = false; + public ComputeQuantitiesByRangeAction(QuantitiesByRangeUIHandler handler) { super(handler, false); setActionDescription(t("faxtomail.action.computeQuantitiesByRange.tip")); @@ -85,11 +87,28 @@ public class ComputeQuantitiesByRangeAction extends AbstractFaxToMailAction<Quan rangeRows.add(row); } getModel().setRangeRows(rangeRows); + Thread.sleep(2000); } @Override public void postSuccessAction() { super.postSuccessAction(); - handler.openDialog(getUI(), t("faxtomail.quantitiesByRange.title"), new Dimension(350, 300)); + error = false; + } + + @Override + public void postFailedAction(Throwable error) { + super.postFailedAction(error); + this.error = true; + } + + @Override + protected void releaseAction() { + super.releaseAction(); + + if (!error) { + handler.openDialog(getUI(), t("faxtomail.quantitiesByRange.title"), new Dimension(350, 300)); + } + error = false; } } -- 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 in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit b861596061fe350eac7b39a707309e45b638e0fe Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 30 11:15:57 2015 +0100 remove sleep for tests --- .../ui/swing/content/demande/actions/ComputeQuantitiesByRangeAction.java | 1 - 1 file changed, 1 deletion(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ComputeQuantitiesByRangeAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ComputeQuantitiesByRangeAction.java index 0392832..8575baa 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ComputeQuantitiesByRangeAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ComputeQuantitiesByRangeAction.java @@ -87,7 +87,6 @@ public class ComputeQuantitiesByRangeAction extends AbstractFaxToMailAction<Quan rangeRows.add(row); } getModel().setRangeRows(rangeRows); - Thread.sleep(2000); } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm