Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
In directory james.mmbase.org:/tmp/cvs-serv22831

Modified Files:
        NewsletterPublicationUtil.java 
Log Message:
CMSC-811,Create a newsletter publication,modification of creating empty 
publication and copy properties


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-811


Index: NewsletterPublicationUtil.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterPublicationUtil.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- NewsletterPublicationUtil.java      6 May 2008 02:56:11 -0000       1.25
+++ NewsletterPublicationUtil.java      6 May 2008 06:11:12 -0000       1.26
@@ -3,27 +3,36 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import net.sf.mmapps.commons.bridge.RelationUtil;
 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.NodeManager;
-import org.mmbase.bridge.Relation;
-import org.mmbase.bridge.RelationList;
-
 import com.finalist.cmsc.navigation.NavigationUtil;
 import com.finalist.cmsc.navigation.PagesUtil;
+import com.finalist.cmsc.navigation.PortletUtil;
 import com.finalist.newsletter.domain.Publication;
 
 public abstract class NewsletterPublicationUtil {
 
-   private static void copyOtherRelations(Node newsletterNode, Node 
publicationNode) {
-      PagesUtil.copyPageRelations(newsletterNode, publicationNode);
+   private static void copyOtherRelations(Node newsletterNode, Node 
publicationNode,boolean copyContent) {
+      copyPageRelations(newsletterNode, publicationNode,copyContent);
       copyImageAndAttachmentRelations(newsletterNode, publicationNode);
    }
    
+   public static Node copyPageRelations(Node sourcePage, Node newPage,boolean 
copyContent) {
+      CloneUtil.cloneRelations(sourcePage, newPage, PagesUtil.LAYOUTREL, 
PagesUtil.LAYOUT);
+      if(copyContent) {
+         PortletUtil.copyPortlets(sourcePage, newPage);
+      }
+      Node popupinfo = PagesUtil.getPopupinfo(sourcePage);
+      if (popupinfo != null) {
+         Node newPopupinfo = PagesUtil.copyPopupinfo(popupinfo);
+         PagesUtil.addPopupinfo(newPage, newPopupinfo);
+      }
+      return newPage;
+   }
+   
    private static void copyImageAndAttachmentRelations(Node newsletterNode, 
Node publicationNode) {
       
CloneUtil.cloneRelations(newsletterNode,publicationNode,"namedrel","images");
       
CloneUtil.cloneRelations(newsletterNode,publicationNode,"posrel","attachments");
@@ -47,7 +56,9 @@
             publicationNode.setStringValue("publishdate","null");
             publicationNode.setStringValue("status", 
Publication.STATUS.INITIAL.toString());
             publicationNode.commit();
-            copyOtherRelations(newsletterNode, publicationNode);
+            
+          //  copyContent(newsletterNode, publicationNode);
+            copyOtherRelations(newsletterNode, publicationNode,copyContent);
             NavigationUtil.appendChild(newsletterNode, publicationNode);
             Node layoutNode = PagesUtil.getLayout(publicationNode);
             if (copyContent == true) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to