Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
In directory
james.mmbase.org:/tmp/cvs-serv24956/portlets-newsletter/src/java/com/finalist/newsletter/util
Modified Files:
NewsletterUtil.java
Log Message:
Did not compile againt mmbase 1.9. RelationList has Relation objects.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
Index: NewsletterUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterUtil.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- NewsletterUtil.java 5 Jun 2008 01:55:23 -0000 1.34
+++ NewsletterUtil.java 21 Jun 2008 13:08:14 -0000 1.35
@@ -1,44 +1,28 @@
package com.finalist.newsletter.util;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import java.util.Locale;
-import java.util.ResourceBundle;
+import java.util.*;
import net.sf.mmapps.commons.beans.MMBaseNodeMapper;
+import net.sf.mmapps.commons.bridge.RelationUtil;
import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
-import org.apache.commons.lang.time.DateFormatUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.commons.lang.StringUtils;
-import org.mmbase.bridge.Cloud;
-import org.mmbase.bridge.Node;
-import org.mmbase.bridge.NodeList;
-import org.mmbase.bridge.NodeManager;
-import org.mmbase.bridge.NodeQuery;
-import org.mmbase.bridge.RelationList;
+import org.mmbase.bridge.*;
import org.mmbase.bridge.util.Queries;
import org.mmbase.bridge.util.SearchUtil;
import org.mmbase.storage.search.Step;
import com.finalist.cmsc.beans.om.ContentElement;
import com.finalist.cmsc.mmbase.PropertiesUtil;
-import com.finalist.newsletter.domain.Term;
import com.finalist.newsletter.NewsletterSendFailException;
-import com.finalist.portlets.newsletter.NewsletterContentPortlet;
-import
com.finalist.newsletter.services.impl.NewsletterSubscriptionServicesImpl;
-import com.finalist.newsletter.cao.NewsLetterStatisticCAO;
import com.finalist.newsletter.cao.impl.NewsLetterStatisticCAOImpl;
+import com.finalist.newsletter.domain.Schedule;
+import com.finalist.newsletter.domain.Term;
import com.finalist.newsletter.domain.StatisticResult.HANDLE;
import com.finalist.newsletter.services.impl.StatisticServiceImpl;
-import net.sf.mmapps.commons.bridge.RelationUtil;
-import com.finalist.newsletter.domain.Schedule;
+import com.finalist.portlets.newsletter.NewsletterContentPortlet;
public abstract class NewsletterUtil {
private static Log log = LogFactory
@@ -191,8 +175,8 @@
String[] numbers = termNumbers.split(",");
SortedSet<Integer> sort = new TreeSet<Integer>();
- for (int i = 0; i < numbers.length; i++) {
- sort.add(new Integer(numbers[i]));
+ for (String number : numbers) {
+ sort.add(new Integer(number));
}
if (sort.size() == 0) {
return (null);
@@ -264,8 +248,8 @@
String[] numbers = termNumbers.split(",");
SortedSet<Integer> sort = new TreeSet<Integer>();
- for (int i = 0; i < numbers.length; i++) {
- sort.add(new Integer(numbers[i]));
+ for (String number : numbers) {
+ sort.add(new Integer(number));
}
if (sort.size() == 0) {
return (0);
@@ -413,7 +397,7 @@
String portletDefinition =
portletdefNodes.get(0).getStringValue("definition");
if (portletDefinition.equals(NewsletterContentPortlet.DEFINITION))
{
RelationList relations = portlet.getRelations("portletrel",
publicationNode.getNodeManager());
- String name = relations.getNode(0).getStringValue("name");
+ String name = relations.getRelation(0).getStringValue("name");
url +=
"/_rp_".concat(name).concat("_").concat(NewsletterContentPortlet.NEWSLETTER_TERMS_PARAM).concat("/1_").concat(termIds);
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
