Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
In directory
james.mmbase.org:/tmp/cvs-serv12235/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
Modified Files:
NewsletterCAOImpl.java
Log Message:
CMSC-725(modify the part of getAllNewsletters,add the calendar)
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
See also: http://www.mmbase.org/jira/browse/CMSC-725
Index: NewsletterCAOImpl.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterCAOImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- NewsletterCAOImpl.java 23 Apr 2008 10:32:05 -0000 1.8
+++ NewsletterCAOImpl.java 24 Apr 2008 09:21:03 -0000 1.9
@@ -1,17 +1,16 @@
package com.finalist.newsletter.cao.impl;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
-import java.util.Set;
-
-import net.sf.mmapps.modules.cloudprovider.CloudProvider;
-import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.Node;
import org.mmbase.bridge.NodeList;
+import org.mmbase.bridge.NodeQuery;
import org.mmbase.bridge.Query;
+import org.mmbase.storage.search.Step;
+
+import com.finalist.newsletter.cao.util.NlUtil;
import com.finalist.newsletter.cao.NewsletterCAO;
import com.finalist.newsletter.domain.Newsletter;
@@ -22,15 +21,17 @@
public NewsletterCAOImpl() {
}
+
public NewsletterCAOImpl(Cloud cloud) {
this.cloud = cloud;
}
public List<Newsletter> getAllNewsletters() {
- Query query = cloud.createQuery();
- query.addStep(cloud.getNodeManager("newsletter"));
+ NodeQuery query = cloud.createNodeQuery();
+ Step step = query.addStep(cloud.getNodeManager("newsletter"));
+ query.setNodeStep(step);
NodeList list = query.getList();
- return list;
+ return NlUtil.convertFromNodeList(list);
}
public Newsletter getNewsletterById(int id) {
@@ -42,7 +43,7 @@
List<Node> tagList = newsletterNode.getRelatedNodes("tag");
Iterator tagIt = tagList.iterator();
- for(int i=0;i<tagList.size();i++){
+ for (int i = 0; i < tagList.size(); i++) {
Tag tag = new Tag();
Node tagNode = (Node) tagIt.next();
tag.setId(tagNode.getNumber());
@@ -54,5 +55,4 @@
return newsletter;
}
-
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
