Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
In directory
james.mmbase.org:/tmp/cvs-serv9932/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
Modified Files:
NewsletterPublicationCAOImpl.java NewsletterCAOImpl.java
NewsletterSubscriptionCAOImpl.java
Log Message:
CMSC-217 easier to compile against mmbase 1.9
Added usage of MMBaseNodeMapper
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-217
Index: NewsletterPublicationCAOImpl.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterPublicationCAOImpl.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- NewsletterPublicationCAOImpl.java 18 Jul 2008 08:31:56 -0000 1.14
+++ NewsletterPublicationCAOImpl.java 21 Jul 2008 12:52:40 -0000 1.15
@@ -1,26 +1,22 @@
package com.finalist.newsletter.cao.impl;
-import com.finalist.cmsc.navigation.NavigationUtil;
-import com.finalist.newsletter.cao.NewsletterPublicationCAO;
-import com.finalist.newsletter.domain.Newsletter;
-import com.finalist.newsletter.domain.Publication;
-import com.finalist.newsletter.domain.Term;
-import com.finalist.newsletter.util.NewsletterUtil;
-import com.finalist.newsletter.util.POConvertUtils;
+import java.util.*;
+
+import net.sf.mmapps.commons.beans.MMBaseNodeMapper;
+
import org.apache.commons.lang.time.DateFormatUtils;
import org.mmbase.bridge.*;
import org.mmbase.bridge.util.SearchUtil;
-import org.mmbase.storage.search.Constraint;
-import org.mmbase.storage.search.FieldCompareConstraint;
-import org.mmbase.storage.search.Step;
-import org.mmbase.storage.search.StepField;
-import org.mmbase.storage.search.implementation.BasicCompositeConstraint;
-import
org.mmbase.storage.search.implementation.BasicFieldValueBetweenConstraint;
-import org.mmbase.storage.search.implementation.BasicFieldValueConstraint;
+import org.mmbase.storage.search.*;
+import org.mmbase.storage.search.implementation.*;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
-import java.util.*;
+import com.finalist.cmsc.navigation.NavigationUtil;
+import com.finalist.newsletter.cao.NewsletterPublicationCAO;
+import com.finalist.newsletter.domain.*;
+import com.finalist.newsletter.util.NewsletterUtil;
+import com.finalist.newsletter.util.POConvertUtils;
@@ -84,7 +80,7 @@
}
public Node getPublicationNode(int number) {
- return null;
+ return cloud.getNode(number);
}
public String getPublicationURL(int publciationId) {
@@ -97,11 +93,11 @@
public int getNewsletterId(int publicationId) {
Node newsletterPublicationNode = cloud.getNode(publicationId);
- List<Node> relatedNewsletters =
newsletterPublicationNode.getRelatedNodes("newsletter");
+ NodeList relatedNewsletters =
newsletterPublicationNode.getRelatedNodes("newsletter");
log.debug("Get " + relatedNewsletters.size() + " related newsletter");
- return relatedNewsletters.get(0).getNumber();
+ return relatedNewsletters.getNode(0).getNumber();
}
public List<Publication> getAllPublications() {
@@ -109,7 +105,7 @@
Step step = query.addStep(cloud.getNodeManager("newsletterpublication"));
query.setNodeStep(step);
NodeList list = query.getList();
- return list;
+ return MMBaseNodeMapper.convertList(list, Publication.class);
}
public List<Publication> getPublicationsByNewsletter(int id,
Publication.STATUS status) {
@@ -125,17 +121,11 @@
}
log.debug(String.format("Get %s publications of newsletter %s in %s
status",publications.size(),id,status));
- return new ArrayList(publications);
+ return new ArrayList<Publication>(publications);
}
private Publication convertFromNode(Node node){
- Publication publication = new Publication();
- publication.setId(node.getNumber());
- publication.setSubject(node.getStringValue("subject"));
- publication.setTitle(node.getStringValue("title"));
- publication.setLastmodifieddate(node.getStringValue("lastmodifieddate"));
- publication.setLastmodifier(node.getStringValue("lastmodifier"));
- return publication;
+ return MMBaseNodeMapper.copyNode(node, Publication.class);
}
@@ -146,16 +136,14 @@
public Set<Term> getTermsByPublication(int publicationId) {
Node newsletterPublicationNode = cloud.getNode(publicationId);
- List<Node> relatedNewsletters =
newsletterPublicationNode.getRelatedNodes("newsletter");
- List<Node> terms = relatedNewsletters.get(0).getRelatedNodes("term");
- Iterator termsIt = terms.iterator();
+ NodeList relatedNewsletters =
newsletterPublicationNode.getRelatedNodes("newsletter");
+ NodeList terms = relatedNewsletters.getNode(0).getRelatedNodes("term");
+
+ Iterator<Node> termsIt = terms.iterator();
Set<Term> termSet = new HashSet<Term>();
for (int i = 0; i < terms.size(); i++) {
- Term term = new Term();
- Node termNode = (Node) termsIt.next();
- term.setId(termNode.getNumber());
- term.setName(termNode.getStringValue("name"));
- term.setSubscription(false);
+ Node termNode = termsIt.next();
+ Term term = MMBaseNodeMapper.copyNode(termNode, Term.class);
termSet.add(term);
}
return termSet;
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.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- NewsletterCAOImpl.java 18 Jul 2008 08:31:56 -0000 1.15
+++ NewsletterCAOImpl.java 21 Jul 2008 12:52:40 -0000 1.16
@@ -1,23 +1,20 @@
package com.finalist.newsletter.cao.impl;
-import com.finalist.newsletter.cao.AbstractCAO;
-import com.finalist.newsletter.cao.NewsletterCAO;
-import com.finalist.newsletter.cao.util.NlUtil;
-import com.finalist.newsletter.domain.Newsletter;
-import com.finalist.newsletter.domain.Term;
+import java.util.*;
+
+import net.sf.mmapps.commons.beans.MMBaseNodeMapper;
+
import org.apache.commons.lang.StringUtils;
import org.mmbase.bridge.*;
import org.mmbase.bridge.util.SearchUtil;
-import org.mmbase.storage.search.Constraint;
-import org.mmbase.storage.search.RelationStep;
-import org.mmbase.storage.search.Step;
+import org.mmbase.storage.search.*;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
+import com.finalist.newsletter.cao.AbstractCAO;
+import com.finalist.newsletter.cao.NewsletterCAO;
+import com.finalist.newsletter.domain.Newsletter;
+import com.finalist.newsletter.domain.Term;
public class NewsletterCAOImpl extends AbstractCAO implements NewsletterCAO {
private static Logger log =
Logging.getLoggerInstance(NewsletterCAOImpl.class.getName());
@@ -34,7 +31,7 @@
Step step = query.addStep(cloud.getNodeManager("term"));
query.setNodeStep(step);
NodeList list = query.getList();
- return list;
+ return MMBaseNodeMapper.convertList(list, Term.class);
}
public List<Newsletter> getNewsletterByConstraint(String property, String
constraintType, String value) {
@@ -48,16 +45,16 @@
}
}
NodeList list = query.getList();
- return NlUtil.convertFromNodeList(list);
+ return MMBaseNodeMapper.convertList(list, Newsletter.class);
}
public int getNewsletterIdBySubscription(int id) {
log.debug("Get newsletter by subsription "+id);
Node subscriptionNode = cloud.getNode(id);
- List<Node> nodes = subscriptionNode.getRelatedNodes("newsletter");
+ NodeList nodes = subscriptionNode.getRelatedNodes("newsletter");
if(nodes.size()>0){
- return nodes.get(0).getNumber();
+ return nodes.getNode(0).getNumber();
}else{
return -1;
}
@@ -73,18 +70,10 @@
Newsletter newsletter = convertFromNode(newsletterNode);
- List<Node> terms = newsletterNode.getRelatedNodes("term");
+ NodeList terms = newsletterNode.getRelatedNodes("term");
log.debug("get newsletter by id:" + id + ",and get " + terms.size() + "
terms with it.");
- Iterator termsIt = terms.iterator();
-
- for (int i = 0; i < terms.size(); i++) {
- Term term = new Term();
- Node termNode = (Node) termsIt.next();
- term.setId(termNode.getNumber());
- term.setName(termNode.getStringValue("name"));
- term.setSubscription(false);
- newsletter.getTerms().add(term);
- }
+ List<Term> termList = MMBaseNodeMapper.convertList(terms, Term.class);
+ newsletter.getTerms().addAll(termList);
return newsletter;
}
Index: NewsletterSubscriptionCAOImpl.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- NewsletterSubscriptionCAOImpl.java 18 Jul 2008 08:31:56 -0000 1.22
+++ NewsletterSubscriptionCAOImpl.java 21 Jul 2008 12:52:40 -0000 1.23
@@ -1,24 +1,22 @@
package com.finalist.newsletter.cao.impl;
-import com.finalist.newsletter.cao.NewsletterSubscriptionCAO;
-import com.finalist.newsletter.cao.AbstractCAO;
-import com.finalist.newsletter.domain.Newsletter;
-import com.finalist.newsletter.domain.Subscription;
-import static com.finalist.newsletter.domain.Subscription.STATUS;
-import com.finalist.newsletter.domain.Term;
+import static
com.finalist.newsletter.util.NewsletterSubscriptionUtil.convertFromNode;
+
+import java.util.*;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.commons.lang.StringUtils;
import org.mmbase.bridge.*;
import org.mmbase.bridge.util.SearchUtil;
import org.mmbase.storage.search.Constraint;
import org.mmbase.storage.search.Step;
-import static com.finalist.newsletter.util.NewsletterSubscriptionUtil.*;
+import com.finalist.newsletter.cao.AbstractCAO;
+import com.finalist.newsletter.cao.NewsletterSubscriptionCAO;
+import com.finalist.newsletter.domain.*;
+import com.finalist.newsletter.domain.Subscription.STATUS;
import com.finalist.newsletter.util.DateUtil;
-import java.util.*;
-
public class NewsletterSubscriptionCAOImpl extends AbstractCAO implements
NewsletterSubscriptionCAO {
private static Log log =
LogFactory.getLog(NewsletterSubscriptionCAOImpl.class);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
