You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2014/12/10 17:08:04 UTC
svn commit: r1644468 - in /openmeetings:
branches/3.0.x/src/main/java/org/apache/openmeetings/data/conference/
branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/
trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openm...
Author: solomax
Date: Wed Dec 10 16:08:03 2014
New Revision: 1644468
URL: http://svn.apache.org/r1644468
Log:
[OPENMEETINGS-1130] 'no application attached' error while sending invitation is fixed
Modified:
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/AbstractAppointmentTemplate.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CanceledAppointmentTemplate.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CreatedAppointmentTemplate.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/UpdatedAppointmentTemplate.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractAppointmentTemplate.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CanceledAppointmentTemplate.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CreatedAppointmentTemplate.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/UpdatedAppointmentTemplate.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
Modified: openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java?rev=1644468&r1=1644467&r2=1644468&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java (original)
+++ openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java Wed Dec 10 16:08:03 2014
@@ -215,14 +215,14 @@ public class InvitationManager implement
AbstractAppointmentTemplate t = null;
switch (type) {
case Cancel:
- t = new CanceledAppointmentTemplate(langId, a, tz, invitorName);
+ t = CanceledAppointmentTemplate.get(langId, a, tz, invitorName);
break;
case Create:
- t = new CreatedAppointmentTemplate(langId, a, tz, invitorName);
+ t = CreatedAppointmentTemplate.get(langId, a, tz, invitorName);
break;
case Update:
default:
- t = new UpdatedAppointmentTemplate(langId, a, tz, invitorName);
+ t = UpdatedAppointmentTemplate.get(langId, a, tz, invitorName);
break;
}
@@ -234,7 +234,7 @@ public class InvitationManager implement
User owner = i.getInvitedBy();
String invitorName = owner.getFirstname() + " " + owner.getLastname();
- String template = new InvitationTemplate(i.getInvitee().getLanguage_id(), invitorName, message, invitation_link).getEmail();
+ String template = InvitationTemplate.getEmail(i.getInvitee().getLanguage_id(), invitorName, message, invitation_link);
String email = i.getInvitee().getAdresses().getEmail();
String replyToEmail = owner.getAdresses().getEmail();
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/AbstractAppointmentTemplate.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/AbstractAppointmentTemplate.java?rev=1644468&r1=1644467&r2=1644468&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/AbstractAppointmentTemplate.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/AbstractAppointmentTemplate.java Wed Dec 10 16:08:03 2014
@@ -15,7 +15,6 @@ public abstract class AbstractAppointmen
this.langId = langId == null ? 1 : langId;
this.a = a;
this.tz = tz;
- ensureApplication(langId);
}
public String getEmail() {
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CanceledAppointmentTemplate.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CanceledAppointmentTemplate.java?rev=1644468&r1=1644467&r2=1644468&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CanceledAppointmentTemplate.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CanceledAppointmentTemplate.java Wed Dec 10 16:08:03 2014
@@ -30,7 +30,7 @@ import org.apache.wicket.util.string.Str
public class CanceledAppointmentTemplate extends AbstractAppointmentTemplate {
private static final long serialVersionUID = 1L;
- public CanceledAppointmentTemplate(Long langId, Appointment a, TimeZone tz, String invitorName) {
+ private CanceledAppointmentTemplate(Long langId, Appointment a, TimeZone tz, String invitorName) {
super(langId, a, tz, invitorName);
add(new Label("titleLbl", WebSession.getString(1157L, langId)));
@@ -48,6 +48,11 @@ public class CanceledAppointmentTemplate
add(new Label("invitor", invitorName));
}
+ public static CanceledAppointmentTemplate get(Long langId, Appointment a, TimeZone tz, String invitorName) {
+ ensureApplication(langId);
+ return new CanceledAppointmentTemplate(langId, a, tz, invitorName);
+ }
+
@Override
public String getSubject() {
StringBuilder sb = new StringBuilder();
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CreatedAppointmentTemplate.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CreatedAppointmentTemplate.java?rev=1644468&r1=1644467&r2=1644468&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CreatedAppointmentTemplate.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CreatedAppointmentTemplate.java Wed Dec 10 16:08:03 2014
@@ -30,7 +30,7 @@ import org.apache.wicket.util.string.Str
public class CreatedAppointmentTemplate extends AbstractAppointmentTemplate {
private static final long serialVersionUID = 1L;
- public CreatedAppointmentTemplate(Long langId, Appointment a, TimeZone tz, String invitorName) {
+ private CreatedAppointmentTemplate(Long langId, Appointment a, TimeZone tz, String invitorName) {
super(langId, a, tz, invitorName);
add(new Label("titleLbl", WebSession.getString(1151L, langId)));
@@ -48,6 +48,11 @@ public class CreatedAppointmentTemplate
add(new Label("invitor", invitorName));
}
+ public static CreatedAppointmentTemplate get(Long langId, Appointment a, TimeZone tz, String invitorName) {
+ ensureApplication(langId);
+ return new CreatedAppointmentTemplate(langId, a, tz, invitorName);
+ }
+
@Override
public String getSubject() {
StringBuilder sb = new StringBuilder();
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.java?rev=1644468&r1=1644467&r2=1644468&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.java Wed Dec 10 16:08:03 2014
@@ -18,10 +18,7 @@
*/
package org.apache.openmeetings.web.mail.template;
-import static org.apache.openmeetings.web.app.Application.getBean;
-
-import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
-import org.apache.openmeetings.db.dao.label.FieldLanguagesValuesDao;
+import org.apache.openmeetings.web.app.WebSession;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.ExternalLink;
@@ -29,27 +26,26 @@ import org.apache.wicket.markup.html.lin
public class InvitationTemplate extends AbstractTemplatePanel {
private static final long serialVersionUID = 1L;
- public InvitationTemplate(Long langId, String invitorName, String message, String link) {
+ private InvitationTemplate(Long langId, String invitorName, String message, String link) {
super(TemplatePage.COMP_ID);
- ensureApplication(langId);
- FieldLanguagesValuesDao dao = getBean(FieldLanguagesValuesDao.class);
- add(new Label("titleLbl", dao.getString(500, langId).replaceAll("\\$APP_NAME", getBean(ConfigurationDao.class).getAppName())));
- add(new Label("userLbl", dao.getString(501, langId)));
+ add(new Label("titleLbl", WebSession.getString(500, langId)));
+ add(new Label("userLbl", WebSession.getString(501, langId)));
add(new Label("user", invitorName));
- add(new Label("messageLbl", dao.getString(502, langId)));
+ add(new Label("messageLbl", WebSession.getString(502, langId)));
add(new Label("message", message).setEscapeModelStrings(false));
add(new WebMarkupContainer("links")
- .add(new Label("comment_for_link1", dao.getString(503, langId)))
- .add(new ExternalLink("invitation_link1", link).add(new Label("clickMe", dao.getString(504, langId))))
- .add(new Label("comment_for_link2", dao.getString(505, langId)))
+ .add(new Label("comment_for_link1", WebSession.getString(503, langId)))
+ .add(new ExternalLink("invitation_link1", link).add(new Label("clickMe", WebSession.getString(504, langId))))
+ .add(new Label("comment_for_link2", WebSession.getString(505, langId)))
.add(new Label("invitation_link2", link))
.setVisible(link != null)
);
}
- public String getEmail() {
- return renderPanel(this).toString();
+ public static String getEmail(Long langId, String invitorName, String message, String link) {
+ ensureApplication(langId);
+ return renderPanel(new InvitationTemplate(langId, invitorName, message, link)).toString();
}
}
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/UpdatedAppointmentTemplate.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/UpdatedAppointmentTemplate.java?rev=1644468&r1=1644467&r2=1644468&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/UpdatedAppointmentTemplate.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/UpdatedAppointmentTemplate.java Wed Dec 10 16:08:03 2014
@@ -30,7 +30,7 @@ import org.apache.wicket.util.string.Str
public class UpdatedAppointmentTemplate extends AbstractAppointmentTemplate {
private static final long serialVersionUID = 1L;
- public UpdatedAppointmentTemplate(Long langId, Appointment a, TimeZone tz, String invitorName) {
+ private UpdatedAppointmentTemplate(Long langId, Appointment a, TimeZone tz, String invitorName) {
super(langId, a, tz, invitorName);
add(new Label("titleLbl", WebSession.getString(1155L, langId)));
@@ -48,6 +48,11 @@ public class UpdatedAppointmentTemplate
add(new Label("invitor", invitorName));
}
+ public static UpdatedAppointmentTemplate get(Long langId, Appointment a, TimeZone tz, String invitorName) {
+ ensureApplication(langId);
+ return new UpdatedAppointmentTemplate(langId, a, tz, invitorName);
+ }
+
@Override
public String getSubject() {
StringBuilder sb = new StringBuilder();
Modified: openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractAppointmentTemplate.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractAppointmentTemplate.java?rev=1644468&r1=1644467&r2=1644468&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractAppointmentTemplate.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractAppointmentTemplate.java Wed Dec 10 16:08:03 2014
@@ -2,9 +2,7 @@ package org.apache.openmeetings.service.
import java.util.TimeZone;
-import org.apache.openmeetings.core.IWebSession;
import org.apache.openmeetings.db.entity.calendar.Appointment;
-import org.apache.wicket.protocol.http.WebSession;
public abstract class AbstractAppointmentTemplate extends AbstractTemplatePanel {
private static final long serialVersionUID = 1L;
@@ -17,11 +15,6 @@ public abstract class AbstractAppointmen
this.langId = langId == null ? 1 : langId;
this.a = a;
this.tz = tz;
- ensureApplication(langId);
- }
-
- public static String getString(long id, long languageId) {
- return ((IWebSession)WebSession.get()).getOmString(id, languageId);
}
public String getEmail() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java?rev=1644468&r1=1644467&r2=1644468&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java Wed Dec 10 16:08:03 2014
@@ -47,6 +47,10 @@ public abstract class AbstractTemplatePa
super(id);
}
+ public static String getString(long id, long languageId) {
+ return ((IWebSession)WebSession.get()).getOmString(id, languageId);
+ }
+
/**
* Collects the html generated by the rendering of a page.
*
Modified: openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CanceledAppointmentTemplate.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CanceledAppointmentTemplate.java?rev=1644468&r1=1644467&r2=1644468&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CanceledAppointmentTemplate.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CanceledAppointmentTemplate.java Wed Dec 10 16:08:03 2014
@@ -29,7 +29,7 @@ import org.apache.wicket.util.string.Str
public class CanceledAppointmentTemplate extends AbstractAppointmentTemplate {
private static final long serialVersionUID = 1L;
- public CanceledAppointmentTemplate(Long langId, Appointment a, TimeZone tz, String invitorName) {
+ private CanceledAppointmentTemplate(Long langId, Appointment a, TimeZone tz, String invitorName) {
super(langId, a, tz, invitorName);
add(new Label("titleLbl", getString(1157L, langId)));
@@ -47,6 +47,11 @@ public class CanceledAppointmentTemplate
add(new Label("invitor", invitorName));
}
+ public static CanceledAppointmentTemplate get(Long langId, Appointment a, TimeZone tz, String invitorName) {
+ ensureApplication(langId);
+ return new CanceledAppointmentTemplate(langId, a, tz, invitorName);
+ }
+
@Override
public String getSubject() {
StringBuilder sb = new StringBuilder();
Modified: openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CreatedAppointmentTemplate.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CreatedAppointmentTemplate.java?rev=1644468&r1=1644467&r2=1644468&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CreatedAppointmentTemplate.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CreatedAppointmentTemplate.java Wed Dec 10 16:08:03 2014
@@ -29,7 +29,7 @@ import org.apache.wicket.util.string.Str
public class CreatedAppointmentTemplate extends AbstractAppointmentTemplate {
private static final long serialVersionUID = 1L;
- public CreatedAppointmentTemplate(Long langId, Appointment a, TimeZone tz, String invitorName) {
+ private CreatedAppointmentTemplate(Long langId, Appointment a, TimeZone tz, String invitorName) {
super(langId, a, tz, invitorName);
add(new Label("titleLbl", getString(1151L, langId)));
@@ -47,6 +47,11 @@ public class CreatedAppointmentTemplate
add(new Label("invitor", invitorName));
}
+ public static CreatedAppointmentTemplate get(Long langId, Appointment a, TimeZone tz, String invitorName) {
+ ensureApplication(langId);
+ return new CreatedAppointmentTemplate(langId, a, tz, invitorName);
+ }
+
@Override
public String getSubject() {
StringBuilder sb = new StringBuilder();
Modified: openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.java?rev=1644468&r1=1644467&r2=1644468&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.java Wed Dec 10 16:08:03 2014
@@ -18,12 +18,6 @@
*/
package org.apache.openmeetings.service.mail.template;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.wicketApplicationName;
-
-import org.apache.openmeetings.core.IApplication;
-import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
-import org.apache.openmeetings.db.dao.label.FieldLanguagesValuesDao;
-import org.apache.wicket.Application;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.ExternalLink;
@@ -31,28 +25,26 @@ import org.apache.wicket.markup.html.lin
public class InvitationTemplate extends AbstractTemplatePanel {
private static final long serialVersionUID = 1L;
- public InvitationTemplate(Long langId, String invitorName, String message, String link) {
+ private InvitationTemplate(Long langId, String invitorName, String message, String link) {
super(TemplatePage.COMP_ID);
- ensureApplication(langId);
- IApplication a = ((IApplication)Application.get(wicketApplicationName));
- FieldLanguagesValuesDao dao = a.getOmBean(FieldLanguagesValuesDao.class);
- add(new Label("titleLbl", dao.getString(500, langId).replaceAll("\\$APP_NAME", a.getOmBean(ConfigurationDao.class).getAppName())));
- add(new Label("userLbl", dao.getString(501, langId)));
+ add(new Label("titleLbl", getString(500, langId)));
+ add(new Label("userLbl", getString(501, langId)));
add(new Label("user", invitorName));
- add(new Label("messageLbl", dao.getString(502, langId)));
+ add(new Label("messageLbl", getString(502, langId)));
add(new Label("message", message).setEscapeModelStrings(false));
add(new WebMarkupContainer("links")
- .add(new Label("comment_for_link1", dao.getString(503, langId)))
- .add(new ExternalLink("invitation_link1", link).add(new Label("clickMe", dao.getString(504, langId))))
- .add(new Label("comment_for_link2", dao.getString(505, langId)))
+ .add(new Label("comment_for_link1", getString(503, langId)))
+ .add(new ExternalLink("invitation_link1", link).add(new Label("clickMe", getString(504, langId))))
+ .add(new Label("comment_for_link2", getString(505, langId)))
.add(new Label("invitation_link2", link))
.setVisible(link != null)
);
}
- public String getEmail() {
- return renderPanel(this).toString();
+ public static String getEmail(Long langId, String invitorName, String message, String link) {
+ ensureApplication(langId);
+ return renderPanel(new InvitationTemplate(langId, invitorName, message, link)).toString();
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/UpdatedAppointmentTemplate.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/UpdatedAppointmentTemplate.java?rev=1644468&r1=1644467&r2=1644468&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/UpdatedAppointmentTemplate.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/UpdatedAppointmentTemplate.java Wed Dec 10 16:08:03 2014
@@ -29,7 +29,7 @@ import org.apache.wicket.util.string.Str
public class UpdatedAppointmentTemplate extends AbstractAppointmentTemplate {
private static final long serialVersionUID = 1L;
- public UpdatedAppointmentTemplate(Long langId, Appointment a, TimeZone tz, String invitorName) {
+ private UpdatedAppointmentTemplate(Long langId, Appointment a, TimeZone tz, String invitorName) {
super(langId, a, tz, invitorName);
add(new Label("titleLbl", getString(1155L, langId)));
@@ -47,6 +47,11 @@ public class UpdatedAppointmentTemplate
add(new Label("invitor", invitorName));
}
+ public static UpdatedAppointmentTemplate get(Long langId, Appointment a, TimeZone tz, String invitorName) {
+ ensureApplication(langId);
+ return new UpdatedAppointmentTemplate(langId, a, tz, invitorName);
+ }
+
@Override
public String getSubject() {
StringBuilder sb = new StringBuilder();
Modified: openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java?rev=1644468&r1=1644467&r2=1644468&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java Wed Dec 10 16:08:03 2014
@@ -98,14 +98,14 @@ public class InvitationManager implement
AbstractAppointmentTemplate t = null;
switch (type) {
case Cancel:
- t = new CanceledAppointmentTemplate(langId, a, tz, invitorName);
+ t = CanceledAppointmentTemplate.get(langId, a, tz, invitorName);
break;
case Create:
- t = new CreatedAppointmentTemplate(langId, a, tz, invitorName);
+ t = CreatedAppointmentTemplate.get(langId, a, tz, invitorName);
break;
case Update:
default:
- t = new UpdatedAppointmentTemplate(langId, a, tz, invitorName);
+ t = UpdatedAppointmentTemplate.get(langId, a, tz, invitorName);
break;
}
@@ -117,7 +117,7 @@ public class InvitationManager implement
User owner = i.getInvitedBy();
String invitorName = owner.getFirstname() + " " + owner.getLastname();
- String template = new InvitationTemplate(i.getInvitee().getLanguageId(), invitorName, message, invitation_link).getEmail();
+ String template = InvitationTemplate.getEmail(i.getInvitee().getLanguageId(), invitorName, message, invitation_link);
String email = i.getInvitee().getAdresses().getEmail();
String replyToEmail = owner.getAdresses().getEmail();