[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-banner/src/java/com/finalist/portlets/banner BannerPortlet.java

[avleeuwen]

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

Modified Files:
        BannerPortlet.java 
Log Message:
Merge van 1.4 branch


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-banner/src/java/com/finalist/portlets/banner


Index: BannerPortlet.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-banner/src/java/com/finalist/portlets/banner/BannerPortlet.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- BannerPortlet.java  21 Feb 2008 09:25:58 -0000      1.7
+++ BannerPortlet.java  14 Mar 2008 12:52:11 -0000      1.8
@@ -61,8 +61,7 @@
 
    @Override
    protected void doView(RenderRequest request, RenderResponse response) 
throws PortletException, IOException {
-      PortletPreferences preferences = request.getPreferences();
-      String position = 
preferences.getValue(PortalConstants.CMSC_OM_PORTLET_LAYOUTID, null);
+      String position = (String) 
request.getAttribute(PortalConstants.CMSC_OM_PORTLET_LAYOUTID);
       request.setAttribute("bannerPosition", position);
       super.doView(request, response);
    }
@@ -77,10 +76,9 @@
 
    protected void handleBannerCounters(RenderRequest request) {
       // remove all banners from the content elemens that have reached max 
clicks (
-      PortletPreferences preferences = request.getPreferences();
-      String screenId = preferences.getValue(PortalConstants.CMSC_OM_PAGE_ID, 
null);
+      String screenId = (String) 
request.getAttribute(PortalConstants.CMSC_OM_PAGE_ID);
       String page = SiteManagement.getPath(Integer.valueOf(screenId), true);
-      String position = 
preferences.getValue(PortalConstants.CMSC_OM_PORTLET_LAYOUTID, null);
+      String position = (String) 
request.getAttribute(PortalConstants.CMSC_OM_PORTLET_LAYOUTID);
 
       CloudProvider cloudProvider = CloudProviderFactory.getCloudProvider();
       Cloud cloud = cloudProvider.getCloud();
@@ -123,7 +121,7 @@
       PortletPreferences preferences = request.getPreferences();
 
       String position = 
preferences.getValue(PortalConstants.CMSC_OM_PORTLET_LAYOUTID, null);
-      String screenId = preferences.getValue(PortalConstants.CMSC_OM_PAGE_ID, 
null);
+      String screenId = (String) 
request.getAttribute(PortalConstants.CMSC_OM_PAGE_ID);
       String page = SiteManagement.getPath(Integer.valueOf(screenId), true);
 
       CloudProvider cloudProvider = CloudProviderFactory.getCloudProvider();
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs