[jbpm-commits] JBoss JBPM SVN: r4517 - jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl.

[do-not-reply at jboss.org]

Author: bradsdavis
Date: 2009-04-09 14:55:08 -0400 (Thu, 09 Apr 2009)
New Revision: 4517

Modified:
   jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/HtmlScriptMailProducer.java
   jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/ScriptMailProducer.java
   jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/SimpleMailProducer.java
Log:
updated text for simple text from body to text.

Modified: jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/HtmlScriptMailProducer.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/HtmlScriptMailProducer.java	2009-04-09 18:08:02 UTC (rev 4516)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/HtmlScriptMailProducer.java	2009-04-09 18:55:08 UTC (rev 4517)
@@ -40,7 +40,7 @@
 		ScriptManager scriptManager = Environment.getFromCurrent(ScriptManager.class);
 		
 		//Apply the scripting language to the process.
-		this.body = (String)scriptManager.evaluateScript(this.body, exe, language);
+		this.text = (String)scriptManager.evaluateScript(this.text, exe, language);
 		this.subject = (String)scriptManager.evaluateScript(this.subject, exe, language);
 		this.html = (String)scriptManager.evaluate(this.html, exe, language);
 
@@ -49,7 +49,7 @@
 		//Populate recipients.
 		this.populateAddresses(mailContext, email);
 		//Set the regular body [non-html] and subject.
-		email.setTextMsg(this.body);
+		email.setTextMsg(this.text);
 		email.setSubject(this.subject);
 		
 		//Keep track of the CIDs that have replaced SRCs to reduce

Modified: jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/ScriptMailProducer.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/ScriptMailProducer.java	2009-04-09 18:08:02 UTC (rev 4516)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/ScriptMailProducer.java	2009-04-09 18:55:08 UTC (rev 4517)
@@ -26,7 +26,7 @@
 		
 		//Here, you just need to populate the subject and body of the message
 		//as evaluated by the JBPM script manager.
-		this.body = (String)scriptManager.evaluateScript(this.body, exe, language);
+		this.text = (String)scriptManager.evaluateScript(this.text, exe, language);
 		this.subject = (String)scriptManager.evaluateScript(this.subject, exe, language);
 		
 		//Populate and produce email based on SimpleMailProducer logic now that fields

Modified: jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/SimpleMailProducer.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/SimpleMailProducer.java	2009-04-09 18:08:02 UTC (rev 4516)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/SimpleMailProducer.java	2009-04-09 18:55:08 UTC (rev 4517)
@@ -23,7 +23,7 @@
  */
 public class SimpleMailProducer implements MailProducer {
 
-	protected String body;
+	protected String text;
 	protected String subject;
 	
 	public Collection<Email> produce(final Execution exe, final MailContext mailContext) throws Exception {
@@ -35,7 +35,7 @@
 
 		//Set subject and message.
 		email.setSubject(subject);
-		email.setMsg(body);
+		email.setMsg(text);
 		
 		Collection<Email> emails = new HashSet<Email>();
 		emails.add(email);
@@ -114,8 +114,8 @@
 		return name;
 	}
 
-	public void setBody(String body) {
-		this.body = body;
+	public void setText(String text) {
+		this.text = text;
 	}
 
 	public void setSubject(String subject) {