[MMBASE CVS] contributions/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets RelatedContentPortlet.java

[Nico Klasens]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets
In directory 
james.mmbase.org:/tmp/cvs-serv657/cmsc/portlets/src/java/com/finalist/cmsc/portlets

Modified Files:
      Tag: b1_4
        RelatedContentPortlet.java 
Log Message:
CMSC-863 HttpSessions are used when not necessary and created for useragents 
which do not maintain a session


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets
See also: http://www.mmbase.org/jira/browse/CMSC-863


Index: RelatedContentPortlet.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/RelatedContentPortlet.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -b -r1.4 -r1.4.2.1
--- RelatedContentPortlet.java  26 Nov 2007 11:43:40 -0000      1.4
+++ RelatedContentPortlet.java  21 Apr 2008 10:11:28 -0000      1.4.2.1
@@ -12,11 +12,9 @@
 
 import org.apache.pluto.core.impl.PortletRequestImpl;
 
-import com.finalist.cmsc.beans.om.Portlet;
-import com.finalist.cmsc.portalImpl.registry.PortalRegistry;
+import com.finalist.cmsc.beans.om.*;
+import com.finalist.cmsc.portalImpl.PortalConstants;
 import com.finalist.cmsc.services.sitemanagement.SiteManagement;
-import com.finalist.pluto.portalImpl.aggregation.Fragment;
-import com.finalist.pluto.portalImpl.aggregation.PortletFragment;
 
 import net.sf.mmapps.commons.util.StringUtil;
 
@@ -39,21 +37,23 @@
 
 
    private String getElementIdFromScreen(RenderRequest req, String window) {
-      HttpServletRequest servletRequest = getServletRequest(req);
-      PortalRegistry pr = PortalRegistry.getPortalRegistry(servletRequest);
-      Fragment fragment = pr.getScreen().getFragment(window);
-      if (fragment == null) {
-         return null;
+      Integer pageId = getCurrentPageId(req);
+      NavigationItem item = SiteManagement.getNavigationItem(pageId);
+      if (item instanceof Page) {
+          Page page = (Page) item;
+          int portletId = page.getPortlet(window);
+          Portlet portlet = SiteManagement.getPortlet(portletId);
+          if (portlet != null) {
+              return portlet.getParameterValue(CONTENTELEMENT);
+          }
       }
-      Portlet portlet = ((PortletFragment) fragment).getPortlet();
-      if (portlet == null) {
          return null;
       }
-      return portlet.getParameterValue("contentelement");
 
-      // Fragment fragment = pr.getScreen().getFragment(window);
-      // return
-      // 
((PortletFragment)fragment).getPortlet().getParameterValue("contentelement");
+
+    private Integer getCurrentPageId(RenderRequest req) {
+        String pageId = (String) 
req.getAttribute(PortalConstants.CMSC_OM_PAGE_ID);
+        return Integer.valueOf(pageId);
    }
 
 
@@ -81,10 +81,7 @@
 
    @Override
    protected void doEditDefaults(RenderRequest req, RenderResponse res) throws 
IOException, PortletException {
-      HttpServletRequest servletRequest = getServletRequest(req);
-      PortalRegistry pr = PortalRegistry.getPortalRegistry(servletRequest);
-
-      Integer pageid = pr.getScreen().getPage().getId();
+      Integer pageid = getCurrentPageId(req);
       String pagepath = SiteManagement.getPath(pageid, true);
 
       if (pagepath != null) {
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs