Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
In directory james.mmbase.org:/tmp/cvs-serv11719
Modified Files:
NewsletterPublicationUtil.java NewsletterUtil.java
Log Message:
CMSC-711,Customized search option for edit-wizard,
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
See also: http://www.mmbase.org/jira/browse/CMSC-711
Index: NewsletterPublicationUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterPublicationUtil.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- NewsletterPublicationUtil.java 29 Apr 2008 03:52:49 -0000 1.19
+++ NewsletterPublicationUtil.java 29 Apr 2008 06:09:02 -0000 1.20
@@ -89,7 +89,7 @@
defaultTerm.setStringValue("name", "default");
defaultTerm.setStringValue("subject",
newsletterNode.getStringValue("title"));
defaultTerm.commit();
- newsletterNode.createRelation(defaultTerm,
newsletterNode.getCloud().getRelationManager("related")).commit();
+ newsletterNode.createRelation(defaultTerm,
newsletterNode.getCloud().getRelationManager("posrel")).commit();
}
}
Index: NewsletterUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterUtil.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- NewsletterUtil.java 29 Apr 2008 01:37:04 -0000 1.17
+++ NewsletterUtil.java 29 Apr 2008 06:09:02 -0000 1.18
@@ -1,6 +1,10 @@
package com.finalist.newsletter.util;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
import net.sf.mmapps.commons.beans.MMBaseNodeMapper;
import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
@@ -12,16 +16,11 @@
import org.mmbase.bridge.NodeList;
import org.mmbase.bridge.NodeManager;
import org.mmbase.bridge.NodeQuery;
-import org.mmbase.bridge.Query;
import org.mmbase.bridge.util.Queries;
import org.mmbase.bridge.util.SearchUtil;
-import org.mmbase.storage.search.Constraint;
-import org.mmbase.storage.search.FieldValueInConstraint;
-import org.mmbase.storage.search.RelationStep;
import org.mmbase.storage.search.Step;
import com.finalist.cmsc.beans.om.ContentElement;
-import com.finalist.newsletter.cao.impl.NewsletterSubscriptionCAOImpl;
import com.finalist.newsletter.domain.Term;
import com.finalist.portlets.newsletter.NewsletterContentPortlet;
@@ -219,10 +218,9 @@
NodeManager termNodeManager = cloud.getNodeManager("term");
NodeList terms = newsletterNode.getRelatedNodes(termNodeManager);
NodeManager articleNodeManager = cloud.getNodeManager("article");
- Node term = null;
SortedSet<Integer> sort = new TreeSet<Integer>();
for (int i = 0; i < terms.size(); i++) {
- term = terms.getNode(i);
+ Node term = terms.getNode(i);
sort.add(new Integer(term.getNumber()));
}
if (sort.size() == 0) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
