Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher
In directory
james.mmbase.org:/tmp/cvs-serv29815/portlets-newsletter/src/java/com/finalist/newsletter/publisher
Modified Files:
NewsletterPublisher.java
Log Message:
CMSC-725 service classes.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher
See also: http://www.mmbase.org/jira/browse/CMSC-725
Index: NewsletterPublisher.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher/NewsletterPublisher.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- NewsletterPublisher.java 10 Apr 2008 10:07:47 -0000 1.8
+++ NewsletterPublisher.java 10 Apr 2008 10:12:48 -0000 1.9
@@ -1,21 +1,11 @@
package com.finalist.newsletter.publisher;
-import java.io.UnsupportedEncodingException;
-import java.text.DateFormat;
-import java.util.Date;
-
-import java.util.List;
-import java.util.Locale;
-import java.util.TimeZone;
-
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Transport;
-import javax.mail.Message.RecipientType;
-import javax.mail.internet.InternetAddress;
-
+import com.finalist.cmsc.services.community.person.Person;
+import com.finalist.newsletter.generator.NewsletterGenerator;
+import com.finalist.newsletter.generator.NewsletterGeneratorFactory;
+import com.finalist.newsletter.util.NewsletterSubscriptionUtil;
+import com.finalist.newsletter.util.NewsletterUtil;
import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
-
import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.Node;
import org.mmbase.bridge.NodeList;
@@ -23,12 +13,16 @@
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
-import com.finalist.newsletter.generator.NewsletterGenerator;
-import com.finalist.newsletter.generator.NewsletterGeneratorFactory;
-import com.finalist.newsletter.util.NewsletterPublicationUtil;
-import com.finalist.newsletter.util.NewsletterSubscriptionUtil;
-import com.finalist.newsletter.util.NewsletterUtil;
-import com.finalist.cmsc.services.community.person.Person;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.Transport;
+import javax.mail.internet.InternetAddress;
+import java.io.UnsupportedEncodingException;
+import java.text.DateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.TimeZone;
public class NewsletterPublisher extends Thread {
@@ -52,12 +46,10 @@
}
}
- private Message generateNewsletter(String userName, int publicationNumber,
- String mimeType) {
+ private Message generateNewsletter(String userName, int publicationNumber,
String mimeType) {
NewsletterGeneratorFactory factory = NewsletterGeneratorFactory
.getInstance();
- NewsletterGenerator generator = factory.getNewsletterGenerator(
- publicationNumber, mimeType);
+ NewsletterGenerator generator =
factory.getNewsletterGenerator(publicationNumber, mimeType);
if (generator != null) {
Message message = generator.generateNewsletterMessage(userName);
return (message);
@@ -78,8 +70,7 @@
private void sendNewsletter(Node publicationNode, String userName) {
String mimeType = NewsletterSubscriptionUtil
.getPreferredMimeType(userName);
- Message message = generateNewsletter(userName, publicationNumber,
- mimeType);
+ Message message = generateNewsletter(userName, publicationNumber,
mimeType);
try {
message = setMailHeaders(publicationNode, userName, message);
@@ -95,17 +86,14 @@
}
}
- private Message setMailHeaders(Node publicationNode, String userName,
- Message message) throws MessagingException,
- UnsupportedEncodingException {
+ private Message setMailHeaders(Node publicationNode, String userName,
Message message) throws MessagingException, UnsupportedEncodingException {
String emailFrom = null;
String nameFrom = null;
String emailReplyTo = null;
String nameReplyTo = null;
- Node newsletterNode = SearchUtil.findRelatedNode(publicationNode,
- "newsletter", "related");
+ Node newsletterNode = SearchUtil.findRelatedNode(publicationNode,
"newsletter", "related");
if (newsletterNode != null) {
emailFrom = newsletterNode.getStringValue("from_mail");
nameFrom = newsletterNode.getStringValue("from_name");
@@ -138,7 +126,8 @@
fromAddress.setPersonal(nameFrom);
}
message.setFrom(fromAddress);
- } else {
+ }
+ else {
return (null);
}
@@ -150,7 +139,8 @@
InternetAddress[] addresses = new InternetAddress[1];
addresses[0] = replyToAddress;
message.setReplyTo(addresses);
- } else {
+ }
+ else {
return (null);
}
@@ -200,8 +190,7 @@
String locale = Locale.getDefault().getDisplayCountry();
Locale loc = new Locale(locale);
- DateFormat formatter = DateFormat.getDateTimeInstance(DateFormat.SHORT,
- DateFormat.SHORT, loc);
+ DateFormat formatter = DateFormat.getDateTimeInstance(DateFormat.SHORT,
DateFormat.SHORT, loc);
formatter.setTimeZone(tz);
String currentDate = formatter.format(date);
@@ -211,7 +200,7 @@
publicationNode.commit();
}
- public void deliver(int id,List<Person> persons){
+ public void deliver(int id, List<Person> persons) {
}
}
\ No newline at end of file
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
