Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree
In directory james.mmbase.org:/tmp/cvs-serv31444/tree
Modified Files:
Tag: b1_5
NewsletterPublicationTreeItemRenderer.java
Log Message:
CMSC-948 Registration portlet for CMS container
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree
See also: http://www.mmbase.org/jira/browse/CMSC-948
Index: NewsletterPublicationTreeItemRenderer.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree/NewsletterPublicationTreeItemRenderer.java,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -u -b -r1.16.2.1 -r1.16.2.2
--- NewsletterPublicationTreeItemRenderer.java 24 Oct 2008 13:53:54 -0000
1.16.2.1
+++ NewsletterPublicationTreeItemRenderer.java 6 Nov 2008 07:52:53 -0000
1.16.2.2
@@ -4,16 +4,19 @@
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
-import com.finalist.cmsc.navigation.*;
+import com.finalist.cmsc.navigation.NavigationRenderer;
+import com.finalist.cmsc.navigation.NavigationTreeItemRenderer;
+import com.finalist.cmsc.navigation.NavigationUtil;
+import com.finalist.cmsc.navigation.PagesUtil;
+import com.finalist.cmsc.navigation.ServerUtil;
import com.finalist.cmsc.security.SecurityUtil;
import com.finalist.cmsc.security.UserRole;
-import com.finalist.cmsc.services.community.ApplicationContextFactory;
import com.finalist.cmsc.services.publish.Publish;
+import com.finalist.newsletter.domain.Publication;
+import com.finalist.newsletter.util.NewsletterPublicationUtil;
import com.finalist.tree.TreeElement;
import com.finalist.tree.TreeModel;
import com.finalist.util.module.ModuleUtil;
-import com.finalist.newsletter.services.NewsletterPublicationService;
-import com.finalist.newsletter.domain.Publication;
public class NewsletterPublicationTreeItemRenderer implements
NavigationTreeItemRenderer {
@@ -42,13 +45,12 @@
boolean isSingleApplication = true;
boolean isPublished;
-
+ isSingleApplication = ServerUtil.isSingle();
if (isSingleApplication) {
- NewsletterPublicationService publicationService =
(NewsletterPublicationService)
ApplicationContextFactory.getBean("publicationService");
- Publication.STATUS status =
publicationService.getStatus(parentNode.getNumber());
+ // NewsletterPublicationService publicationService =
(NewsletterPublicationService)
ApplicationContextFactory.getBean("publicationService");
+ Publication.STATUS status =
NewsletterPublicationUtil.getStatus(parentNode.getCloud(),parentNode.getNumber());
isPublished = Publication.STATUS.DELIVERED.equals(status);
- }
- else {
+ } else {
isPublished = Publish.isPublished(parentNode);
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
