From 44e9c961b1a830abcf75b91e8cfda80a353b943c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 18 Jul 2019 05:46:01 +0200 Subject: [PATCH] Please cherry-pick: - added final modifier because these references shall never be changed - used interface Context as type (updated signature of inherited method) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../model/delivery/AddressbookMailerSingletonBean.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/java/org/mxchange/addressbook/mailer/model/delivery/AddressbookMailerSingletonBean.java b/src/java/org/mxchange/addressbook/mailer/model/delivery/AddressbookMailerSingletonBean.java index 75ddf65..a253857 100644 --- a/src/java/org/mxchange/addressbook/mailer/model/delivery/AddressbookMailerSingletonBean.java +++ b/src/java/org/mxchange/addressbook/mailer/model/delivery/AddressbookMailerSingletonBean.java @@ -27,6 +27,7 @@ import javax.mail.MessagingException; import javax.mail.Session; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; +import org.apache.velocity.context.Context; import org.mxchange.jmailee.model.delivery.BaseMailerBean; import org.mxchange.jmailee.model.delivery.wrapper.WrapableEmailDelivery; @@ -46,7 +47,7 @@ public class AddressbookMailerSingletonBean extends BaseMailerBean implements De /** * Configuration file */ - private final String configFile = "org.mxchange.jmailer.config"; //NOI18N//NOI18N + private final String configFile = "org.mxchange.jmailer.config"; //NOI18N /** * Email session @@ -137,10 +138,10 @@ public class AddressbookMailerSingletonBean extends BaseMailerBean implements De } // All required data is set, load template - Template template = this.getTemplateEngine().getTemplate(String.format("templates/%s/%s.vm", emailWrapper.getLocale().getLanguage().toLowerCase(), emailWrapper.getTemplateName())); //NOI18N + final Template template = this.getTemplateEngine().getTemplate(String.format("templates/%s/%s.vm", emailWrapper.getLocale().getLanguage().toLowerCase(), emailWrapper.getTemplateName())); //NOI18N // Init context - VelocityContext context = new VelocityContext(); + final Context context = new VelocityContext(); // Are some variables set? if ((emailWrapper.getTemplateVariables() != null) && (!emailWrapper.getTemplateVariables().isEmpty())) { -- 2.39.2